haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor enhancements, fixes an code cleanup (removed unused global variables)

This commit is contained in:
charras 2010-02-24 15:33:03 +00:00
parent ec6a84d0bb
commit bbd8cdd91b
35 changed files with 1910 additions and 2931 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/dialog_print_using_printer.cpp
View File

@ -116,7 +116,9 @@ void WinEDA_SchematicFrame::OnPrint( wxCommandEvent& event )
fn = g_RootSheet->m_AssociatedScreen->m_FileName; fn = g_RootSheet->m_AssociatedScreen->m_FileName;
if( fn.GetFullName() != wxT( "noname.sch" ) ) wxString default_name = NAMELESS_PROJECT;
default_name += wxT( ".sch" );
if( fn.GetFullName() != default_name )
{ {
fn.SetExt( ProjectFileExtension ); fn.SetExt( ProjectFileExtension );
wxGetApp().WriteProjectConfig( fn.GetFullPath(), GROUP, GetProjectFileParameters() ); wxGetApp().WriteProjectConfig( fn.GetFullPath(), GROUP, GetProjectFileParameters() );

3
eeschema/files-io.cpp
View File

@ -109,7 +109,8 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
screen->m_CurrentSheetDesc = &g_Sheet_A4; screen->m_CurrentSheetDesc = &g_Sheet_A4;
screen->SetZoom( 32 ); screen->SetZoom( 32 );
screen->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId ); screen->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId );
screen->m_Title = wxT( "noname.sch" ); screen->m_Title = NAMELESS_PROJECT;
screen->m_Title += wxT( ".sch" );
GetScreen()->m_FileName = screen->m_Title; GetScreen()->m_FileName = screen->m_Title;
screen->m_Company.Empty(); screen->m_Company.Empty();
screen->m_Commentaire1.Empty(); screen->m_Commentaire1.Empty();

3
eeschema/schframe.cpp
View File

@ -155,7 +155,8 @@ WinEDA_SchematicFrame::WinEDA_SchematicFrame( wxWindow* father,
m_TextFieldSize = DEFAULT_SIZE_TEXT; m_TextFieldSize = DEFAULT_SIZE_TEXT;
m_LibeditFrame = NULL; // Component editor frame. m_LibeditFrame = NULL; // Component editor frame.
m_ViewlibFrame = NULL; // Frame for browsing component libraries m_ViewlibFrame = NULL; // Frame for browsing component libraries
m_DefaultSchematicFileName = wxT( "noname.sch" ); m_DefaultSchematicFileName = NAMELESS_PROJECT;
m_DefaultSchematicFileName += wxT( ".sch" );
m_ShowAllPins = false; m_ShowAllPins = false;
m_previewPosition = wxDefaultPosition; m_previewPosition = wxDefaultPosition;
m_previewSize = wxDefaultSize; m_previewSize = wxDefaultSize;

3
include/common.h
View File

@ -29,6 +29,9 @@ class WinEDA_DrawPanel;
* flag for block commands * flag for block commands
*/ */
// default name for nameless projects
#define NAMELESS_PROJECT wxT("noname")
#define NB_ITEMS 11 #define NB_ITEMS 11
/* Pseudo key codes for command panning */ /* Pseudo key codes for command panning */

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

266
internat/fr/kicad.po
View File

@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-02-22 20:56+0100\n" "POT-Creation-Date: 2010-02-24 17:18+0100\n"
"PO-Revision-Date: 2010-02-22 20:58+0100\n" "PO-Revision-Date: 2010-02-24 17:18+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n" "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1308,23 +1308,23 @@ msgstr "Ecriture fichier CI: "
msgid "Failed to create " msgid "Failed to create "
msgstr "Impossible de créer fichier " msgstr "Impossible de créer fichier "
#: pcbnew/pcbframe.cpp:336 #: pcbnew/pcbframe.cpp:337
msgid "Visibles" msgid "Visibles"
msgstr "Visibles" msgstr "Visibles"
#: pcbnew/pcbframe.cpp:422 #: pcbnew/pcbframe.cpp:423
msgid "Board modified, Save before exit ?" msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?" msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:423 #: pcbnew/pcbframe.cpp:424
msgid "Confirmation" msgid "Confirmation"
msgstr "Confirmation" msgstr "Confirmation"
#: pcbnew/pcbframe.cpp:462 #: pcbnew/pcbframe.cpp:463
msgid "3D Frame already opened" msgid "3D Frame already opened"
msgstr "Fenêtre 3D déjà ouverte" msgstr "Fenêtre 3D déjà ouverte"
#: pcbnew/pcbframe.cpp:466 #: pcbnew/pcbframe.cpp:467
msgid "3D Viewer" msgid "3D Viewer"
msgstr "Visu 3D" msgstr "Visu 3D"
@ -1948,24 +1948,24 @@ msgstr "Nb Segms"
msgid "Error: Unexpected end of file !" msgid "Error: Unexpected end of file !"
msgstr "Erreur: Fin de fichier inattendue !" msgstr "Erreur: Fin de fichier inattendue !"
#: pcbnew/pcbnew.cpp:107 #: pcbnew/pcbnew.cpp:109
msgid "Pcbnew is already running, Continue?" msgid "Pcbnew is already running, Continue?"
msgstr "Pcbnew est en cours d'exécution. Continuer ?" msgstr "Pcbnew est en cours d'exécution. Continuer ?"
#: pcbnew/pcbplot.cpp:558 #: pcbnew/pcbplot.cpp:560
msgid "Warning: Scale option set to a very small value" msgid "Warning: Scale option set to a very small value"
msgstr "Attention: option d'échelle ajustée à une valeur très petite" msgstr "Attention: option d'échelle ajustée à une valeur très petite"
#: pcbnew/pcbplot.cpp:561 #: pcbnew/pcbplot.cpp:563
msgid "Warning: Scale option set to a very large value" msgid "Warning: Scale option set to a very large value"
msgstr "Attention: option d'échelle ajustée à une valeur très grande" msgstr "Attention: option d'échelle ajustée à une valeur très grande"
#: pcbnew/pcbplot.cpp:690 #: pcbnew/pcbplot.cpp:692
#, c-format #, c-format
msgid "Plot file <%s> created" msgid "Plot file <%s> created"
msgstr "Fichier de tracé <%s> créé" msgstr "Fichier de tracé <%s> créé"
#: pcbnew/pcbplot.cpp:702 #: pcbnew/pcbplot.cpp:704
msgid "No layer selected" msgid "No layer selected"
msgstr "Pas de couche sélectionnée" msgstr "Pas de couche sélectionnée"
@ -3362,50 +3362,6 @@ msgstr "Non"
msgid " Yes" msgid " Yes"
msgstr "Oui" msgstr "Oui"
#: pcbnew/dialog_graphic_items_options.cpp:194
msgid "Graphics:"
msgstr "Eléments graphiques;"
#: pcbnew/dialog_graphic_items_options.cpp:200
msgid "Graphic segm Width"
msgstr "Epaisseur segm graphique"
#: pcbnew/dialog_graphic_items_options.cpp:217
msgid "Board Edges Width"
msgstr "Epaiss. contour pcb"
#: pcbnew/dialog_graphic_items_options.cpp:234
msgid "Copper Text Width"
msgstr "Epaisseur Texte sur cuivre"
#: pcbnew/dialog_graphic_items_options.cpp:251
msgid "Text Size V"
msgstr "Hauteur texte"
#: pcbnew/dialog_graphic_items_options.cpp:268
msgid "Text Size H"
msgstr "Largeur texte"
#: pcbnew/dialog_graphic_items_options.cpp:287
msgid "Modules:"
msgstr "Modules: "
#: pcbnew/dialog_graphic_items_options.cpp:293
msgid "Edges Module Width"
msgstr "Epaiss. contour module"
#: pcbnew/dialog_graphic_items_options.cpp:313
msgid "Text Module Width"
msgstr "Epaisseur Texte Module"
#: pcbnew/dialog_graphic_items_options.cpp:334
msgid "Text Module Size V"
msgstr "Hauteur Texte Module"
#: pcbnew/dialog_graphic_items_options.cpp:355
msgid "Text Module Size H"
msgstr "Largeur Texte Module"
#: pcbnew/dialog_edit_module_text_base.cpp:19 #: pcbnew/dialog_edit_module_text_base.cpp:19
#, c-format #, c-format
msgid "Module %s (%s) orient %.1f" msgid "Module %s (%s) orient %.1f"
@ -3596,8 +3552,8 @@ msgid "Set Y scale adjust for exact scale plotting"
msgstr "Ajuster échelle Y pour traçage à l'échelle exacte" msgstr "Ajuster échelle Y pour traçage à l'échelle exacte"
#: pcbnew/dialog_print_using_printer_base.cpp:78 #: pcbnew/dialog_print_using_printer_base.cpp:78
msgid "Default Pen Size:" msgid "Default pen size:"
msgstr "Dimension Plume par Défaut:" msgstr "Dimension plume par défaut:"
#: pcbnew/dialog_print_using_printer_base.cpp:80 #: pcbnew/dialog_print_using_printer_base.cpp:80
msgid "" msgid ""
@ -3656,7 +3612,7 @@ msgid "Preview"
msgstr "Prévisualisation" msgstr "Prévisualisation"
#: pcbnew/dialog_print_using_printer_base.cpp:134 #: pcbnew/dialog_print_using_printer_base.cpp:134
#: pcbnew/dialog_print_using_printer.cpp:500 #: pcbnew/dialog_print_using_printer.cpp:504
msgid "Print" msgid "Print"
msgstr "Imprimer" msgstr "Imprimer"
@ -4469,19 +4425,19 @@ msgstr ""
"Chemins (chemins système et chemins utilisateurs) utilisés pour chercher et charger les fichiers libriries et documentation des composants.\n" "Chemins (chemins système et chemins utilisateurs) utilisés pour chercher et charger les fichiers libriries et documentation des composants.\n"
"Triés par ordre de priorité décroissante." "Triés par ordre de priorité décroissante."
#: pcbnew/dialog_print_using_printer.cpp:99 #: pcbnew/dialog_print_using_printer.cpp:102
msgid "Error Init Printer info" msgid "Error Init Printer info"
msgstr "Erreur Init info imprimante" msgstr "Erreur Init info imprimante"
#: pcbnew/dialog_print_using_printer.cpp:430 #: pcbnew/dialog_print_using_printer.cpp:434
msgid "Printer Problem!" msgid "Printer Problem!"
msgstr "Problème d'imprimante" msgstr "Problème d'imprimante"
#: pcbnew/dialog_print_using_printer.cpp:444 #: pcbnew/dialog_print_using_printer.cpp:448
msgid "Print Preview" msgid "Print Preview"
msgstr "Prévisualisation" msgstr "Prévisualisation"
#: pcbnew/dialog_print_using_printer.cpp:511 #: pcbnew/dialog_print_using_printer.cpp:515
msgid "There was a problem printing" msgid "There was a problem printing"
msgstr "Il y a un problème d'impression" msgstr "Il y a un problème d'impression"
@ -5193,11 +5149,11 @@ msgstr "Mots Clés"
msgid "inch" msgid "inch"
msgstr "Pouce" msgstr "Pouce"
#: pcbnew/dialog_SVG_print.cpp:206 #: pcbnew/dialog_SVG_print.cpp:209
msgid "Create file " msgid "Create file "
msgstr "Créer Fichier " msgstr "Créer Fichier "
#: pcbnew/dialog_SVG_print.cpp:208 #: pcbnew/dialog_SVG_print.cpp:211
msgid " error" msgid " error"
msgstr " erreur" msgstr " erreur"
@ -5884,7 +5840,7 @@ msgstr "Net Code"
msgid "Net Length" msgid "Net Length"
msgstr "Long. Net" msgstr "Long. Net"
#: pcbnew/dialog_print_for_modedit.cpp:202 #: pcbnew/dialog_print_for_modedit.cpp:203
msgid "Print Footprint" msgid "Print Footprint"
msgstr "Imprimer Module" msgstr "Imprimer Module"
@ -6239,7 +6195,7 @@ msgid "Setting libraries, directories and others..."
msgstr "Sélectionner les librairies, répertoires et autres" msgstr "Sélectionner les librairies, répertoires et autres"
#: pcbnew/menubar_pcbframe.cpp:376 #: pcbnew/menubar_pcbframe.cpp:376
#: pcbnew/dialog_general_options.cpp:251 #: pcbnew/dialog_general_options.cpp:222
msgid "Hide &Layers Manager" msgid "Hide &Layers Manager"
msgstr "Cacher le &Gestionnaire de Couches" msgstr "Cacher le &Gestionnaire de Couches"
@ -6403,27 +6359,27 @@ msgstr "Curseur"
msgid "Main cursor shape selection (small cross or large cursor)" msgid "Main cursor shape selection (small cross or large cursor)"
msgstr "Sélection de l'aspect du curseur principal (petite croix ou grand curseur)" msgstr "Sélection de l'aspect du curseur principal (petite croix ou grand curseur)"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:60 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51
msgid "Max Links:" msgid "Max Links:"
msgstr "Liens max:" msgstr "Liens max:"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:65 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:56
msgid "Adjust the number of ratsnets shown from cursor to closest pads" msgid "Adjust the number of ratsnets shown from cursor to closest pads"
msgstr "Ajuster le nombre de ratsnets montré du curseur aux pads les plus prêts" msgstr "Ajuster le nombre de ratsnets montré du curseur aux pads les plus prêts"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:69 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:60
msgid "Auto Save (minutes):" msgid "Auto Save (minutes):"
msgstr "Sauveg. Auto (minutes)" msgstr "Sauveg. Auto (minutes)"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:74 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:65
msgid "Delay after the first change to create a backup file of the board on disk." msgid "Delay after the first change to create a backup file of the board on disk."
msgstr "Délai après le premier changement pour créer un fichier de sauvegarde du circuit imprimé sur disque" msgstr "Délai après le premier changement pour créer un fichier de sauvegarde du circuit imprimé sur disque"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:83 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:74
msgid "Drc ON" msgid "Drc ON"
msgstr "Drc ACTIVE" msgstr "Drc ACTIVE"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:86 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:77
msgid "" msgid ""
"Enable/disable the DRC control.\n" "Enable/disable the DRC control.\n"
"When DRC is disable, all connections are allowed." "When DRC is disable, all connections are allowed."
@ -6431,19 +6387,19 @@ msgstr ""
"Active/désactive le contrôle DRC (Design Rule Check).\n" "Active/désactive le contrôle DRC (Design Rule Check).\n"
"Lorsque de DRC est désactivé, toutes les connexions sont autorisées." "Lorsque de DRC est désactivé, toutes les connexions sont autorisées."
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:90 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:81
msgid "Show Ratsnest" msgid "Show Ratsnest"
msgstr "Montrer le chevelu général" msgstr "Montrer le chevelu général"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:92 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:83
msgid "Show (or not) the full rastnest." msgid "Show (or not) the full rastnest."
msgstr "Montrer(ou non) le chevelu complet" msgstr "Montrer(ou non) le chevelu complet"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:96 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:87
msgid "Show Mod Ratsnest" msgid "Show Mod Ratsnest"
msgstr "Montrer le chevelu du module" msgstr "Montrer le chevelu du module"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:98 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:89
msgid "" msgid ""
"Shows (or not) the local ratsnest relative to a footprint, when moving it.\n" "Shows (or not) the local ratsnest relative to a footprint, when moving it.\n"
"This ratsnest is useful to place a footprint." "This ratsnest is useful to place a footprint."
@ -6451,64 +6407,64 @@ msgstr ""
"Montre (ou non) le chevelu local relatif à un module, lorsque on le déplace.\n" "Montre (ou non) le chevelu local relatif à un module, lorsque on le déplace.\n"
"Ce chevelu est utile pour placer un module." "Ce chevelu est utile pour placer un module."
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:102 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:93
msgid "Tracks Auto Del" msgid "Tracks Auto Del"
msgstr "Auto Supp. Pistes" msgstr "Auto Supp. Pistes"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:104 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:95
msgid "Enable/disable the automatic track deletion when recreating a track." msgid "Enable/disable the automatic track deletion when recreating a track."
msgstr "Active/désactive l'effacement de piste automatique lorsque l'on recrée une piste." msgstr "Active/désactive l'effacement de piste automatique lorsque l'on recrée une piste."
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:108 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:99
msgid "Track only 45 degrees" msgid "Track only 45 degrees"
msgstr "Piste à 45° seulement" msgstr "Piste à 45° seulement"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:110 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:101
msgid "If enabled, force tracks directions to H, V or 45 degrees, when creating a track." msgid "If enabled, force tracks directions to H, V or 45 degrees, when creating a track."
msgstr "Si activé, force la direction des pistes à H, V ou 45° en création de piste" msgstr "Si activé, force la direction des pistes à H, V ou 45° en création de piste"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:114 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:105
msgid "Segments 45 Only" msgid "Segments 45 Only"
msgstr "Segments 45° seulement" msgstr "Segments 45° seulement"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:116 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:107
msgid "If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers." msgid "If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers."
msgstr "Si activé, force la direction des segments à H, V ou 45° en création de segments sur couches techniques" msgstr "Si activé, force la direction des segments à H, V ou 45° en création de segments sur couches techniques"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:120 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:111
msgid "Auto PAN" msgid "Auto PAN"
msgstr "Auto PAN" msgstr "Auto PAN"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:122 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:113
msgid "Allows auto pan when creating a track, or moving an item." msgid "Allows auto pan when creating a track, or moving an item."
msgstr "Autorise l'autopan en création de piste, ou lorsque on déplace un élément." msgstr "Autorise l'autopan en création de piste, ou lorsque on déplace un élément."
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:126 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:117
msgid "Double Segm Track" msgid "Double Segm Track"
msgstr "2 segments pour piste" msgstr "2 segments pour piste"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:128 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:119
msgid "If enabled, uses two track segments, with 45 degrees angle between them when creating a new track " msgid "If enabled, uses two track segments, with 45 degrees angle between them when creating a new track "
msgstr "Si activé, utiliser 2 segments de piste, avec un angle de 45 degrés entre eux, pour créer une nouvelle piste" msgstr "Si activé, utiliser 2 segments de piste, avec un angle de 45 degrés entre eux, pour créer une nouvelle piste"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:137 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:128
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:145 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:136
msgid "When creating tracks" msgid "When creating tracks"
msgstr "En création de pistes" msgstr "En création de pistes"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:139 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:130
msgid "Magnetic Pads" msgid "Magnetic Pads"
msgstr " Pads magnétiques" msgstr " Pads magnétiques"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:141 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:132
msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area" msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
msgstr "Contrôle la capture du curseur pcb quand le curseur souris est sur un pad" msgstr "Contrôle la capture du curseur pcb quand le curseur souris est sur un pad"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:147 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:138
msgid "Magnetic Tracks" msgid "Magnetic Tracks"
msgstr "Pistes Magnétiques" msgstr "Pistes Magnétiques"
#: pcbnew/dialog_general_options_BoardEditor_base.cpp:149 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:140
msgid "Control the capture of the pcb cursor when the mouse cursor enters a track" msgid "Control the capture of the pcb cursor when the mouse cursor enters a track"
msgstr "Contrôle la capture du curseur pcb quand le curseur souris passe sur une piste" msgstr "Contrôle la capture du curseur pcb quand le curseur souris passe sur une piste"
@ -6746,27 +6702,23 @@ msgstr "Vias sur masque"
msgid "Print/plot vias on mask layers. They are in this case not protected" msgid "Print/plot vias on mask layers. They are in this case not protected"
msgstr "Trace vias sur vernis épargne. Elles seront non protégées" msgstr "Trace vias sur vernis épargne. Elles seront non protégées"
#: pcbnew/dialog_plot_base.cpp:174 #: pcbnew/dialog_plot_base.cpp:186
msgid "Line width"
msgstr "Epaisseur ligne"
#: pcbnew/dialog_plot_base.cpp:184
msgid "X scale adjust" msgid "X scale adjust"
msgstr "Ajustage Echelle X" msgstr "Ajustage Echelle X"
#: pcbnew/dialog_plot_base.cpp:193 #: pcbnew/dialog_plot_base.cpp:195
msgid "Y scale adjust" msgid "Y scale adjust"
msgstr "Ajustage Echelle Y" msgstr "Ajustage Echelle Y"
#: pcbnew/dialog_plot_base.cpp:203 #: pcbnew/dialog_plot_base.cpp:205
msgid "Plot" msgid "Plot"
msgstr "Tracer" msgstr "Tracer"
#: pcbnew/dialog_plot_base.cpp:207 #: pcbnew/dialog_plot_base.cpp:209
msgid "Save Options" msgid "Save Options"
msgstr "Sauver Options" msgstr "Sauver Options"
#: pcbnew/dialog_plot_base.cpp:210 #: pcbnew/dialog_plot_base.cpp:212
msgid "Generate drill file" msgid "Generate drill file"
msgstr "Créer Fichier de perçage" msgstr "Créer Fichier de perçage"
@ -6863,7 +6815,7 @@ msgstr "Mode d'affichage contraste normal"
msgid "High contrast display mode" msgid "High contrast display mode"
msgstr "Mode d'affichage haut contraste" msgstr "Mode d'affichage haut contraste"
#: pcbnew/dialog_general_options.cpp:254 #: pcbnew/dialog_general_options.cpp:225
msgid "Show &Layers Manager" msgid "Show &Layers Manager"
msgstr "Affiche le &Gestionnaire de Couches" msgstr "Affiche le &Gestionnaire de Couches"
@ -6945,6 +6897,54 @@ msgstr "Pistes sur Couches Cuivre seulement"
msgid "Cotation not authorized on Copper layers" msgid "Cotation not authorized on Copper layers"
msgstr "Cotation non autorisée sur Couches Cuivre" msgstr "Cotation non autorisée sur Couches Cuivre"
#: pcbnew/dialog_graphic_items_options_base.cpp:23
msgid "Graphics:"
msgstr "Eléments graphiques;"
#: pcbnew/dialog_graphic_items_options_base.cpp:25
msgid "Graphic segm Width"
msgstr "Epaisseur segm graphique"
#: pcbnew/dialog_graphic_items_options_base.cpp:32
msgid "Board Edges Width"
msgstr "Epaiss. contour pcb"
#: pcbnew/dialog_graphic_items_options_base.cpp:39
msgid "Copper Text Width"
msgstr "Epaisseur Texte sur cuivre"
#: pcbnew/dialog_graphic_items_options_base.cpp:46
msgid "Text Size V"
msgstr "Hauteur texte"
#: pcbnew/dialog_graphic_items_options_base.cpp:53
msgid "Text Size H"
msgstr "Largeur texte"
#: pcbnew/dialog_graphic_items_options_base.cpp:63
msgid "Modules:"
msgstr "Modules: "
#: pcbnew/dialog_graphic_items_options_base.cpp:65
msgid "Edges Module Width"
msgstr "Epaiss. contour module"
#: pcbnew/dialog_graphic_items_options_base.cpp:72
msgid "Text Module Width"
msgstr "Epaisseur Texte Module"
#: pcbnew/dialog_graphic_items_options_base.cpp:79
msgid "Text Module Size V"
msgstr "Hauteur Texte Module"
#: pcbnew/dialog_graphic_items_options_base.cpp:86
msgid "Text Module Size H"
msgstr "Largeur Texte Module"
#: pcbnew/dialog_graphic_items_options_base.cpp:96
msgid "General:"
msgstr "Général :"
#: eeschema/plotps.cpp:165 #: eeschema/plotps.cpp:165
msgid "Page Size A4" msgid "Page Size A4"
msgstr "Feuille A4" msgstr "Feuille A4"
@ -7243,27 +7243,27 @@ msgstr "Description"
msgid "Key words" msgid "Key words"
msgstr "Mots clé" msgstr "Mots clé"
#: eeschema/schframe.cpp:358 #: eeschema/schframe.cpp:359
msgid "Schematic modified, Save before exit ?" msgid "Schematic modified, Save before exit ?"
msgstr "Schématique modifiée, Sauver avant de quitter ?" msgstr "Schématique modifiée, Sauver avant de quitter ?"
#: eeschema/schframe.cpp:514 #: eeschema/schframe.cpp:515
msgid "Draw wires and buses in any direction" msgid "Draw wires and buses in any direction"
msgstr "Tracer les fils et bus avec direction quelconque" msgstr "Tracer les fils et bus avec direction quelconque"
#: eeschema/schframe.cpp:515 #: eeschema/schframe.cpp:516
msgid "Draw horizontal and vertical wires and buses only" msgid "Draw horizontal and vertical wires and buses only"
msgstr "Autoriser fils et bus verticaux et horizontaux seulement" msgstr "Autoriser fils et bus verticaux et horizontaux seulement"
#: eeschema/schframe.cpp:525 #: eeschema/schframe.cpp:526
msgid "Do not show hidden pins" msgid "Do not show hidden pins"
msgstr "Ne pas affichager les pins invisibles" msgstr "Ne pas affichager les pins invisibles"
#: eeschema/schframe.cpp:526 #: eeschema/schframe.cpp:527
msgid "Show hidden pins" msgid "Show hidden pins"
msgstr "Force affichage des pins invisibles" msgstr "Force affichage des pins invisibles"
#: eeschema/schframe.cpp:617 #: eeschema/schframe.cpp:618
msgid "Schematic" msgid "Schematic"
msgstr "Schématique" msgstr "Schématique"
@ -7479,7 +7479,6 @@ msgid "key search criteria <"
msgstr "critère de recherche par clé <" msgstr "critère de recherche par clé <"
#: eeschema/database.cpp:65 #: eeschema/database.cpp:65
#: eeschema/selpart.cpp:78
msgid "Select Component" msgid "Select Component"
msgstr "Sélection Composant" msgstr "Sélection Composant"
@ -10016,19 +10015,19 @@ msgstr "Imprimer en &noir et blanc seulement"
msgid "Page Setup" msgid "Page Setup"
msgstr "Options Page" msgstr "Options Page"
#: eeschema/dialog_print_using_printer.cpp:241 #: eeschema/dialog_print_using_printer.cpp:243
msgid "Print Schematic" msgid "Print Schematic"
msgstr "Impression Schématique" msgstr "Impression Schématique"
#: eeschema/dialog_print_using_printer.cpp:246 #: eeschema/dialog_print_using_printer.cpp:248
msgid "An error occurred attempting to print the schematic." msgid "An error occurred attempting to print the schematic."
msgstr "Une erreur s'est produite lors de l'impression." msgstr "Une erreur s'est produite lors de l'impression."
#: eeschema/dialog_print_using_printer.cpp:247 #: eeschema/dialog_print_using_printer.cpp:249
msgid "Printing" msgid "Printing"
msgstr "Impression" msgstr "Impression"
#: eeschema/dialog_print_using_printer.cpp:260 #: eeschema/dialog_print_using_printer.cpp:262
#, c-format #, c-format
msgid "Print page %d" msgid "Print page %d"
msgstr "Imprimer page %d" msgstr "Imprimer page %d"
@ -10055,6 +10054,16 @@ msgstr "oui"
msgid "arc only had %d parameters of the required 8" msgid "arc only had %d parameters of the required 8"
msgstr "l'arc a seulement %d paramètres sur les 8 requis" msgstr "l'arc a seulement %d paramètres sur les 8 requis"
#: eeschema/classes_body_items.cpp:535
#: eeschema/classes_body_items.cpp:795
#: eeschema/classes_body_items.cpp:1022
#: eeschema/classes_body_items.cpp:1274
#: eeschema/classes_body_items.cpp:1691
#: eeschema/classes_body_items.cpp:2061
#: eeschema/class_BodyItem_Text.cpp:330
msgid "Line width"
msgstr "Epaisseur ligne"
#: eeschema/classes_body_items.cpp:540 #: eeschema/classes_body_items.cpp:540
#: eeschema/classes_body_items.cpp:804 #: eeschema/classes_body_items.cpp:804
#: eeschema/classes_body_items.cpp:1279 #: eeschema/classes_body_items.cpp:1279
@ -10459,9 +10468,6 @@ msgstr "Taille du te&xte:"
#: eeschema/dialog_sch_sheet_props_base.cpp:42 #: eeschema/dialog_sch_sheet_props_base.cpp:42
#: eeschema/dialog_sch_sheet_props_base.cpp:63 #: eeschema/dialog_sch_sheet_props_base.cpp:63
#: eeschema/dialog_lib_edit_pin_base.cpp:41
#: eeschema/dialog_lib_edit_pin_base.cpp:64
#: eeschema/dialog_lib_edit_pin_base.cpp:87
msgid "units" msgid "units"
msgstr "unités" msgstr "unités"
@ -11177,7 +11183,7 @@ msgid "File <"
msgstr "Fichier <" msgstr "Fichier <"
#: cvpcb/readschematicnetlist.cpp:115 #: cvpcb/readschematicnetlist.cpp:115
#: kicad/prjconfig.cpp:106 #: kicad/prjconfig.cpp:108
msgid "> not found" msgid "> not found"
msgstr "> non trouvé" msgstr "> non trouvé"
@ -11426,16 +11432,16 @@ msgstr "Créer un Nouveau Projet"
msgid "Open Existing Project" msgid "Open Existing Project"
msgstr "Ouvrir un Projet Existant" msgstr "Ouvrir un Projet Existant"
#: kicad/prjconfig.cpp:105 #: kicad/prjconfig.cpp:107
msgid "Kicad project file <" msgid "Kicad project file <"
msgstr "Fichier projet Kicad <" msgstr "Fichier projet Kicad <"
#: kicad/prjconfig.cpp:119 #: kicad/prjconfig.cpp:121
#: kicad/kicad.cpp:74 #: kicad/kicad.cpp:74
msgid "Working dir: " msgid "Working dir: "
msgstr "Répertoire de travail: " msgstr "Répertoire de travail: "
#: kicad/prjconfig.cpp:120 #: kicad/prjconfig.cpp:122
#: kicad/kicad.cpp:75 #: kicad/kicad.cpp:75
msgid "" msgid ""
"\n" "\n"
@ -11444,10 +11450,6 @@ msgstr ""
"\n" "\n"
"Projet: " "Projet: "
#: kicad/kicad.cpp:102
msgid "noname"
msgstr "noname"
#: kicad/files-io.cpp:50 #: kicad/files-io.cpp:50
msgid "Unzip Project" msgid "Unzip Project"
msgstr "Décompresser Projet" msgstr "Décompresser Projet"
@ -11636,15 +11638,11 @@ msgstr "Créer un Nouveau Fichier"
msgid "Create New Directory" msgid "Create New Directory"
msgstr "Créer un nouveau Répertoire" msgstr "Créer un nouveau Répertoire"
#: kicad/tree_project_frame.cpp:521 #: kicad/tree_project_frame.cpp:1057
msgid "noname."
msgstr "noname."
#: kicad/tree_project_frame.cpp:1055
msgid "Change filename: " msgid "Change filename: "
msgstr "Changer Nom Fichier: " msgstr "Changer Nom Fichier: "
#: kicad/tree_project_frame.cpp:1057 #: kicad/tree_project_frame.cpp:1059
msgid "Change filename" msgid "Change filename"
msgstr "Changer Nom Fichier" msgstr "Changer Nom Fichier"
@ -12838,7 +12836,7 @@ msgstr "Propriétés du Pad"
msgid "Footprint text properties" msgid "Footprint text properties"
msgstr "Propriétés du texte du module" msgstr "Propriétés du texte du module"
#: pcbnew/dialog_general_options_BoardEditor_base.h:80 #: pcbnew/dialog_general_options_BoardEditor_base.h:78
msgid "General settings" msgid "General settings"
msgstr "Options Générales" msgstr "Options Générales"
@ -13015,6 +13013,10 @@ msgstr "Options d'Affichage"
msgid "Page Settings" msgid "Page Settings"
msgstr "Ajustage opt Page" msgstr "Ajustage opt Page"
#~ msgid "noname"
#~ msgstr "noname"
#~ msgid "noname."
#~ msgstr "noname."
#~ msgid "Pen Width Mini" #~ msgid "Pen Width Mini"
#~ msgstr "Epaiss Plume Mini" #~ msgstr "Epaiss Plume Mini"
#~ msgid "no kicad files found in this directory" #~ msgid "no kicad files found in this directory"

2
kicad/kicad.cpp
View File

@ -99,7 +99,7 @@ bool WinEDA_App::OnInit()
GetSettings(reopenLastUsedDirectory); GetSettings(reopenLastUsedDirectory);
/* Make nameless project translatable */ /* Make nameless project translatable */
wxFileName namelessProject( wxGetCwd(), _( "noname" ), ProjectFileExtension ); wxFileName namelessProject( wxGetCwd(), NAMELESS_PROJECT, ProjectFileExtension );
frame = new WinEDA_MainFrame( NULL, wxT( "KiCad" ), frame = new WinEDA_MainFrame( NULL, wxT( "KiCad" ),
wxPoint( 30, 20 ), wxSize( 600, 400 ) ); wxPoint( 30, 20 ), wxSize( 600, 400 ) );

4
kicad/prjconfig.cpp
View File

@ -100,7 +100,9 @@ void WinEDA_MainFrame::OnLoadProject( wxCommandEvent& event )
/* Check if project file exists and if it is not noname.pro */ /* Check if project file exists and if it is not noname.pro */
wxString filename = m_ProjectFileName.GetFullName(); wxString filename = m_ProjectFileName.GetFullName();
if( !m_ProjectFileName.FileExists() && !filename.IsSameAs(wxT("noname.pro"))) wxString nameless_prj = NAMELESS_PROJECT;
nameless_prj += wxT(".pro");
if( !m_ProjectFileName.FileExists() && !filename.IsSameAs(nameless_prj))
{ {
DisplayError( this, _( "Kicad project file <" ) + DisplayError( this, _( "Kicad project file <" ) +
m_ProjectFileName.GetFullPath() + _( "> not found" ) ); m_ProjectFileName.GetFullPath() + _( "> not found" ) );

6
kicad/tree_project_frame.cpp
View File

@ -518,7 +518,9 @@ void TREE_PROJECT_FRAME::NewFile( TreeFileType type )
dir = wxGetCwd() + wxFileName().GetPathSeparator() + treeData->GetDir(); dir = wxGetCwd() + wxFileName().GetPathSeparator() + treeData->GetDir();
// Ask for the new file name // Ask for the new file name
wxFileDialog dlg( this, title, dir, _( "noname." ) + mask, wxString nameless_prj = NAMELESS_PROJECT;
nameless_prj += wxT(".") + mask;
wxFileDialog dlg( this, title, dir, nameless_prj,
wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); wildcard, wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
if( dlg.ShowModal() == wxID_CANCEL ) if( dlg.ShowModal() == wxID_CANCEL )
@ -863,7 +865,7 @@ void TREE_PROJECT_FRAME::ReCreateTreePrj()
{ {
fn.Clear(); fn.Clear();
fn.SetPath( ::wxGetCwd() ); fn.SetPath( ::wxGetCwd() );
fn.SetName( wxT( "noname" ) ); fn.SetName( NAMELESS_PROJECT );
fn.SetExt( ProjectFileExtension ); fn.SetExt( ProjectFileExtension );
} }
else else

3
pcbnew/CMakeLists.txt
View File

@ -59,7 +59,8 @@ set(PCBNEW_SRCS
dialog_global_edit_tracks_and_vias.cpp dialog_global_edit_tracks_and_vias.cpp
dialog_global_edit_tracks_and_vias_base.cpp dialog_global_edit_tracks_and_vias_base.cpp
dialog_global_pads_edition_base.cpp dialog_global_pads_edition_base.cpp
# dialog_graphic_items_options.cpp dialog_graphic_items_options.cpp
dialog_graphic_items_options_base.cpp
dialog_graphic_item_properties.cpp dialog_graphic_item_properties.cpp
dialog_graphic_item_properties_base.cpp dialog_graphic_item_properties_base.cpp
# dialog_initpcb.cpp # dialog_initpcb.cpp

6
pcbnew/dialog_SVG_print.cpp
View File

@ -27,6 +27,8 @@
#define WIDTH_MAX_VALUE 500 #define WIDTH_MAX_VALUE 500
#define WIDTH_MIN_VALUE 1 #define WIDTH_MIN_VALUE 1
extern int g_DrawDefaultLineThickness;
// Local variables: // Local variables:
static PRINT_PARAMETERS s_Parameters; static PRINT_PARAMETERS s_Parameters;
static long s_SelectedLayers = LAYER_BACK | LAYER_FRONT | static long s_SelectedLayers = LAYER_BACK | LAYER_FRONT |
@ -88,10 +90,10 @@ void DIALOG_SVG_PRINT::OnInitDialog( wxInitDialogEvent& event )
m_ImageXSize_mm = 270; m_ImageXSize_mm = 270;
if( m_Config ) if( m_Config )
{ {
m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &s_Parameters.m_PenDefaultSize );
m_Config->Read( PLOTSVGMODECOLOR_KEY, &s_Parameters.m_Print_Black_and_White ); m_Config->Read( PLOTSVGMODECOLOR_KEY, &s_Parameters.m_Print_Black_and_White );
} }
s_Parameters.m_PenDefaultSize = g_DrawDefaultLineThickness;
AddUnitSymbol( *m_TextPenWidth, g_UnitMetric ); AddUnitSymbol( *m_TextPenWidth, g_UnitMetric );
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize, ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize,
@ -159,6 +161,7 @@ void DIALOG_SVG_PRINT::SetPenWidth()
s_Parameters.m_PenDefaultSize = WIDTH_MIN_VALUE; s_Parameters.m_PenDefaultSize = WIDTH_MIN_VALUE;
} }
g_DrawDefaultLineThickness = s_Parameters.m_PenDefaultSize;
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize, ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize,
m_Parent->m_InternalUnits ) ); m_Parent->m_InternalUnits ) );
@ -303,7 +306,6 @@ void DIALOG_SVG_PRINT::OnCloseWindow( wxCloseEvent& event )
s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection(); s_Parameters.m_Print_Black_and_White = m_ModeColorOption->GetSelection();
if( m_Config ) if( m_Config )
{ {
m_Config->Write( OPTKEY_PLOT_LINEWIDTH_VALUE, s_Parameters.m_PenDefaultSize );
m_Config->Write( PLOTSVGMODECOLOR_KEY, s_Parameters.m_Print_Black_and_White ); m_Config->Write( PLOTSVGMODECOLOR_KEY, s_Parameters.m_Print_Black_and_White );
wxString layerKey; wxString layerKey;
for( int layer = 0; layer<NB_LAYERS; ++layer ) for( int layer = 0; layer<NB_LAYERS; ++layer )

29
pcbnew/dialog_general_options.cpp
View File

@ -103,35 +103,6 @@ void Dialog_GeneralOptions::OnOkClick( wxCommandEvent& event )
} }
#include "dialog_graphic_items_options.cpp"
void WinEDA_PcbFrame::InstallPcbOptionsFrame( int id )
{
switch( id )
{
case ID_PCB_DRAWINGS_WIDTHS_SETUP:
{
WinEDA_GraphicItemsOptionsDialog dlg( this );
dlg.ShowModal();
}
break;
default:
wxMessageBox( wxT( "InstallPcbOptionsFrame() id error" ) );
break;
}
}
void WinEDA_ModuleEditFrame::InstallOptionsFrame( const wxPoint& pos )
{
WinEDA_GraphicItemsOptionsDialog dlg( this );
dlg.ShowModal();
}
/* Must be called on a click on the left toolbar (options toolbar /* Must be called on a click on the left toolbar (options toolbar
* Update variables according to tools states * Update variables according to tools states
*/ */

305
pcbnew/dialog_general_options_BoardEditor_base.cpp
View File

@ -11,165 +11,156 @@
DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) DialogGeneralOptionsBoardEditor_base::DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bMainSizer; wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxHORIZONTAL ); bMainSizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bLeftSizer; wxBoxSizer* bLeftSizer;
bLeftSizer = new wxBoxSizer( wxVERTICAL ); bLeftSizer = new wxBoxSizer( wxVERTICAL );
wxString m_PolarDisplayChoices[] = { _("No Display"), _("Display") }; wxString m_PolarDisplayChoices[] = { _("No Display"), _("Display") };
int m_PolarDisplayNChoices = sizeof( m_PolarDisplayChoices ) / sizeof( wxString ); int m_PolarDisplayNChoices = sizeof( m_PolarDisplayChoices ) / sizeof( wxString );
m_PolarDisplay = new wxRadioBox( this, wxID_POLAR_CTRL, _("Display Polar Coord"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayNChoices, m_PolarDisplayChoices, 1, wxRA_SPECIFY_COLS ); m_PolarDisplay = new wxRadioBox( this, wxID_POLAR_CTRL, _("Display Polar Coord"), wxDefaultPosition, wxDefaultSize, m_PolarDisplayNChoices, m_PolarDisplayChoices, 1, wxRA_SPECIFY_COLS );
m_PolarDisplay->SetSelection( 1 ); m_PolarDisplay->SetSelection( 1 );
m_PolarDisplay->SetToolTip( _("Activates the display of relative coordinates from relative origin (set by the space key)\nto the cursor, in polar coordinates (angle and distance)") ); m_PolarDisplay->SetToolTip( _("Activates the display of relative coordinates from relative origin (set by the space key)\nto the cursor, in polar coordinates (angle and distance)") );
bLeftSizer->Add( m_PolarDisplay, 0, wxALL|wxEXPAND, 5 ); bLeftSizer->Add( m_PolarDisplay, 0, wxALL|wxEXPAND, 5 );
wxString m_UnitsSelectionChoices[] = { _("Inches"), _("Millimeters") }; wxString m_UnitsSelectionChoices[] = { _("Inches"), _("Millimeters") };
int m_UnitsSelectionNChoices = sizeof( m_UnitsSelectionChoices ) / sizeof( wxString ); int m_UnitsSelectionNChoices = sizeof( m_UnitsSelectionChoices ) / sizeof( wxString );
m_UnitsSelection = new wxRadioBox( this, wxID_UNITS, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitsSelectionNChoices, m_UnitsSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_UnitsSelection = new wxRadioBox( this, wxID_UNITS, _("Units"), wxDefaultPosition, wxDefaultSize, m_UnitsSelectionNChoices, m_UnitsSelectionChoices, 1, wxRA_SPECIFY_COLS );
m_UnitsSelection->SetSelection( 1 ); m_UnitsSelection->SetSelection( 1 );
m_UnitsSelection->SetToolTip( _("Selection of units used to display dimensions and positions of items") ); m_UnitsSelection->SetToolTip( _("Selection of units used to display dimensions and positions of items") );
bLeftSizer->Add( m_UnitsSelection, 0, wxALL|wxEXPAND, 5 ); bLeftSizer->Add( m_UnitsSelection, 0, wxALL|wxEXPAND, 5 );
wxString m_CursorShapeChoices[] = { _("Small cross"), _("Full screen cursor") }; wxString m_CursorShapeChoices[] = { _("Small cross"), _("Full screen cursor") };
int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString ); int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString );
m_CursorShape = new wxRadioBox( this, wxID_CURSOR_SHAPE, _("Cursor"), wxDefaultPosition, wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices, 1, wxRA_SPECIFY_COLS ); m_CursorShape = new wxRadioBox( this, wxID_CURSOR_SHAPE, _("Cursor"), wxDefaultPosition, wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices, 1, wxRA_SPECIFY_COLS );
m_CursorShape->SetSelection( 0 ); m_CursorShape->SetSelection( 0 );
m_CursorShape->SetToolTip( _("Main cursor shape selection (small cross or large cursor)") ); m_CursorShape->SetToolTip( _("Main cursor shape selection (small cross or large cursor)") );
bLeftSizer->Add( m_CursorShape, 0, wxALL|wxEXPAND, 5 ); bLeftSizer->Add( m_CursorShape, 0, wxALL|wxEXPAND, 5 );
bMainSizer->Add( bLeftSizer, 1, wxEXPAND, 5 ); bMainSizer->Add( bLeftSizer, 1, wxEXPAND, 5 );
wxBoxSizer* bMiddleLeftSizer; wxBoxSizer* bMiddleLeftSizer;
bMiddleLeftSizer = new wxBoxSizer( wxVERTICAL ); bMiddleLeftSizer = new wxBoxSizer( wxVERTICAL );
/* m_staticTextmaxlinks = new wxStaticText( this, wxID_ANY, _("Max Links:"), wxDefaultPosition, wxDefaultSize, 0 );
wxString m_LayerNumberChoices[] = { _("1"), _("2"), _("4"), _("6"), _("8"), _("10"), _("12"), _("14"), _("16") }; m_staticTextmaxlinks->Wrap( -1 );
int m_LayerNumberNChoices = sizeof( m_LayerNumberChoices ) / sizeof( wxString ); bMiddleLeftSizer->Add( m_staticTextmaxlinks, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_LayerNumber = new wxRadioBox( this, wxID_LAYER_NUMBER, _("Layers:"), wxDefaultPosition, wxDefaultSize, m_LayerNumberNChoices, m_LayerNumberChoices, 3, wxRA_SPECIFY_COLS );
m_LayerNumber->SetSelection( 1 ); m_MaxShowLinks = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 5, 1 );
m_LayerNumber->SetToolTip( _("Active copper layers count selection") ); m_MaxShowLinks->SetToolTip( _("Adjust the number of ratsnets shown from cursor to closest pads") );
bMiddleLeftSizer->Add( m_LayerNumber, 0, wxALL|wxEXPAND, 5 ); bMiddleLeftSizer->Add( m_MaxShowLinks, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
*/
m_staticTextmaxlinks = new wxStaticText( this, wxID_ANY, _("Max Links:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextautosave = new wxStaticText( this, wxID_ANY, _("Auto Save (minutes):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextmaxlinks->Wrap( -1 ); m_staticTextautosave->Wrap( -1 );
bMiddleLeftSizer->Add( m_staticTextmaxlinks, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bMiddleLeftSizer->Add( m_staticTextautosave, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_MaxShowLinks = new wxSpinCtrl( this, wxID_ANY, wxT("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 5, 1 ); m_SaveTime = new wxSpinCtrl( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 60, 0 );
m_MaxShowLinks->SetToolTip( _("Adjust the number of ratsnets shown from cursor to closest pads") ); m_SaveTime->SetToolTip( _("Delay after the first change to create a backup file of the board on disk.") );
bMiddleLeftSizer->Add( m_MaxShowLinks, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); bMiddleLeftSizer->Add( m_SaveTime, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_staticTextautosave = new wxStaticText( this, wxID_ANY, _("Auto Save (minutes):"), wxDefaultPosition, wxDefaultSize, 0 ); bMainSizer->Add( bMiddleLeftSizer, 1, wxEXPAND, 5 );
m_staticTextautosave->Wrap( -1 );
bMiddleLeftSizer->Add( m_staticTextautosave, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxStaticBoxSizer* bMiddleRightBoxSizer;
bMiddleRightBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
m_SaveTime = new wxSpinCtrl( this, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 60, 0 );
m_SaveTime->SetToolTip( _("Delay after the first change to create a backup file of the board on disk.") ); m_DrcOn = new wxCheckBox( this, wxID_DRC_ONOFF, _("Drc ON"), wxDefaultPosition, wxDefaultSize, 0 );
m_DrcOn->SetValue(true);
bMiddleLeftSizer->Add( m_SaveTime, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_DrcOn->SetToolTip( _("Enable/disable the DRC control.\nWhen DRC is disable, all connections are allowed.") );
bMainSizer->Add( bMiddleLeftSizer, 1, wxEXPAND, 5 );
bMiddleRightBoxSizer->Add( m_DrcOn, 0, wxALL|wxEXPAND, 5 );
wxStaticBoxSizer* bMiddleRightBoxSizer;
bMiddleRightBoxSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); m_ShowGlobalRatsnest = new wxCheckBox( this, wxID_GENERAL_RATSNEST, _("Show Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 );
m_DrcOn = new wxCheckBox( this, wxID_DRC_ONOFF, _("Drc ON"), wxDefaultPosition, wxDefaultSize, 0 ); m_ShowGlobalRatsnest->SetToolTip( _("Show (or not) the full rastnest.") );
m_DrcOn->SetValue(true);
bMiddleRightBoxSizer->Add( m_ShowGlobalRatsnest, 0, wxALL, 5 );
m_DrcOn->SetToolTip( _("Enable/disable the DRC control.\nWhen DRC is disable, all connections are allowed.") );
m_ShowModuleRatsnest = new wxCheckBox( this, wxID_RATSNEST_MODULE, _("Show Mod Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_DrcOn, 0, wxALL|wxEXPAND, 5 );
m_ShowModuleRatsnest->SetToolTip( _("Shows (or not) the local ratsnest relative to a footprint, when moving it.\nThis ratsnest is useful to place a footprint.") );
m_ShowGlobalRatsnest = new wxCheckBox( this, wxID_GENERAL_RATSNEST, _("Show Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_ShowModuleRatsnest, 0, wxALL, 5 );
m_ShowGlobalRatsnest->SetToolTip( _("Show (or not) the full rastnest.") );
m_TrackAutodel = new wxCheckBox( this, wxID_TRACK_AUTODEL, _("Tracks Auto Del"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_ShowGlobalRatsnest, 0, wxALL, 5 );
m_TrackAutodel->SetToolTip( _("Enable/disable the automatic track deletion when recreating a track.") );
m_ShowModuleRatsnest = new wxCheckBox( this, wxID_RATSNEST_MODULE, _("Show Mod Ratsnest"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_TrackAutodel, 0, wxALL, 5 );
m_ShowModuleRatsnest->SetToolTip( _("Shows (or not) the local ratsnest relative to a footprint, when moving it.\nThis ratsnest is useful to place a footprint.") );
m_Track_45_Only_Ctrl = new wxCheckBox( this, wxID_TRACKS45, _("Track only 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_ShowModuleRatsnest, 0, wxALL, 5 );
m_Track_45_Only_Ctrl->SetToolTip( _("If enabled, force tracks directions to H, V or 45 degrees, when creating a track.") );
m_TrackAutodel = new wxCheckBox( this, wxID_TRACK_AUTODEL, _("Tracks Auto Del"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_Track_45_Only_Ctrl, 0, wxALL, 5 );
m_TrackAutodel->SetToolTip( _("Enable/disable the automatic track deletion when recreating a track.") );
m_Segments_45_Only_Ctrl = new wxCheckBox( this, wxID_SEGMENTS45, _("Segments 45 Only"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_TrackAutodel, 0, wxALL, 5 );
m_Segments_45_Only_Ctrl->SetToolTip( _("If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers.") );
m_Track_45_Only_Ctrl = new wxCheckBox( this, wxID_TRACKS45, _("Track only 45 degrees"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 );
m_Track_45_Only_Ctrl->SetToolTip( _("If enabled, force tracks directions to H, V or 45 degrees, when creating a track.") );
m_AutoPANOpt = new wxCheckBox( this, wxID_AUTOPAN, _("Auto PAN"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_Track_45_Only_Ctrl, 0, wxALL, 5 );
m_AutoPANOpt->SetToolTip( _("Allows auto pan when creating a track, or moving an item.") );
m_Segments_45_Only_Ctrl = new wxCheckBox( this, wxID_SEGMENTS45, _("Segments 45 Only"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_AutoPANOpt, 0, wxALL, 5 );
m_Segments_45_Only_Ctrl->SetToolTip( _("If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers.") );
m_Track_DoubleSegm_Ctrl = new wxCheckBox( this, wxID_ANY, _("Double Segm Track"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_Segments_45_Only_Ctrl, 0, wxALL, 5 );
m_Track_DoubleSegm_Ctrl->SetToolTip( _("If enabled, uses two track segments, with 45 degrees angle between them when creating a new track ") );
m_AutoPANOpt = new wxCheckBox( this, wxID_AUTOPAN, _("Auto PAN"), wxDefaultPosition, wxDefaultSize, 0 );
bMiddleRightBoxSizer->Add( m_Track_DoubleSegm_Ctrl, 0, wxALL, 5 );
m_AutoPANOpt->SetToolTip( _("Allows auto pan when creating a track, or moving an item.") );
bMainSizer->Add( bMiddleRightBoxSizer, 1, 0, 5 );
bMiddleRightBoxSizer->Add( m_AutoPANOpt, 0, wxALL, 5 );
wxBoxSizer* bRightSizer;
m_Track_DoubleSegm_Ctrl = new wxCheckBox( this, wxID_ANY, _("Double Segm Track"), wxDefaultPosition, wxDefaultSize, 0 ); bRightSizer = new wxBoxSizer( wxVERTICAL );
m_Track_DoubleSegm_Ctrl->SetToolTip( _("If enabled, uses two track segments, with 45 degrees angle between them when creating a new track ") ); wxString m_MagneticPadOptCtrlChoices[] = { _("Never"), _("When creating tracks"), _("Always") };
int m_MagneticPadOptCtrlNChoices = sizeof( m_MagneticPadOptCtrlChoices ) / sizeof( wxString );
bMiddleRightBoxSizer->Add( m_Track_DoubleSegm_Ctrl, 0, wxALL, 5 ); m_MagneticPadOptCtrl = new wxRadioBox( this, wxID_ANY, _("Magnetic Pads"), wxDefaultPosition, wxDefaultSize, m_MagneticPadOptCtrlNChoices, m_MagneticPadOptCtrlChoices, 1, wxRA_SPECIFY_COLS );
m_MagneticPadOptCtrl->SetSelection( 0 );
bMainSizer->Add( bMiddleRightBoxSizer, 1, 0, 5 ); m_MagneticPadOptCtrl->SetToolTip( _("control the capture of the pcb cursor when the mouse cursor enters a pad area") );
wxBoxSizer* bRightSizer; bRightSizer->Add( m_MagneticPadOptCtrl, 0, wxALL|wxEXPAND, 5 );
bRightSizer = new wxBoxSizer( wxVERTICAL );
wxString m_MagneticTrackOptCtrlChoices[] = { _("Never"), _("When creating tracks"), _("Always") };
wxString m_MagneticPadOptCtrlChoices[] = { _("Never"), _("When creating tracks"), _("Always") }; int m_MagneticTrackOptCtrlNChoices = sizeof( m_MagneticTrackOptCtrlChoices ) / sizeof( wxString );
int m_MagneticPadOptCtrlNChoices = sizeof( m_MagneticPadOptCtrlChoices ) / sizeof( wxString ); m_MagneticTrackOptCtrl = new wxRadioBox( this, wxID_MAGNETIC_TRACKS, _("Magnetic Tracks"), wxDefaultPosition, wxDefaultSize, m_MagneticTrackOptCtrlNChoices, m_MagneticTrackOptCtrlChoices, 1, wxRA_SPECIFY_COLS );
m_MagneticPadOptCtrl = new wxRadioBox( this, wxID_ANY, _("Magnetic Pads"), wxDefaultPosition, wxDefaultSize, m_MagneticPadOptCtrlNChoices, m_MagneticPadOptCtrlChoices, 1, wxRA_SPECIFY_COLS ); m_MagneticTrackOptCtrl->SetSelection( 0 );
m_MagneticPadOptCtrl->SetSelection( 0 ); m_MagneticTrackOptCtrl->SetToolTip( _("Control the capture of the pcb cursor when the mouse cursor enters a track") );
m_MagneticPadOptCtrl->SetToolTip( _("control the capture of the pcb cursor when the mouse cursor enters a pad area") );
bRightSizer->Add( m_MagneticTrackOptCtrl, 0, wxALL|wxEXPAND, 5 );
bRightSizer->Add( m_MagneticPadOptCtrl, 0, wxALL|wxEXPAND, 5 );
m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
wxString m_MagneticTrackOptCtrlChoices[] = { _("Never"), _("When creating tracks"), _("Always") }; m_buttonOK->SetDefault();
int m_MagneticTrackOptCtrlNChoices = sizeof( m_MagneticTrackOptCtrlChoices ) / sizeof( wxString ); bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
m_MagneticTrackOptCtrl = new wxRadioBox( this, wxID_MAGNETIC_TRACKS, _("Magnetic Tracks"), wxDefaultPosition, wxDefaultSize, m_MagneticTrackOptCtrlNChoices, m_MagneticTrackOptCtrlChoices, 1, wxRA_SPECIFY_COLS );
m_MagneticTrackOptCtrl->SetSelection( 0 ); m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
m_MagneticTrackOptCtrl->SetToolTip( _("Control the capture of the pcb cursor when the mouse cursor enters a track") ); bRightSizer->Add( m_buttonCANCEL, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
bRightSizer->Add( m_MagneticTrackOptCtrl, 0, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bRightSizer, 1, wxEXPAND, 5 );
m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); this->SetSizer( bMainSizer );
m_buttonOK->SetDefault(); this->Layout();
bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
// Connect Events
m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnOkClick ), NULL, this );
bRightSizer->Add( m_buttonCANCEL, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnCancelClick ), NULL, this );
bMainSizer->Add( bRightSizer, 1, wxEXPAND, 5 );
this->SetSizer( bMainSizer );
this->Layout();
// Connect Events
m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnOkClick ), NULL, this );
m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnCancelClick ), NULL, this );
} }
DialogGeneralOptionsBoardEditor_base::~DialogGeneralOptionsBoardEditor_base() DialogGeneralOptionsBoardEditor_base::~DialogGeneralOptionsBoardEditor_base()
{ {
// Disconnect Events // Disconnect Events
m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnOkClick ), NULL, this ); m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnOkClick ), NULL, this );
m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnCancelClick ), NULL, this ); m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogGeneralOptionsBoardEditor_base::OnCancelClick ), NULL, this );
} }

54
pcbnew/dialog_general_options_BoardEditor_base.fbp
View File

@ -257,60 +257,6 @@
<property name="name">bMiddleLeftSizer</property> <property name="name">bMiddleLeftSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="1">
<property name="bg"></property>
<property name="choices">&quot;1&quot; &quot;2&quot; &quot;4&quot; &quot;6&quot; &quot;8&quot; &quot;10&quot; &quot;12&quot; &quot;14&quot; &quot;16&quot;</property>
<property name="context_help"></property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_LAYER_NUMBER</property>
<property name="label">Layers:</property>
<property name="majorDimension">3</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">m_LayerNumber</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="selection">1</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property>
<property name="tooltip">Active copper layers count selection</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioBox"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property> <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>

96
pcbnew/dialog_general_options_BoardEditor_base.h
View File

@ -31,55 +31,53 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DialogGeneralOptionsBoardEditor_base : public wxDialog class DialogGeneralOptionsBoardEditor_base : public wxDialog
{ {
private: private:
protected: protected:
enum enum
{ {
wxID_POLAR_CTRL = 1000, wxID_POLAR_CTRL = 1000,
wxID_UNITS, wxID_UNITS,
wxID_CURSOR_SHAPE, wxID_CURSOR_SHAPE,
// wxID_LAYER_NUMBER, wxID_DRC_ONOFF,
wxID_DRC_ONOFF, wxID_GENERAL_RATSNEST,
wxID_GENERAL_RATSNEST, wxID_RATSNEST_MODULE,
wxID_RATSNEST_MODULE, wxID_TRACK_AUTODEL,
wxID_TRACK_AUTODEL, wxID_TRACKS45,
wxID_TRACKS45, wxID_SEGMENTS45,
wxID_SEGMENTS45, wxID_AUTOPAN,
wxID_AUTOPAN, wxID_MAGNETIC_TRACKS,
wxID_MAGNETIC_TRACKS, };
};
wxRadioBox* m_PolarDisplay;
wxRadioBox* m_PolarDisplay; wxRadioBox* m_UnitsSelection;
wxRadioBox* m_UnitsSelection; wxRadioBox* m_CursorShape;
wxRadioBox* m_CursorShape; wxStaticText* m_staticTextmaxlinks;
//wxRadioBox* m_LayerNumber; wxSpinCtrl* m_MaxShowLinks;
wxStaticText* m_staticTextmaxlinks; wxStaticText* m_staticTextautosave;
wxSpinCtrl* m_MaxShowLinks; wxSpinCtrl* m_SaveTime;
wxStaticText* m_staticTextautosave; wxCheckBox* m_DrcOn;
wxSpinCtrl* m_SaveTime; wxCheckBox* m_ShowGlobalRatsnest;
wxCheckBox* m_DrcOn; wxCheckBox* m_ShowModuleRatsnest;
wxCheckBox* m_ShowGlobalRatsnest; wxCheckBox* m_TrackAutodel;
wxCheckBox* m_ShowModuleRatsnest; wxCheckBox* m_Track_45_Only_Ctrl;
wxCheckBox* m_TrackAutodel; wxCheckBox* m_Segments_45_Only_Ctrl;
wxCheckBox* m_Track_45_Only_Ctrl; wxCheckBox* m_AutoPANOpt;
wxCheckBox* m_Segments_45_Only_Ctrl; wxCheckBox* m_Track_DoubleSegm_Ctrl;
wxCheckBox* m_AutoPANOpt; wxRadioBox* m_MagneticPadOptCtrl;
wxCheckBox* m_Track_DoubleSegm_Ctrl; wxRadioBox* m_MagneticTrackOptCtrl;
wxRadioBox* m_MagneticPadOptCtrl; wxButton* m_buttonOK;
wxRadioBox* m_MagneticTrackOptCtrl; wxButton* m_buttonCANCEL;
wxButton* m_buttonOK;
wxButton* m_buttonCANCEL; // Virtual event handlers, overide them in your derived class
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
// Virtual event handlers, overide them in your derived class virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
public:
DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 585,280 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
public: ~DialogGeneralOptionsBoardEditor_base();
DialogGeneralOptionsBoardEditor_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 585,280 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DialogGeneralOptionsBoardEditor_base();
}; };
#endif //__dialog_general_options_BoardEditor_base__ #endif //__dialog_general_options_BoardEditor_base__

425
pcbnew/dialog_graphic_items_options.cpp
View File

@ -4,23 +4,65 @@
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h"
#include "common.h" #include "common.h"
#include "pcbnew.h" #include "pcbnew.h"
#include "pcbplot.h" #include "wxPcbStruct.h"
#include "autorout.h"
#include "pcbnew_id.h" #include "pcbnew_id.h"
#include "protos.h"
#include "dialog_graphic_items_options.h" #include "dialog_graphic_items_options.h"
#include <wx/spinctrl.h> extern int g_DrawDefaultLineThickness;
void WinEDA_GraphicItemsOptionsDialog::SetDisplayValue() void WinEDA_PcbFrame::InstallPcbOptionsFrame( int id )
{
switch( id )
{
case ID_PCB_DRAWINGS_WIDTHS_SETUP:
{
DIALOG_GRAPHIC_ITEMS_OPTIONS dlg( this );
dlg.ShowModal();
}
break;
default:
wxMessageBox( wxT( "InstallPcbOptionsFrame() id error" ) );
break;
}
}
void WinEDA_ModuleEditFrame::InstallOptionsFrame( const wxPoint& pos )
{
DIALOG_GRAPHIC_ITEMS_OPTIONS dlg( this );
dlg.ShowModal();
}
/*
* DIALOG_GRAPHIC_ITEMS_OPTIONS constructor
*/
DIALOG_GRAPHIC_ITEMS_OPTIONS::DIALOG_GRAPHIC_ITEMS_OPTIONS( WinEDA_BasePcbFrame* parent )
: DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE( parent )
{
m_Parent = parent;
m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings();
initValues( );
GetSizer()->SetSizeHints( this );
Centre();
}
DIALOG_GRAPHIC_ITEMS_OPTIONS::~DIALOG_GRAPHIC_ITEMS_OPTIONS( )
{
}
void DIALOG_GRAPHIC_ITEMS_OPTIONS::initValues()
{ {
/* Drawings width */ /* Drawings width */
AddUnitSymbol( *m_GraphicSegmWidthTitle ); AddUnitSymbol( *m_GraphicSegmWidthTitle );
@ -64,10 +106,14 @@ void WinEDA_GraphicItemsOptionsDialog::SetDisplayValue()
AddUnitSymbol( *m_TextModSizeHTitle ); AddUnitSymbol( *m_TextModSizeHTitle );
PutValueInLocalUnits( *m_OptModuleTextHSize, PutValueInLocalUnits( *m_OptModuleTextHSize,
ModuleTextSize.x, PCB_INTERNAL_UNIT ); ModuleTextSize.x, PCB_INTERNAL_UNIT );
AddUnitSymbol( *m_DefaultPenSizeTitle );
PutValueInLocalUnits( *m_DefaultPenSizeCtrl,
g_DrawDefaultLineThickness, PCB_INTERNAL_UNIT );
} }
void WinEDA_GraphicItemsOptionsDialog::AcceptOptions( wxCommandEvent& event ) void DIALOG_GRAPHIC_ITEMS_OPTIONS::OnOkClick( wxCommandEvent& event )
{ {
m_BrdSettings->m_DrawSegmentWidth = m_BrdSettings->m_DrawSegmentWidth =
ReturnValueFromTextCtrl( *m_OptPcbSegmWidth, PCB_INTERNAL_UNIT ); ReturnValueFromTextCtrl( *m_OptPcbSegmWidth, PCB_INTERNAL_UNIT );
@ -88,372 +134,23 @@ void WinEDA_GraphicItemsOptionsDialog::AcceptOptions( wxCommandEvent& event )
ReturnValueFromTextCtrl( *m_OptModuleTextVSize, PCB_INTERNAL_UNIT ); ReturnValueFromTextCtrl( *m_OptModuleTextVSize, PCB_INTERNAL_UNIT );
ModuleTextSize.x = ModuleTextSize.x =
ReturnValueFromTextCtrl( *m_OptModuleTextHSize, PCB_INTERNAL_UNIT ); ReturnValueFromTextCtrl( *m_OptModuleTextHSize, PCB_INTERNAL_UNIT );
g_DrawDefaultLineThickness =
ReturnValueFromTextCtrl( *m_DefaultPenSizeCtrl, PCB_INTERNAL_UNIT );
if( g_DrawDefaultLineThickness < 0 )
g_DrawDefaultLineThickness = 0;
EndModal( 1 ); EndModal( 1 );
} }
/*!
* WinEDA_GraphicItemsOptionsDialog event table definition
*/
BEGIN_EVENT_TABLE( WinEDA_GraphicItemsOptionsDialog, wxDialog )
////@begin WinEDA_GraphicItemsOptionsDialog event table entries
EVT_BUTTON( wxID_OK, WinEDA_GraphicItemsOptionsDialog::OnOkClick )
EVT_BUTTON( wxID_CANCEL, WinEDA_GraphicItemsOptionsDialog::OnCancelClick )
////@end WinEDA_GraphicItemsOptionsDialog event table entries
END_EVENT_TABLE()
/*!
* WinEDA_GraphicItemsOptionsDialog constructor
*/
WinEDA_GraphicItemsOptionsDialog::WinEDA_GraphicItemsOptionsDialog(
WinEDA_BasePcbFrame* parent,
wxWindowID id,
const wxString& caption,
const wxPoint& pos,
const wxSize& size,
long style )
{
m_Parent = parent;
m_BrdSettings = m_Parent->GetBoard()->GetBoardDesignSettings();
Create( parent, id, caption, pos, size, style );
}
/*!
* WinEDA_GraphicItemsOptionsDialog creator
*/
bool WinEDA_GraphicItemsOptionsDialog::Create( wxWindow* parent,
wxWindowID id,
const wxString& caption,
const wxPoint& pos,
const wxSize& size,
long style )
{
////@begin WinEDA_GraphicItemsOptionsDialog member initialisation
m_GraphicSegmWidthTitle = NULL;
m_OptPcbSegmWidth = NULL;
m_BoardEdgesWidthTitle = NULL;
m_OptPcbEdgesWidth = NULL;
m_CopperTextWidthTitle = NULL;
m_OptPcbTextWidth = NULL;
m_TextSizeVTitle = NULL;
m_OptPcbTextVSize = NULL;
m_TextSizeHTitle = NULL;
m_OptPcbTextHSize = NULL;
m_EdgeModWidthTitle = NULL;
m_OptModuleEdgesWidth = NULL;
m_TextModWidthTitle = NULL;
m_OptModuleTextWidth = NULL;
m_TextModSizeVTitle = NULL;
m_OptModuleTextVSize = NULL;
m_TextModSizeHTitle = NULL;
m_OptModuleTextHSize = NULL;
////@end WinEDA_GraphicItemsOptionsDialog member initialisation
////@begin WinEDA_GraphicItemsOptionsDialog creation
SetExtraStyle( wxWS_EX_BLOCK_EVENTS );
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
if( GetSizer() )
{
GetSizer()->SetSizeHints( this );
}
Centre();
////@end WinEDA_GraphicItemsOptionsDialog creation
return true;
}
/*!
* Control creation for WinEDA_GraphicItemsOptionsDialog
*/
void WinEDA_GraphicItemsOptionsDialog::CreateControls()
{
////@begin WinEDA_GraphicItemsOptionsDialog content construction
// Generated by DialogBlocks, 29/04/2009 15:15:02 (unregistered)
WinEDA_GraphicItemsOptionsDialog* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer( wxHORIZONTAL );
itemDialog1->SetSizer( itemBoxSizer2 );
wxStaticBox* itemStaticBoxSizer3Static =
new wxStaticBox(itemDialog1, wxID_ANY, _( "Graphics:" ) );
wxStaticBoxSizer* itemStaticBoxSizer3 =
new wxStaticBoxSizer( itemStaticBoxSizer3Static, wxVERTICAL );
itemBoxSizer2->Add( itemStaticBoxSizer3, 0, wxGROW | wxALL, 5 );
m_GraphicSegmWidthTitle =
new wxStaticText( itemDialog1, wxID_STATIC, _( "Graphic segm Width" ),
wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_GraphicSegmWidthTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptPcbSegmWidth = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_SEGW,
_T( "" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_OptPcbSegmWidth,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_BoardEdgesWidthTitle =
new wxStaticText( itemDialog1, wxID_STATIC, _( "Board Edges Width" ),
wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_BoardEdgesWidthTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptPcbEdgesWidth =
new wxTextCtrl( itemDialog1, ID_TEXTCTRL_EDGES, _T( "" ),
wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_OptPcbEdgesWidth,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_CopperTextWidthTitle =
new wxStaticText( itemDialog1, wxID_STATIC, _( "Copper Text Width" ),
wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_CopperTextWidthTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptPcbTextWidth = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_TEXTW,
_T( "" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_OptPcbTextWidth,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_TextSizeVTitle = new wxStaticText( itemDialog1, wxID_STATIC,
_( "Text Size V" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_TextSizeVTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptPcbTextVSize = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_TEXTV,
_T( "" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_OptPcbTextVSize,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_TextSizeHTitle = new wxStaticText( itemDialog1, wxID_STATIC,
_( "Text Size H" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_TextSizeHTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptPcbTextHSize = new wxTextCtrl( itemDialog1, ID_TEXTCTRL_TEXTH,
_T( "" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer3->Add( m_OptPcbTextHSize,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
itemBoxSizer2->Add( 5, 5, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
wxStaticBox* itemStaticBoxSizer15Static =
new wxStaticBox( itemDialog1, wxID_ANY, _( "Modules:" ) );
wxStaticBoxSizer* itemStaticBoxSizer15 =
new wxStaticBoxSizer( itemStaticBoxSizer15Static, wxVERTICAL );
itemBoxSizer2->Add( itemStaticBoxSizer15, 0, wxGROW | wxALL, 5 );
m_EdgeModWidthTitle =
new wxStaticText( itemDialog1, wxID_STATIC, _( "Edges Module Width" ),
wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer15->Add( m_EdgeModWidthTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptModuleEdgesWidth = new wxTextCtrl( itemDialog1,
ID_TEXTCTRL_EDGEMOD_W,
_T( "" ),
wxDefaultPosition,
wxDefaultSize,
0 );
itemStaticBoxSizer15->Add( m_OptModuleEdgesWidth,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_TextModWidthTitle = new wxStaticText( itemDialog1, wxID_STATIC,
_( "Text Module Width" ),
wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer15->Add( m_TextModWidthTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptModuleTextWidth = new wxTextCtrl( itemDialog1,
ID_TEXTCTRL_TXTMOD_W,
_T( "" ),
wxDefaultPosition,
wxDefaultSize,
0 );
itemStaticBoxSizer15->Add( m_OptModuleTextWidth,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_TextModSizeVTitle = new wxStaticText( itemDialog1, wxID_STATIC,
_( "Text Module Size V" ),
wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer15->Add( m_TextModSizeVTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptModuleTextVSize = new wxTextCtrl( itemDialog1,
ID_TEXTCTRL_TXTMOD_V,
_T( "" ),
wxDefaultPosition,
wxDefaultSize,
0 );
itemStaticBoxSizer15->Add( m_OptModuleTextVSize,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
m_TextModSizeHTitle = new wxStaticText( itemDialog1, wxID_STATIC,
_( "Text Module Size H" ),
wxDefaultPosition,
wxDefaultSize, 0 );
itemStaticBoxSizer15->Add( m_TextModSizeHTitle,
0,
wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP |
wxADJUST_MINSIZE,
5 );
m_OptModuleTextHSize = new wxTextCtrl( itemDialog1,
ID_TEXTCTRL_TXTMOD_H,
_T( "" ),
wxDefaultPosition,
wxDefaultSize,
0 );
itemStaticBoxSizer15->Add( m_OptModuleTextHSize,
0,
wxGROW | wxLEFT | wxRIGHT | wxBOTTOM,
5 );
itemBoxSizer2->Add( 5, 5, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
wxBoxSizer* itemBoxSizer25 = new wxBoxSizer( wxVERTICAL );
itemBoxSizer2->Add( itemBoxSizer25, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
wxButton* itemButton26 = new wxButton( itemDialog1, wxID_OK, _( "&OK" ),
wxDefaultPosition,
wxDefaultSize, 0 );
itemBoxSizer25->Add( itemButton26, 0, wxGROW | wxALL, 5 );
wxButton* itemButton27 = new wxButton( itemDialog1, wxID_CANCEL,
_( "&Cancel" ), wxDefaultPosition,
wxDefaultSize, 0 );
itemBoxSizer25->Add( itemButton27, 0, wxGROW | wxALL, 5 );
////@end WinEDA_GraphicItemsOptionsDialog content construction
SetDisplayValue();
}
/*!
* Should we show tooltips?
*/
bool WinEDA_GraphicItemsOptionsDialog::ShowToolTips()
{
return true;
}
/*!
* Get bitmap resources
*/
wxBitmap WinEDA_GraphicItemsOptionsDialog::GetBitmapResource(
const wxString& name )
{
// Bitmap retrieval
////@begin WinEDA_GraphicItemsOptionsDialog bitmap retrieval
wxUnusedVar( name );
return wxNullBitmap;
////@end WinEDA_GraphicItemsOptionsDialog bitmap retrieval
}
/*!
* Get icon resources
*/
wxIcon WinEDA_GraphicItemsOptionsDialog::GetIconResource( const wxString& name )
{
// Icon retrieval
////@begin WinEDA_GraphicItemsOptionsDialog icon retrieval
wxUnusedVar( name );
return wxNullIcon;
////@end WinEDA_GraphicItemsOptionsDialog icon retrieval
}
/*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
*/
void WinEDA_GraphicItemsOptionsDialog::OnOkClick( wxCommandEvent& event )
{
AcceptOptions( event );
}
/*! /*!
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
*/ */
void WinEDA_GraphicItemsOptionsDialog::OnCancelClick( wxCommandEvent& event ) void DIALOG_GRAPHIC_ITEMS_OPTIONS::OnCancelClick( wxCommandEvent& event )
{ {
////@begin wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in
// WinEDA_GraphicItemsOptionsDialog.
// Before editing this code, remove the block markers.
event.Skip(); event.Skip();
////@end wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL in
// WinEDA_GraphicItemsOptionsDialog.
} }

149
pcbnew/dialog_graphic_items_options.h
View File

@ -1,128 +1,53 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dialog_graphic_items_options.h // Name: dialog_graphic_items_options.h
// Purpose: //////////////////////////////////////////////////////////////////////////////*
// Author: jean-pierre Charras /*
// Modified by: * This program source code file is part of KICAD, a free EDA CAD application.
// Created: 25/02/2006 09:53:27 *
// RCS-ID: * Copyright (C) 1992-2010 <Jean-Pierre Charras> jean-pierre.charras@gipsa-lab.inpg.fr
// Copyright: License GNU * Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors.
// Licence: *
///////////////////////////////////////////////////////////////////////////// * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
// Generated by DialogBlocks (unregistered), 25/02/2006 09:53:27 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef _DIALOG_GRAPHIC_ITEMS_OPTIONS_H_ #ifndef _DIALOG_GRAPHIC_ITEMS_OPTIONS_H_
#define _DIALOG_GRAPHIC_ITEMS_OPTIONS_H_ #define _DIALOG_GRAPHIC_ITEMS_OPTIONS_H_
/*! #include "dialog_graphic_items_options_base.h"
* Includes
*/
////@begin includes
////@end includes
/*! /*!
* Forward declarations * DIALOG_GRAPHIC_ITEMS_OPTIONS class declaration
*/ */
////@begin forward declarations class DIALOG_GRAPHIC_ITEMS_OPTIONS: public DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE
////@end forward declarations
/*!
* Control identifiers
*/
////@begin control identifiers
#define ID_DIALOG 10000
#define ID_TEXTCTRL_SEGW 10001
#define ID_TEXTCTRL_EDGES 10002
#define ID_TEXTCTRL_TEXTW 10003
#define ID_TEXTCTRL_TEXTV 10004
#define ID_TEXTCTRL_TEXTH 10005
#define ID_TEXTCTRL_EDGEMOD_W 10006
#define ID_TEXTCTRL_TXTMOD_W 10007
#define ID_TEXTCTRL_TXTMOD_V 10008
#define ID_TEXTCTRL_TXTMOD_H 10009
#define SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_TITLE _("Texts and Drawings")
#define SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_POSITION wxDefaultPosition
////@end control identifiers
/*!
* Compatibility
*/
#ifndef wxCLOSE_BOX
#define wxCLOSE_BOX 0x1000
#endif
/*!
* WinEDA_GraphicItemsOptionsDialog class declaration
*/
class WinEDA_GraphicItemsOptionsDialog: public wxDialog
{ {
DECLARE_EVENT_TABLE()
public: public:
BOARD_DESIGN_SETTINGS* m_BrdSettings; BOARD_DESIGN_SETTINGS* m_BrdSettings;
/// Constructors
WinEDA_GraphicItemsOptionsDialog( WinEDA_BasePcbFrame* parent, wxWindowID id = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_SIZE, long style = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_IDNAME, const wxString& caption = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_TITLE, const wxPoint& pos = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_POSITION, const wxSize& size = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_SIZE, long style = SYMBOL_WINEDA_GRAPHICITEMSOPTIONSDIALOG_STYLE );
/// Creates the controls and sizers
void CreateControls();
////@begin WinEDA_GraphicItemsOptionsDialog event handler declarations
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
void OnOkClick( wxCommandEvent& event );
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
void OnCancelClick( wxCommandEvent& event );
////@end WinEDA_GraphicItemsOptionsDialog event handler declarations
////@begin WinEDA_GraphicItemsOptionsDialog member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end WinEDA_GraphicItemsOptionsDialog member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
void AcceptOptions(wxCommandEvent& event);
void SetDisplayValue();
////@begin WinEDA_GraphicItemsOptionsDialog member variables
wxStaticText* m_GraphicSegmWidthTitle;
wxTextCtrl* m_OptPcbSegmWidth;
wxStaticText* m_BoardEdgesWidthTitle;
wxTextCtrl* m_OptPcbEdgesWidth;
wxStaticText* m_CopperTextWidthTitle;
wxTextCtrl* m_OptPcbTextWidth;
wxStaticText* m_TextSizeVTitle;
wxTextCtrl* m_OptPcbTextVSize;
wxStaticText* m_TextSizeHTitle;
wxTextCtrl* m_OptPcbTextHSize;
wxStaticText* m_EdgeModWidthTitle;
wxTextCtrl* m_OptModuleEdgesWidth;
wxStaticText* m_TextModWidthTitle;
wxTextCtrl* m_OptModuleTextWidth;
wxStaticText* m_TextModSizeVTitle;
wxTextCtrl* m_OptModuleTextVSize;
wxStaticText* m_TextModSizeHTitle;
wxTextCtrl* m_OptModuleTextHSize;
////@end WinEDA_GraphicItemsOptionsDialog member variables
WinEDA_BasePcbFrame * m_Parent; WinEDA_BasePcbFrame * m_Parent;
public:
DIALOG_GRAPHIC_ITEMS_OPTIONS( WinEDA_BasePcbFrame* parent );
~DIALOG_GRAPHIC_ITEMS_OPTIONS( );
private:
void initValues( );
void OnOkClick( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event );
}; };
#endif #endif

2002
pcbnew/dialog_graphic_items_options.pjd
View File

File diff suppressed because it is too large Load Diff

1
pcbnew/dialog_graphic_items_options.rc
View File

@ -1 +0,0 @@
#include "wx/msw/wx.rc"

132
pcbnew/dialog_graphic_items_options_base.cpp Normal file
View File

@ -0,0 +1,132 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_graphic_items_options_base.h"
///////////////////////////////////////////////////////////////////////////
DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* bSizerMain;
bSizerMain = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizerUpper;
bSizerUpper = new wxBoxSizer( wxHORIZONTAL );
wxStaticBoxSizer* sbSizerLeft;
sbSizerLeft = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Graphics:") ), wxVERTICAL );
m_GraphicSegmWidthTitle = new wxStaticText( this, wxID_ANY, _("Graphic segm Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_GraphicSegmWidthTitle->Wrap( -1 );
sbSizerLeft->Add( m_GraphicSegmWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptPcbSegmWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerLeft->Add( m_OptPcbSegmWidth, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_BoardEdgesWidthTitle = new wxStaticText( this, wxID_ANY, _("Board Edges Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_BoardEdgesWidthTitle->Wrap( -1 );
sbSizerLeft->Add( m_BoardEdgesWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptPcbEdgesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerLeft->Add( m_OptPcbEdgesWidth, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_CopperTextWidthTitle = new wxStaticText( this, wxID_ANY, _("Copper Text Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_CopperTextWidthTitle->Wrap( -1 );
sbSizerLeft->Add( m_CopperTextWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptPcbTextWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerLeft->Add( m_OptPcbTextWidth, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_TextSizeVTitle = new wxStaticText( this, wxID_ANY, _("Text Size V"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextSizeVTitle->Wrap( -1 );
sbSizerLeft->Add( m_TextSizeVTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptPcbTextVSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerLeft->Add( m_OptPcbTextVSize, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_TextSizeHTitle = new wxStaticText( this, wxID_ANY, _("Text Size H"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextSizeHTitle->Wrap( -1 );
sbSizerLeft->Add( m_TextSizeHTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptPcbTextHSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerLeft->Add( m_OptPcbTextHSize, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizerUpper->Add( sbSizerLeft, 1, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizerMiddle;
sbSizerMiddle = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Modules:") ), wxVERTICAL );
m_EdgeModWidthTitle = new wxStaticText( this, wxID_ANY, _("Edges Module Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_EdgeModWidthTitle->Wrap( -1 );
sbSizerMiddle->Add( m_EdgeModWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptModuleEdgesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerMiddle->Add( m_OptModuleEdgesWidth, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_TextModWidthTitle = new wxStaticText( this, wxID_ANY, _("Text Module Width"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextModWidthTitle->Wrap( -1 );
sbSizerMiddle->Add( m_TextModWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptModuleTextWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerMiddle->Add( m_OptModuleTextWidth, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_TextModSizeVTitle = new wxStaticText( this, wxID_ANY, _("Text Module Size V"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextModSizeVTitle->Wrap( -1 );
sbSizerMiddle->Add( m_TextModSizeVTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptModuleTextVSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerMiddle->Add( m_OptModuleTextVSize, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_TextModSizeHTitle = new wxStaticText( this, wxID_ANY, _("Text Module Size H"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextModSizeHTitle->Wrap( -1 );
sbSizerMiddle->Add( m_TextModSizeHTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_OptModuleTextHSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerMiddle->Add( m_OptModuleTextHSize, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
bSizerUpper->Add( sbSizerMiddle, 1, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizerRight;
sbSizerRight = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General:") ), wxVERTICAL );
m_DefaultPenSizeTitle = new wxStaticText( this, wxID_ANY, _("Default pen size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_DefaultPenSizeTitle->Wrap( -1 );
m_DefaultPenSizeTitle->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
sbSizerRight->Add( m_DefaultPenSizeTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_DefaultPenSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
sbSizerRight->Add( m_DefaultPenSizeCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizerUpper->Add( sbSizerRight, 1, wxEXPAND|wxALL, 5 );
bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize();
bSizerMain->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM, 5 );
this->SetSizer( bSizerMain );
this->Layout();
// Connect Events
m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::OnCancelClick ), NULL, this );
m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::OnOkClick ), NULL, this );
}
DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::~DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE()
{
// Disconnect Events
m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::OnCancelClick ), NULL, this );
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE::OnOkClick ), NULL, this );
}

1220
pcbnew/dialog_graphic_items_options_base.fbp Normal file
View File

File diff suppressed because it is too large Load Diff

71
pcbnew/dialog_graphic_items_options_base.h Normal file
View File

@ -0,0 +1,71 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_graphic_items_options_base__
#define __dialog_graphic_items_options_base__
#include <wx/intl.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE
///////////////////////////////////////////////////////////////////////////////
class DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE : public wxDialog
{
private:
protected:
wxStaticText* m_GraphicSegmWidthTitle;
wxTextCtrl* m_OptPcbSegmWidth;
wxStaticText* m_BoardEdgesWidthTitle;
wxTextCtrl* m_OptPcbEdgesWidth;
wxStaticText* m_CopperTextWidthTitle;
wxTextCtrl* m_OptPcbTextWidth;
wxStaticText* m_TextSizeVTitle;
wxTextCtrl* m_OptPcbTextVSize;
wxStaticText* m_TextSizeHTitle;
wxTextCtrl* m_OptPcbTextHSize;
wxStaticText* m_EdgeModWidthTitle;
wxTextCtrl* m_OptModuleEdgesWidth;
wxStaticText* m_TextModWidthTitle;
wxTextCtrl* m_OptModuleTextWidth;
wxStaticText* m_TextModSizeVTitle;
wxTextCtrl* m_OptModuleTextVSize;
wxStaticText* m_TextModSizeHTitle;
wxTextCtrl* m_OptModuleTextHSize;
wxStaticText* m_DefaultPenSizeTitle;
wxTextCtrl* m_DefaultPenSizeCtrl;
wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
public:
DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Texts and Drawings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 459,315 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_GRAPHIC_ITEMS_OPTIONS_BASE();
};
#endif //__dialog_graphic_items_options_base__

4
pcbnew/dialog_plot_base.cpp
View File

@ -171,8 +171,10 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
bButtonsSizer->Add( m_PlotNoViaOnMaskOpt, 0, wxALL, 5 ); bButtonsSizer->Add( m_PlotNoViaOnMaskOpt, 0, wxALL, 5 );
m_staticText6 = new wxStaticText( this, wxID_ANY, _("Line width"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6 = new wxStaticText( this, wxID_ANY, _("Default pen size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText6->Wrap( -1 ); m_staticText6->Wrap( -1 );
m_staticText6->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
bButtonsSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bButtonsSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_LinesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_LinesWidth = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

4
pcbnew/dialog_plot_base.fbp
View File

@ -1368,7 +1368,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Line width</property> <property name="label">Default pen size:</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_staticText6</property> <property name="name">m_staticText6</property>
@ -1377,7 +1377,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip"></property> <property name="tooltip">Pen size used to draw items that have no pen size specified.&#x0A;Used mainly to draw items in sketch mode.</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>

3
pcbnew/dialog_print_for_modedit.cpp
View File

@ -102,11 +102,12 @@ void DIALOG_PRINT_FOR_MODEDIT::InitValues( )
int scale_Select = 3; // default selected scale = ScaleList[3] = 1 int scale_Select = 3; // default selected scale = ScaleList[3] = 1
if( m_Config ) if( m_Config )
{ {
m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &s_Parameters.m_PenDefaultSize );
m_Config->Read( OPTKEY_PRINT_MODULE_SCALE, &scale_Select ); m_Config->Read( OPTKEY_PRINT_MODULE_SCALE, &scale_Select );
m_Config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1); m_Config->Read( OPTKEY_PRINT_MONOCHROME_MODE, &s_Parameters.m_Print_Black_and_White, 1);
} }
extern int g_DrawDefaultLineThickness;
s_Parameters.m_PenDefaultSize = g_DrawDefaultLineThickness;
m_ScaleOption->SetSelection( scale_Select ); m_ScaleOption->SetSelection( scale_Select );
if( s_Parameters.m_Print_Black_and_White ) if( s_Parameters.m_Print_Black_and_White )

10
pcbnew/dialog_print_using_printer.cpp
View File

@ -22,6 +22,10 @@
#define WIDTH_MAX_VALUE 1000 #define WIDTH_MAX_VALUE 1000
#define WIDTH_MIN_VALUE 1 #define WIDTH_MIN_VALUE 1
extern int g_DrawDefaultLineThickness;
// Local variables
static long s_SelectedLayers; static long s_SelectedLayers;
static double s_ScaleList[] = static double s_ScaleList[] =
{ 0, 0.5, 0.7, 0.999, 1.0, 1.4, 2.0, 3.0, 4.0 }; { 0, 0.5, 0.7, 0.999, 1.0, 1.4, 2.0, 3.0, 4.0 };
@ -33,7 +37,6 @@ static double s_ScaleList[] =
// static print data and page setup data, to remember settings during the session // static print data and page setup data, to remember settings during the session
static wxPrintData* g_PrintData; static wxPrintData* g_PrintData;
// Variables locales
static PRINT_PARAMETERS s_Parameters; static PRINT_PARAMETERS s_Parameters;
@ -190,7 +193,6 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
if( m_Config ) if( m_Config )
{ {
m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &s_Parameters.m_PenDefaultSize );
m_Config->Read( OPTKEY_PRINT_X_FINESCALE_ADJ, &s_Parameters.m_XScaleAdjust ); m_Config->Read( OPTKEY_PRINT_X_FINESCALE_ADJ, &s_Parameters.m_XScaleAdjust );
m_Config->Read( OPTKEY_PRINT_Y_FINESCALE_ADJ, &s_Parameters.m_YScaleAdjust ); m_Config->Read( OPTKEY_PRINT_Y_FINESCALE_ADJ, &s_Parameters.m_YScaleAdjust );
m_Config->Read( OPTKEY_PRINT_SCALE, &scale_idx ); m_Config->Read( OPTKEY_PRINT_SCALE, &scale_idx );
@ -241,6 +243,7 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( )
else else
m_ModeColorOption->SetSelection( 0 ); m_ModeColorOption->SetSelection( 0 );
s_Parameters.m_PenDefaultSize = g_DrawDefaultLineThickness;
AddUnitSymbol( *m_TextPenWidth, g_UnitMetric ); AddUnitSymbol( *m_TextPenWidth, g_UnitMetric );
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize, m_Parent->m_InternalUnits ) ); ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize, m_Parent->m_InternalUnits ) );
@ -321,7 +324,6 @@ void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event )
if( m_Config ) if( m_Config )
{ {
m_Config->Write( OPTKEY_PLOT_LINEWIDTH_VALUE, s_Parameters.m_PenDefaultSize );
m_Config->Write( OPTKEY_PRINT_X_FINESCALE_ADJ, s_Parameters.m_XScaleAdjust ); m_Config->Write( OPTKEY_PRINT_X_FINESCALE_ADJ, s_Parameters.m_XScaleAdjust );
m_Config->Write( OPTKEY_PRINT_Y_FINESCALE_ADJ, s_Parameters.m_YScaleAdjust ); m_Config->Write( OPTKEY_PRINT_Y_FINESCALE_ADJ, s_Parameters.m_YScaleAdjust );
m_Config->Write( OPTKEY_PRINT_SCALE, m_ScaleOption->GetSelection() ); m_Config->Write( OPTKEY_PRINT_SCALE, m_ScaleOption->GetSelection() );
@ -404,6 +406,8 @@ void DIALOG_PRINT_USING_PRINTER::SetPenWidth()
s_Parameters.m_PenDefaultSize = WIDTH_MIN_VALUE; s_Parameters.m_PenDefaultSize = WIDTH_MIN_VALUE;
} }
g_DrawDefaultLineThickness = s_Parameters.m_PenDefaultSize;
m_DialogPenWidth->SetValue( m_DialogPenWidth->SetValue(
ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize, m_Parent->m_InternalUnits ) ); ReturnStringFromValue( g_UnitMetric, s_Parameters.m_PenDefaultSize, m_Parent->m_InternalUnits ) );
} }

3
pcbnew/dialog_print_using_printer_base.cpp
View File

@ -75,7 +75,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
wxStaticBoxSizer* sbOptionsSizer; wxStaticBoxSizer* sbOptionsSizer;
sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Default Pen Size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPenWidth = new wxStaticText( this, wxID_ANY, _("Default pen size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_TextPenWidth->Wrap( -1 ); m_TextPenWidth->Wrap( -1 );
m_TextPenWidth->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") ); m_TextPenWidth->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );
@ -135,6 +135,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonQuit->SetDefault();
bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

2
pcbnew/dialog_print_using_printer_base.fbp
View File

@ -490,7 +490,7 @@
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Default Pen Size:</property> <property name="label">Default pen size:</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_TextPenWidth</property> <property name="name">m_TextPenWidth</property>

5
pcbnew/pcbframe.cpp
View File

@ -48,9 +48,10 @@
#include "class_pcb_layer_widget.h" #include "class_pcb_layer_widget.h"
#include "hotkeys.h" #include "hotkeys.h"
extern int g_DrawDefaultLineThickness;
// Keys used in read/write config // Keys used in read/write config
#define OPTKEY_DEFAULT_LINEWIDTH_VALUE wxT( "PlotLineWidth" )
#define PCB_SHOW_FULL_RATSNET_OPT wxT( "PcbFulRatsnest" ) #define PCB_SHOW_FULL_RATSNET_OPT wxT( "PcbFulRatsnest" )
#define PCB_MAGNETIC_PADS_OPT wxT( "PcbMagPadOpt" ) #define PCB_MAGNETIC_PADS_OPT wxT( "PcbMagPadOpt" )
#define PCB_MAGNETIC_TRACKS_OPT wxT( "PcbMagTrackOpt" ) #define PCB_MAGNETIC_TRACKS_OPT wxT( "PcbMagTrackOpt" )
@ -494,6 +495,7 @@ void WinEDA_PcbFrame::LoadSettings()
WinEDA_BasePcbFrame::LoadSettings(); WinEDA_BasePcbFrame::LoadSettings();
long tmp; long tmp;
config->Read( OPTKEY_DEFAULT_LINEWIDTH_VALUE, &g_DrawDefaultLineThickness );
config->Read( PCB_SHOW_FULL_RATSNET_OPT, &tmp ); config->Read( PCB_SHOW_FULL_RATSNET_OPT, &tmp );
GetBoard()->SetElementVisibility(RATSNEST_VISIBLE, tmp); GetBoard()->SetElementVisibility(RATSNEST_VISIBLE, tmp);
config->Read( PCB_MAGNETIC_PADS_OPT, &g_MagneticPadOption ); config->Read( PCB_MAGNETIC_PADS_OPT, &g_MagneticPadOption );
@ -514,6 +516,7 @@ void WinEDA_PcbFrame::SaveSettings()
wxRealPoint GridSize = GetScreen()->GetGridSize(); wxRealPoint GridSize = GetScreen()->GetGridSize();
config->Write( OPTKEY_DEFAULT_LINEWIDTH_VALUE, g_DrawDefaultLineThickness );
long tmp = GetBoard()->IsElementVisible(RATSNEST_VISIBLE); long tmp = GetBoard()->IsElementVisible(RATSNEST_VISIBLE);
config->Write( PCB_SHOW_FULL_RATSNET_OPT, tmp ); config->Write( PCB_SHOW_FULL_RATSNET_OPT, tmp );
config->Write( PCB_MAGNETIC_PADS_OPT, (long) g_MagneticPadOption ); config->Write( PCB_MAGNETIC_PADS_OPT, (long) g_MagneticPadOption );

8
pcbnew/pcbnew.cpp
View File

@ -31,10 +31,13 @@
// Colors for layers and items // Colors for layers and items
COLORS_DESIGN_SETTINGS g_ColorsSettings; COLORS_DESIGN_SETTINGS g_ColorsSettings;
int g_DrawDefaultLineThickness = 60; /* Default line thickness in PCBNEW units used to
* draw/plot items having a
* default thickness line value (Frame references)
* (i.e. = 0 ). 0 = single pixel line width */
bool Drc_On = true; bool Drc_On = true;
bool g_AutoDeleteOldTrack = true; bool g_AutoDeleteOldTrack = true;
bool g_No_Via_Route;
bool g_Drag_Pistes_On; bool g_Drag_Pistes_On;
bool g_Show_Module_Ratsnest; bool g_Show_Module_Ratsnest;
bool g_Show_Pads_Module_in_Move = true; bool g_Show_Pads_Module_in_Move = true;
@ -45,7 +48,6 @@ bool g_TwoSegmentTrackBuild = true;
bool g_HighLight_Status; bool g_HighLight_Status;
extern PARAM_CFG_BASE* ParamCfgList[]; extern PARAM_CFG_BASE* ParamCfgList[];
int Angle_Rot_Module;
int ModuleSegmentWidth; int ModuleSegmentWidth;
int ModuleTextWidth; int ModuleTextWidth;
int Route_Layer_TOP; int Route_Layer_TOP;
@ -77,7 +79,7 @@ IMPLEMENT_APP( WinEDA_App )
void WinEDA_App::MacOpenFile(const wxString &fileName) { void WinEDA_App::MacOpenFile(const wxString &fileName) {
wxFileName filename = fileName; wxFileName filename = fileName;
WinEDA_PcbFrame * frame = ((WinEDA_PcbFrame*) GetTopWindow()); WinEDA_PcbFrame * frame = ((WinEDA_PcbFrame*) GetTopWindow());
if(!filename.FileExists()) if(!filename.FileExists())
return; return;

2
pcbnew/pcbnew.h
View File

@ -52,7 +52,6 @@
/* variables */ /* variables */
extern bool Drc_On; extern bool Drc_On;
extern bool g_AutoDeleteOldTrack; extern bool g_AutoDeleteOldTrack;
extern bool g_No_Via_Route;
extern bool g_Drag_Pistes_On; extern bool g_Drag_Pistes_On;
extern bool g_Show_Module_Ratsnest; extern bool g_Show_Module_Ratsnest;
extern bool g_Show_Pads_Module_in_Move; extern bool g_Show_Pads_Module_in_Move;
@ -67,7 +66,6 @@ extern wxString g_Shapes3DExtBuffer;
extern wxString g_DocModulesFileName; extern wxString g_DocModulesFileName;
/* Variables used in footprint handling */ /* Variables used in footprint handling */
extern int Angle_Rot_Module;
extern wxSize ModuleTextSize; /* Default footprint texts size */ extern wxSize ModuleTextSize; /* Default footprint texts size */
extern int ModuleTextWidth; extern int ModuleTextWidth;
extern int ModuleSegmentWidth; extern int ModuleSegmentWidth;

8
pcbnew/pcbplot.cpp
View File

@ -55,6 +55,8 @@ static bool s_PlotOriginIsAuxAxis = FALSE;
/* The group of plot options - sadly global XXX */ /* The group of plot options - sadly global XXX */
PCB_Plot_Options g_pcb_plot_options; PCB_Plot_Options g_pcb_plot_options;
extern int g_DrawDefaultLineThickness;
/*******************************/ /*******************************/
/* Dialog box for plot control */ /* Dialog box for plot control */
@ -140,12 +142,12 @@ void DIALOG_PLOT::Init_Dialog()
BOARD* board = m_Parent->GetBoard(); BOARD* board = m_Parent->GetBoard();
m_Config->Read( OPTKEY_OUTPUT_FORMAT, &g_pcb_plot_options.PlotFormat ); m_Config->Read( OPTKEY_OUTPUT_FORMAT, &g_pcb_plot_options.PlotFormat );
m_Config->Read( OPTKEY_PLOT_LINEWIDTH_VALUE, &g_pcb_plot_options.PlotLine_Width );
m_Config->Read( OPTKEY_EDGELAYER_GERBER, &g_pcb_plot_options.Exclude_Edges_Pcb ); m_Config->Read( OPTKEY_EDGELAYER_GERBER, &g_pcb_plot_options.Exclude_Edges_Pcb );
m_Config->Read( OPTKEY_XFINESCALE_ADJ, &m_XScaleAdjust ); m_Config->Read( OPTKEY_XFINESCALE_ADJ, &m_XScaleAdjust );
m_Config->Read( OPTKEY_YFINESCALE_ADJ, &m_YScaleAdjust ); m_Config->Read( OPTKEY_YFINESCALE_ADJ, &m_YScaleAdjust );
m_PlotFormatOpt->SetSelection( g_pcb_plot_options.PlotFormat ); m_PlotFormatOpt->SetSelection( g_pcb_plot_options.PlotFormat );
g_pcb_plot_options.PlotLine_Width = g_DrawDefaultLineThickness;
// Set units and value for HPGL pen speed. // Set units and value for HPGL pen speed.
@ -455,6 +457,8 @@ void DIALOG_PLOT::SaveOptPlot( wxCommandEvent& event )
msg = m_LinesWidth->GetValue(); msg = m_LinesWidth->GetValue();
tmp = ReturnValueFromString( g_UnitMetric, msg, PCB_INTERNAL_UNIT ); tmp = ReturnValueFromString( g_UnitMetric, msg, PCB_INTERNAL_UNIT );
g_pcb_plot_options.PlotLine_Width = tmp; g_pcb_plot_options.PlotLine_Width = tmp;
g_DrawDefaultLineThickness = g_pcb_plot_options.PlotLine_Width;
msg = m_FineAdjustXscaleOpt->GetValue(); msg = m_FineAdjustXscaleOpt->GetValue();
msg.ToDouble( &m_XScaleAdjust ); msg.ToDouble( &m_XScaleAdjust );
@ -472,8 +476,6 @@ void DIALOG_PLOT::SaveOptPlot( wxCommandEvent& event )
int formatNdx = m_PlotFormatOpt->GetSelection(); int formatNdx = m_PlotFormatOpt->GetSelection();
m_Config->Write( OPTKEY_OUTPUT_FORMAT, formatNdx ); m_Config->Write( OPTKEY_OUTPUT_FORMAT, formatNdx );
m_Config->Write( OPTKEY_PLOT_LINEWIDTH_VALUE,
g_pcb_plot_options.PlotLine_Width );
wxString layerKey; wxString layerKey;
for( int layer = 0; layer<NB_LAYERS; ++layer ) for( int layer = 0; layer<NB_LAYERS; ++layer )

1
pcbnew/pcbplot.h
View File

@ -7,7 +7,6 @@
/* Shared Config keys for plot and print */ /* Shared Config keys for plot and print */
#define OPTKEY_PLOT_LINEWIDTH_VALUE wxT( "PlotLineWidth" )
#define OPTKEY_LAYERBASE wxT( "PlotLayer_%d" ) #define OPTKEY_LAYERBASE wxT( "PlotLayer_%d" )
#define OPTKEY_PRINT_X_FINESCALE_ADJ wxT( "PrintXFineScaleAdj" ) #define OPTKEY_PRINT_X_FINESCALE_ADJ wxT( "PrintXFineScaleAdj" )
#define OPTKEY_PRINT_Y_FINESCALE_ADJ wxT( "PrintYFineScaleAdj" ) #define OPTKEY_PRINT_Y_FINESCALE_ADJ wxT( "PrintYFineScaleAdj" )

2
pcbnew/solve.cpp
View File

@ -695,7 +695,7 @@ static int Autoroute_One_Track( WinEDA_PcbFrame* pcbframe,
} }
/** Test the other layer. **/ /** Test the other layer. **/
if( (two_sides) && !g_No_Via_Route ) if( two_sides )
{ {
olddir = GetDir( r, c, side ); olddir = GetDir( r, c, side );
if( olddir == FROM_OTHERSIDE ) if( olddir == FROM_OTHERSIDE )

5
pcbnew/tracepcb.cpp
View File

@ -18,6 +18,9 @@
#include "pcbplot.h" #include "pcbplot.h"
#include "protos.h" #include "protos.h"
extern int g_DrawDefaultLineThickness; // Default line thickness, used to draw Frame references
// Local functions: // Local functions:
/* Trace the pads of a module in sketch mode. /* Trace the pads of a module in sketch mode.
* Used to display pads when when the module visibility is set to not visible * Used to display pads when when the module visibility is set to not visible
@ -73,7 +76,7 @@ void WinEDA_PcbFrame::RedrawActiveWindow( wxDC* DC, bool EraseBg )
DrawPanel->DrawBackGround( DC ); DrawPanel->DrawBackGround( DC );
TraceWorkSheet( DC, GetScreen(), 0 ); TraceWorkSheet( DC, GetScreen(), g_DrawDefaultLineThickness );
GetBoard()->Draw( DrawPanel, DC, GR_OR ); GetBoard()->Draw( DrawPanel, DC, GR_OR );