Skip to content

K
kicad-source-mirror
Commit e704c625 authored by CHARRAS's avatar CHARRAS
Browse files
Options

some minor enhancements

parent 0bcc4d34
Hide whitespace changes
Inline Side-by-side
Showing with 904 additions and 624 deletions
change_log.txt
View file @ e704c625
...@@ -10,6 +10,11 @@ email address. ...@@ -10,6 +10,11 @@ email address.
if we switch from a long list of footprints to a short list (a filtered footprint list), if we switch from a long list of footprints to a short list (a filtered footprint list),
and if the selected item is near the end of the long list, and if the selected item is near the end of the long list,
the new list is not displayed from the top of the list box the new list is not displayed from the top of the list box
+eeschema:
Implemented: graying in/out of "Edit/Undo", "Edit/Redo" menu items,
when Undo/Redo stack is empty/filled.
+pcbnew:
Implemented: action for ID_POPUP_PCB_DELETE_MARKER
2007-Oct-27 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2007-Oct-27 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
......
eeschema/schframe.cpp
View file @ e704c625
...@@ -112,7 +112,7 @@ END_EVENT_TABLE() ...@@ -112,7 +112,7 @@ END_EVENT_TABLE()
/****************/ /****************/
/* Constructeur */ /* Constructor */
/****************/ /****************/
WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *parent, WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *parent,
...@@ -120,9 +120,9 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par ...@@ -120,9 +120,9 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par
WinEDA_DrawFrame(father, SCHEMATIC_FRAME, parent, title, pos, size, style) WinEDA_DrawFrame(father, SCHEMATIC_FRAME, parent, title, pos, size, style)
{ {
m_FrameName = wxT("SchematicFrame"); m_FrameName = wxT("SchematicFrame");
m_Draw_Axis = FALSE; // TRUE pour avoir les axes dessines m_Draw_Axis = FALSE; // TRUE to show axis
m_Draw_Grid = g_ShowGrid; // TRUE pour avoir la grille dessinee m_Draw_Grid = g_ShowGrid; // TRUE to show a grid
m_Draw_Sheet_Ref = TRUE; // TRUE pour avoir le cartouche dessin m_Draw_Sheet_Ref = TRUE; // TRUE to show sheet references
// Give an icon // Give an icon
#ifdef __WINDOWS__ #ifdef __WINDOWS__
...@@ -149,7 +149,7 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par ...@@ -149,7 +149,7 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par
/***************/ /***************/
/* Destructeur */ /* Destructor */
/***************/ /***************/
WinEDA_SchematicFrame::~WinEDA_SchematicFrame() WinEDA_SchematicFrame::~WinEDA_SchematicFrame()
...@@ -199,7 +199,7 @@ SCH_SCREEN * screen; ...@@ -199,7 +199,7 @@ SCH_SCREEN * screen;
} }
screen = ScreenSch ; screen = ScreenSch ;
while( screen ) // suppression flag modify pour eviter d'autres message while( screen ) // Clear "flag modify" to avoid alert messages when closing sub sheets
{ {
screen->ClrModify(); screen->ClrModify();
screen = (SCH_SCREEN*)screen->Pnext; screen = (SCH_SCREEN*)screen->Pnext;
...@@ -210,8 +210,7 @@ SCH_SCREEN * screen; ...@@ -210,8 +210,7 @@ SCH_SCREEN * screen;
ClearProjectDrawList(ScreenSch, TRUE); ClearProjectDrawList(ScreenSch, TRUE);
/* Tous les autres SCREEN sont effaces, aussi reselection de /* allof sub sheets are deleted, only the main sheet is useable */
l'ecran de base, pour les evenements de refresh gnrs par wxWindows */
m_CurrentScreen = ActiveScreen = ScreenSch; m_CurrentScreen = ActiveScreen = ScreenSch;
SaveSettings(); SaveSettings();
...@@ -226,8 +225,7 @@ SCH_SCREEN * screen; ...@@ -226,8 +225,7 @@ SCH_SCREEN * screen;
/********************************************/ /********************************************/
void WinEDA_SchematicFrame::SetToolbars() void WinEDA_SchematicFrame::SetToolbars()
/********************************************/ /********************************************/
/* Active ou desactive les tools du toolbar horizontal, en fonction des commandes /* Enable or disable some tools according to current conditions
en cours
*/ */
{ {
if( m_HToolBar ) if( m_HToolBar )
...@@ -246,12 +244,27 @@ en cours ...@@ -246,12 +244,27 @@ en cours
if ( g_BlockSaveDataList ) m_HToolBar->EnableTool(wxID_PASTE,TRUE); if ( g_BlockSaveDataList ) m_HToolBar->EnableTool(wxID_PASTE,TRUE);
else m_HToolBar->EnableTool(wxID_PASTE,FALSE); else m_HToolBar->EnableTool(wxID_PASTE,FALSE);
wxMenuBar * menuBar = GetMenuBar();
if ( GetScreen()->m_RedoList ) if ( GetScreen()->m_RedoList )
{
m_HToolBar->EnableTool(ID_SCHEMATIC_REDO,TRUE); m_HToolBar->EnableTool(ID_SCHEMATIC_REDO,TRUE);
else m_HToolBar->EnableTool(ID_SCHEMATIC_REDO,FALSE); menuBar->Enable(ID_SCHEMATIC_REDO,TRUE);
}
else
{
m_HToolBar->EnableTool(ID_SCHEMATIC_REDO,FALSE);
menuBar->Enable(ID_SCHEMATIC_REDO,FALSE);
}
if ( GetScreen()->m_UndoList ) if ( GetScreen()->m_UndoList )
{
m_HToolBar->EnableTool(ID_SCHEMATIC_UNDO,TRUE); m_HToolBar->EnableTool(ID_SCHEMATIC_UNDO,TRUE);
else m_HToolBar->EnableTool(ID_SCHEMATIC_UNDO,FALSE); menuBar->Enable(ID_SCHEMATIC_UNDO,TRUE);
}
else
{
m_HToolBar->EnableTool(ID_SCHEMATIC_UNDO,FALSE);
menuBar->Enable(ID_SCHEMATIC_UNDO,FALSE);
}
} }
if ( m_OptionsToolBar ) if ( m_OptionsToolBar )
......
include/build_version.h
View file @ e704c625
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
COMMON_GLOBL wxString g_BuildVersion COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE #ifdef EDA_BASE
(wxT("(2007-10-21)")) (wxT("(2007-10-29)"))
#endif #endif
; ;
......
include/wxstruct.h
View file @ e704c625
...@@ -681,7 +681,7 @@ public: ...@@ -681,7 +681,7 @@ public:
void Erase_Textes_Pcb( wxDC* DC, bool query ); void Erase_Textes_Pcb( wxDC* DC, bool query );
void Erase_Marqueurs(); void Erase_Marqueurs();
void UnDeleteItem( wxDC* DC ); void UnDeleteItem( wxDC* DC );
void RemoveStruct( EDA_BaseStruct* Item, wxDC* DC ); void RemoveStruct( BOARD_ITEM* Item, wxDC* DC );
void Via_Edit_Control( wxDC* DC, int command_type, SEGVIA* via ); void Via_Edit_Control( wxDC* DC, int command_type, SEGVIA* via );
// Hightlight functions: // Hightlight functions:
......
internat/fr/kicad.mo
View file @ e704c625
No preview for this file type
internat/fr/kicad.po
View file @ e704c625
...@@ -2,7 +2,7 @@ msgid "" ...@@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2007-10-27 18:37+0100\n" "PO-Revision-Date: 2007-10-29 16:44+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"
...@@ -144,21 +144,22 @@ msgid "Local Ratsnest" ...@@ -144,21 +144,22 @@ msgid "Local Ratsnest"
msgstr "Monter le chevelu gnral" msgstr "Monter le chevelu gnral"
#: pcbnew/edit.cpp:461 #: pcbnew/edit.cpp:461
#: pcbnew/modedit.cpp:344 #: pcbnew/modedit.cpp:426
#: eeschema/schedit.cpp:454 #: eeschema/schedit.cpp:454
#: eeschema/libframe.cpp:579 #: eeschema/libframe.cpp:579
msgid "Delete item" msgid "Delete item"
msgstr "Suppression d'lments" msgstr "Suppression d'lments"
#: pcbnew/controle.cpp:172 #: pcbnew/controle.cpp:172
#: pcbnew/modedit.cpp:77
msgid "Selection Clarification" msgid "Selection Clarification"
msgstr "Clarification de la Slection" msgstr "Clarification de la Slection"
#: pcbnew/modedit.cpp:181 #: pcbnew/modedit.cpp:263
msgid "Unable to find the footprint source on the main board" msgid "Unable to find the footprint source on the main board"
msgstr "Impossible de trouver le module source sur le PCB principal" msgstr "Impossible de trouver le module source sur le PCB principal"
#: pcbnew/modedit.cpp:182 #: pcbnew/modedit.cpp:264
msgid "" msgid ""
"\n" "\n"
"Cannot update the footprint" "Cannot update the footprint"
...@@ -166,11 +167,11 @@ msgstr "" ...@@ -166,11 +167,11 @@ msgstr ""
"\n" "\n"
"Ne peut mettre jour le module" "Ne peut mettre jour le module"
#: pcbnew/modedit.cpp:190 #: pcbnew/modedit.cpp:272
msgid "A footprint source was found on the main board" msgid "A footprint source was found on the main board"
msgstr "Un module source a t trouv sur le PCB principal" msgstr "Un module source a t trouv sur le PCB principal"
#: pcbnew/modedit.cpp:191 #: pcbnew/modedit.cpp:273
msgid "" msgid ""
"\n" "\n"
"Cannot insert this footprint" "Cannot insert this footprint"
...@@ -178,23 +179,23 @@ msgstr "" ...@@ -178,23 +179,23 @@ msgstr ""
"\n" "\n"
"Ne peut insrer cd module" "Ne peut insrer cd module"
#: pcbnew/modedit.cpp:313 #: pcbnew/modedit.cpp:395
msgid "Add Pad" msgid "Add Pad"
msgstr "Ajouter Pastilles" msgstr "Ajouter Pastilles"
#: pcbnew/modedit.cpp:316 #: pcbnew/modedit.cpp:398
#: pcbnew/tool_modedit.cpp:133 #: pcbnew/tool_modedit.cpp:133
#: pcbnew/menubarmodedit.cpp:45 #: pcbnew/menubarmodedit.cpp:45
#: pcbnew/menubarpcb.cpp:209 #: pcbnew/menubarpcb.cpp:209
msgid "Pad Settings" msgid "Pad Settings"
msgstr "Caract pads" msgstr "Caract pads"
#: pcbnew/modedit.cpp:326 #: pcbnew/modedit.cpp:408
#: eeschema/schedit.cpp:298 #: eeschema/schedit.cpp:298
msgid "Add Drawing" msgid "Add Drawing"
msgstr "Ajout d'lments graphiques" msgstr "Ajout d'lments graphiques"
#: pcbnew/modedit.cpp:330 #: pcbnew/modedit.cpp:412
#: pcbnew/tool_modedit.cpp:185 #: pcbnew/tool_modedit.cpp:185
msgid "Place anchor" msgid "Place anchor"
msgstr "Place Ancre" msgstr "Place Ancre"
...@@ -254,7 +255,7 @@ msgid "Import Module:" ...@@ -254,7 +255,7 @@ msgid "Import Module:"
msgstr "Importer Module:" msgstr "Importer Module:"
#: pcbnew/librairi.cpp:62 #: pcbnew/librairi.cpp:62
#: pcbnew/files.cpp:183 #: pcbnew/files.cpp:182
#: cvpcb/rdpcad.cpp:45 #: cvpcb/rdpcad.cpp:45
#: cvpcb/readschematicnetlist.cpp:51 #: cvpcb/readschematicnetlist.cpp:51
#, c-format #, c-format
...@@ -325,7 +326,7 @@ msgstr "Module [%s] non trouv ...@@ -325,7 +326,7 @@ msgstr "Module [%s] non trouv
#: pcbnew/librairi.cpp:518 #: pcbnew/librairi.cpp:518
#: pcbnew/librairi.cpp:712 #: pcbnew/librairi.cpp:712
#: pcbnew/plothpgl.cpp:67 #: pcbnew/plothpgl.cpp:67
#: pcbnew/files.cpp:321 #: pcbnew/files.cpp:322
#: pcbnew/gen_modules_placefile.cpp:87 #: pcbnew/gen_modules_placefile.cpp:87
#: pcbnew/gen_modules_placefile.cpp:98 #: pcbnew/gen_modules_placefile.cpp:98
#: pcbnew/gen_modules_placefile.cpp:251 #: pcbnew/gen_modules_placefile.cpp:251
...@@ -735,7 +736,7 @@ msgstr "Outils" ...@@ -735,7 +736,7 @@ msgstr "Outils"
#: pcbnew/gendrill.cpp:1674 #: pcbnew/gendrill.cpp:1674
#: pcbnew/class_track.cpp:811 #: pcbnew/class_track.cpp:811
#: pcbnew/class_track.cpp:816 #: pcbnew/class_track.cpp:816
#: pcbnew/class_pad.cpp:995 #: pcbnew/class_pad.cpp:997
msgid "Drill" msgid "Drill"
msgstr "Perage" msgstr "Perage"
...@@ -834,8 +835,8 @@ msgstr "Inclure couche Edge" ...@@ -834,8 +835,8 @@ msgstr "Inclure couche Edge"
#: pcbnew/mirepcb.cpp:103 #: pcbnew/mirepcb.cpp:103
#: pcbnew/muonde.cpp:352 #: pcbnew/muonde.cpp:352
#: pcbnew/pcbtexte.cpp:116 #: pcbnew/pcbtexte.cpp:116
#: pcbnew/modedit_onclick.cpp:201 #: pcbnew/modedit_onclick.cpp:203
#: pcbnew/modedit_onclick.cpp:233 #: pcbnew/modedit_onclick.cpp:235
#: pcbnew/set_color.cpp:280 #: pcbnew/set_color.cpp:280
#: pcbnew/dialog_edit_module.cpp:121 #: pcbnew/dialog_edit_module.cpp:121
#: pcbnew/swap_layers.cpp:103 #: pcbnew/swap_layers.cpp:103
...@@ -1002,7 +1003,7 @@ msgstr "Texte Pcb" ...@@ -1002,7 +1003,7 @@ msgstr "Texte Pcb"
#: pcbnew/class_text_mod.cpp:347 #: pcbnew/class_text_mod.cpp:347
#: pcbnew/class_text_mod.cpp:351 #: pcbnew/class_text_mod.cpp:351
#: pcbnew/class_track.cpp:795 #: pcbnew/class_track.cpp:795
#: pcbnew/class_pad.cpp:972 #: pcbnew/class_pad.cpp:974
#: pcbnew/dialog_edit_module.cpp:234 #: pcbnew/dialog_edit_module.cpp:234
#: pcbnew/sel_layer.cpp:145 #: pcbnew/sel_layer.cpp:145
#: pcbnew/class_module.cpp:1116 #: pcbnew/class_module.cpp:1116
...@@ -1014,14 +1015,14 @@ msgstr "Couche" ...@@ -1014,14 +1015,14 @@ msgstr "Couche"
#: pcbnew/cotation.cpp:113 #: pcbnew/cotation.cpp:113
#: pcbnew/class_text_mod.cpp:358 #: pcbnew/class_text_mod.cpp:358
#: pcbnew/pcbtexte.cpp:176 #: pcbnew/pcbtexte.cpp:176
#: pcbnew/modedit_onclick.cpp:252 #: pcbnew/modedit_onclick.cpp:254
#: gerbview/affiche.cpp:40 #: gerbview/affiche.cpp:40
#: share/dialog_print.cpp:178 #: share/dialog_print.cpp:178
msgid "Mirror" msgid "Mirror"
msgstr "Miroir" msgstr "Miroir"
#: pcbnew/class_pcb_text.cpp:173 #: pcbnew/class_pcb_text.cpp:173
#: pcbnew/dialog_display_options.cpp:273 #: pcbnew/dialog_display_options.cpp:275
#: pcbnew/class_text_mod.cpp:341 #: pcbnew/class_text_mod.cpp:341
#: eeschema/dialog_options.cpp:265 #: eeschema/dialog_options.cpp:265
#: gerbview/affiche.cpp:43 #: gerbview/affiche.cpp:43
...@@ -1029,7 +1030,7 @@ msgid "No" ...@@ -1029,7 +1030,7 @@ msgid "No"
msgstr "Non" msgstr "Non"
#: pcbnew/class_pcb_text.cpp:175 #: pcbnew/class_pcb_text.cpp:175
#: pcbnew/dialog_display_options.cpp:272 #: pcbnew/dialog_display_options.cpp:274
#: pcbnew/class_text_mod.cpp:343 #: pcbnew/class_text_mod.cpp:343
#: eeschema/dialog_options.cpp:264 #: eeschema/dialog_options.cpp:264
#: gerbview/affiche.cpp:45 #: gerbview/affiche.cpp:45
...@@ -1038,7 +1039,7 @@ msgstr "Oui" ...@@ -1038,7 +1039,7 @@ msgstr "Oui"
#: pcbnew/class_pcb_text.cpp:178 #: pcbnew/class_pcb_text.cpp:178
#: pcbnew/class_text_mod.cpp:361 #: pcbnew/class_text_mod.cpp:361
#: pcbnew/class_pad.cpp:1014 #: pcbnew/class_pad.cpp:1016
#: pcbnew/dialog_edit_module.cpp:245 #: pcbnew/dialog_edit_module.cpp:245
#: pcbnew/class_module.cpp:1139 #: pcbnew/class_module.cpp:1139
#: eeschema/affiche.cpp:117 #: eeschema/affiche.cpp:117
...@@ -1064,14 +1065,14 @@ msgstr "Epaisseur" ...@@ -1064,14 +1065,14 @@ msgstr "Epaisseur"
#: pcbnew/class_pcb_text.cpp:184 #: pcbnew/class_pcb_text.cpp:184
#: pcbnew/class_text_mod.cpp:367 #: pcbnew/class_text_mod.cpp:367
#: pcbnew/class_pad.cpp:985 #: pcbnew/class_pad.cpp:987
#: gerbview/affiche.cpp:55 #: gerbview/affiche.cpp:55
msgid "H Size" msgid "H Size"
msgstr "Taille H" msgstr "Taille H"
#: pcbnew/class_pcb_text.cpp:187 #: pcbnew/class_pcb_text.cpp:187
#: pcbnew/class_text_mod.cpp:370 #: pcbnew/class_text_mod.cpp:370
#: pcbnew/class_pad.cpp:989 #: pcbnew/class_pad.cpp:991
#: gerbview/affiche.cpp:58 #: gerbview/affiche.cpp:58
msgid "V Size" msgid "V Size"
msgstr "Taille V" msgstr "Taille V"
...@@ -1115,7 +1116,7 @@ msgstr "Offset Y" ...@@ -1115,7 +1116,7 @@ msgstr "Offset Y"
#: pcbnew/dialog_edit_mod_text.cpp:213 #: pcbnew/dialog_edit_mod_text.cpp:213
#: pcbnew/dialog_initpcb.cpp:161 #: pcbnew/dialog_initpcb.cpp:161
#: pcbnew/dialog_display_options.cpp:280 #: pcbnew/dialog_display_options.cpp:282
#: pcbnew/set_grid.cpp:171 #: pcbnew/set_grid.cpp:171
#: pcbnew/dialog_pad_edit.cpp:217 #: pcbnew/dialog_pad_edit.cpp:217
#: pcbnew/dialog_general_options.cpp:368 #: pcbnew/dialog_general_options.cpp:368
...@@ -1139,7 +1140,7 @@ msgstr "&OK" ...@@ -1139,7 +1140,7 @@ msgstr "&OK"
#: pcbnew/dialog_edit_mod_text.cpp:217 #: pcbnew/dialog_edit_mod_text.cpp:217
#: pcbnew/dialog_initpcb.cpp:164 #: pcbnew/dialog_initpcb.cpp:164
#: pcbnew/dialog_display_options.cpp:284 #: pcbnew/dialog_display_options.cpp:286
#: pcbnew/zones.cpp:216 #: pcbnew/zones.cpp:216
#: pcbnew/set_grid.cpp:176 #: pcbnew/set_grid.cpp:176
#: pcbnew/dialog_pad_edit.cpp:221 #: pcbnew/dialog_pad_edit.cpp:221
...@@ -1512,12 +1513,12 @@ msgid "Display Polar Coords" ...@@ -1512,12 +1513,12 @@ msgid "Display Polar Coords"
msgstr "Affichage coord Polaires" msgstr "Affichage coord Polaires"
#: pcbnew/pcbframe.cpp:381 #: pcbnew/pcbframe.cpp:381
#: eeschema/schframe.cpp:261 #: eeschema/schframe.cpp:274
msgid "Grid not show" msgid "Grid not show"
msgstr "Grille non montre" msgstr "Grille non montre"
#: pcbnew/pcbframe.cpp:381 #: pcbnew/pcbframe.cpp:381
#: eeschema/schframe.cpp:261 #: eeschema/schframe.cpp:274
msgid "Show Grid" msgid "Show Grid"
msgstr "Afficher grille" msgstr "Afficher grille"
...@@ -1857,7 +1858,7 @@ msgstr "Creation de formes polynomiales (pour applications micro-ondes)" ...@@ -1857,7 +1858,7 @@ msgstr "Creation de formes polynomiales (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:567 #: pcbnew/tool_pcb.cpp:567
#: pcbnew/tool_modedit.cpp:285 #: pcbnew/tool_modedit.cpp:285
#: eeschema/plotps.cpp:169 #: eeschema/plotps.cpp:169
#: share/zoom.cpp:368 #: share/zoom.cpp:364
msgid "Auto" msgid "Auto"
msgstr "Auto" msgstr "Auto"
...@@ -1947,7 +1948,7 @@ msgid "Include Locked Tracks" ...@@ -1947,7 +1948,7 @@ msgid "Include Locked Tracks"
msgstr "Inclure pistes verrouilles" msgstr "Inclure pistes verrouilles"
#: pcbnew/class_board_item.cpp:36 #: pcbnew/class_board_item.cpp:36
#: pcbnew/class_pad.cpp:889 #: pcbnew/class_pad.cpp:891
msgid "Net" msgid "Net"
msgstr "Net" msgstr "Net"
...@@ -1989,6 +1990,7 @@ msgstr "Pcb Graphic" ...@@ -1989,6 +1990,7 @@ msgstr "Pcb Graphic"
#: pcbnew/class_board_item.cpp:146 #: pcbnew/class_board_item.cpp:146
#: pcbnew/class_board_item.cpp:164 #: pcbnew/class_board_item.cpp:164
#: pcbnew/class_board_item.cpp:191 #: pcbnew/class_board_item.cpp:191
#: pcbnew/class_board_item.cpp:207
#: pcbnew/class_board_item.cpp:213 #: pcbnew/class_board_item.cpp:213
msgid " on " msgid " on "
msgstr " sur " msgstr " sur "
...@@ -2024,9 +2026,9 @@ msgid "Graphic" ...@@ -2024,9 +2026,9 @@ msgid "Graphic"
msgstr "Graphique" msgstr "Graphique"
#: pcbnew/class_board_item.cpp:99 #: pcbnew/class_board_item.cpp:99
#: pcbnew/dialog_display_options.cpp:223 #: pcbnew/dialog_display_options.cpp:221
#: pcbnew/dialog_display_options.cpp:231 #: pcbnew/dialog_display_options.cpp:229
#: pcbnew/dialog_display_options.cpp:264 #: pcbnew/dialog_display_options.cpp:266
#: pcbnew/pcbplot.cpp:330 #: pcbnew/pcbplot.cpp:330
#: gerbview/options.cpp:316 #: gerbview/options.cpp:316
msgid "Line" msgid "Line"
...@@ -2079,34 +2081,38 @@ msgstr "Marqueur" ...@@ -2079,34 +2081,38 @@ msgstr "Marqueur"
msgid "Dimension" msgid "Dimension"
msgstr "Dimension" msgstr "Dimension"
#: pcbnew/class_board_item.cpp:206 #: pcbnew/class_board_item.cpp:207
msgid "Target" msgid "Target"
msgstr "Mire" msgstr "Mire"
#: pcbnew/class_board_item.cpp:208
msgid "size"
msgstr "dimension"
#: pcbnew/class_board_item.cpp:213 #: pcbnew/class_board_item.cpp:213
msgid "Edge Zone" msgid "Edge Zone"
msgstr "Contour Zone" msgstr "Contour Zone"
#: pcbnew/dialog_display_options.cpp:188 #: pcbnew/dialog_display_options.cpp:186
msgid "Tracks and vias" msgid "Tracks and vias"
msgstr "Pistes et vias" msgstr "Pistes et vias"
#: pcbnew/dialog_display_options.cpp:193 #: pcbnew/dialog_display_options.cpp:191
#: pcbnew/dialog_display_options.cpp:225 #: pcbnew/dialog_display_options.cpp:223
#: pcbnew/dialog_display_options.cpp:233 #: pcbnew/dialog_display_options.cpp:231
#: pcbnew/dialog_display_options.cpp:242 #: pcbnew/dialog_display_options.cpp:244
#: pcbnew/dialog_display_options.cpp:266 #: pcbnew/dialog_display_options.cpp:268
#: pcbnew/pcbplot.cpp:330 #: pcbnew/pcbplot.cpp:330
#: gerbview/options.cpp:301 #: gerbview/options.cpp:301
#: gerbview/options.cpp:316 #: gerbview/options.cpp:316
msgid "Sketch" msgid "Sketch"
msgstr "Contour" msgstr "Contour"
#: pcbnew/dialog_display_options.cpp:194 #: pcbnew/dialog_display_options.cpp:192
#: pcbnew/dialog_display_options.cpp:224 #: pcbnew/dialog_display_options.cpp:222
#: pcbnew/dialog_display_options.cpp:232 #: pcbnew/dialog_display_options.cpp:230
#: pcbnew/dialog_display_options.cpp:243 #: pcbnew/dialog_display_options.cpp:245
#: pcbnew/dialog_display_options.cpp:265 #: pcbnew/dialog_display_options.cpp:267
#: pcbnew/pcbplot.cpp:330 #: pcbnew/pcbplot.cpp:330
#: eeschema/dialog_cmp_graphic_properties.cpp:168 #: eeschema/dialog_cmp_graphic_properties.cpp:168
#: gerbview/options.cpp:301 #: gerbview/options.cpp:301
...@@ -2114,73 +2120,77 @@ msgstr "Contour" ...@@ -2114,73 +2120,77 @@ msgstr "Contour"
msgid "Filled" msgid "Filled"
msgstr "Plein" msgstr "Plein"
#: pcbnew/dialog_display_options.cpp:196 #: pcbnew/dialog_display_options.cpp:193
#: pcbnew/ioascii.cpp:196 #: pcbnew/ioascii.cpp:196
msgid "Tracks:" msgid "Tracks:"
msgstr "Pistes:" msgstr "Pistes:"
#: pcbnew/dialog_display_options.cpp:200 #: pcbnew/dialog_display_options.cpp:198
#: pcbnew/dialog_display_options.cpp:210 #: pcbnew/dialog_display_options.cpp:208
#: pcbnew/dialog_general_options.cpp:357 #: pcbnew/dialog_general_options.cpp:357
msgid "Always" msgid "Always"
msgstr "Toujours" msgstr "Toujours"
#: pcbnew/dialog_display_options.cpp:201 #: pcbnew/dialog_display_options.cpp:199
msgid "New track" msgid "New track"
msgstr "Nouvelle piste" msgstr "Nouvelle piste"
#: pcbnew/dialog_display_options.cpp:202 #: pcbnew/dialog_display_options.cpp:200
#: pcbnew/dialog_display_options.cpp:208 #: pcbnew/dialog_display_options.cpp:206
#: pcbnew/dialog_general_options.cpp:355 #: pcbnew/dialog_general_options.cpp:355
msgid "Never" msgid "Never"
msgstr "Jamais" msgstr "Jamais"
#: pcbnew/dialog_display_options.cpp:204 #: pcbnew/dialog_display_options.cpp:201
msgid "Show Track Clearance" msgid "Show Track Clearance"
msgstr "Monter Isolation Piste" msgstr "Monter Isolation Piste"
#: pcbnew/dialog_display_options.cpp:209 #: pcbnew/dialog_display_options.cpp:207
msgid "defined holes" msgid "defined holes"
msgstr "Trous dfinis" msgstr "Trous dfinis"
#: pcbnew/dialog_display_options.cpp:212 #: pcbnew/dialog_display_options.cpp:209
msgid "Show Via Holes" msgid "Show Via Holes"
msgstr "Montrer trous pour vias" msgstr "Montrer trous pour vias"
#: pcbnew/dialog_display_options.cpp:215 #: pcbnew/dialog_display_options.cpp:213
msgid "Modules" msgid "Modules"
msgstr "Modules" msgstr "Modules"
#: pcbnew/dialog_display_options.cpp:227 #: pcbnew/dialog_display_options.cpp:224
msgid "Module Texts" msgid "Module Texts"
msgstr "Texte module" msgstr "Texte module"
#: pcbnew/dialog_display_options.cpp:235 #: pcbnew/dialog_display_options.cpp:232
msgid "Module Edges:" msgid "Module Edges:"
msgstr "Contours modules:" msgstr "Contours modules:"
#: pcbnew/dialog_display_options.cpp:245 #: pcbnew/dialog_display_options.cpp:239
msgid "Pads:" msgid "Pad Options:"
msgstr "Pastilles:" msgstr "Options Pads:"
#: pcbnew/dialog_display_options.cpp:246
msgid "Pad Shapes:"
msgstr "Forme Pads:"
#: pcbnew/dialog_display_options.cpp:248 #: pcbnew/dialog_display_options.cpp:250
msgid "Show Pad Clearance" msgid "Show Pad Clearance"
msgstr "Monter Isolation" msgstr "Monter Isolation"
#: pcbnew/dialog_display_options.cpp:252 #: pcbnew/dialog_display_options.cpp:254
msgid "Show Pad Number" msgid "Show Pad Number"
msgstr "Afficher le n de pad" msgstr "Afficher le n de pad"
#: pcbnew/dialog_display_options.cpp:256 #: pcbnew/dialog_display_options.cpp:258
msgid "Show Pad NoConnect" msgid "Show Pad NoConnect"
msgstr "Montrer non conn" msgstr "Montrer non conn"
#: pcbnew/dialog_display_options.cpp:268 #: pcbnew/dialog_display_options.cpp:269
#: gerbview/options.cpp:317 #: gerbview/options.cpp:317
msgid "Display other items:" msgid "Display other items:"
msgstr "Afficher autres lments" msgstr "Afficher autres lments"
#: pcbnew/dialog_display_options.cpp:275 #: pcbnew/dialog_display_options.cpp:276
#: eeschema/dialog_options.cpp:267 #: eeschema/dialog_options.cpp:267
msgid "Show page limits" msgid "Show page limits"
msgstr " Afficher limites de page" msgstr " Afficher limites de page"
...@@ -2309,7 +2319,7 @@ msgstr "Liste modules" ...@@ -2309,7 +2319,7 @@ msgstr "Liste modules"
#: pcbnew/xchgmod.cpp:137 #: pcbnew/xchgmod.cpp:137
#: pcbnew/pcbplot.cpp:209 #: pcbnew/pcbplot.cpp:209
#: share/zoom.cpp:449 #: share/zoom.cpp:445
msgid "Close" msgid "Close"
msgstr "Fermer" msgstr "Fermer"
...@@ -3021,7 +3031,7 @@ msgid "Ref." ...@@ -3021,7 +3031,7 @@ msgid "Ref."
msgstr "Ref." msgstr "Ref."
#: pcbnew/class_text_mod.cpp:328 #: pcbnew/class_text_mod.cpp:328
#: pcbnew/class_pad.cpp:883 #: pcbnew/class_pad.cpp:885
#: pcbnew/class_edge_mod.cpp:285 #: pcbnew/class_edge_mod.cpp:285
#: pcbnew/class_module.cpp:1142 #: pcbnew/class_module.cpp:1142
#: cvpcb/setvisu.cpp:31 #: cvpcb/setvisu.cpp:31
...@@ -3227,32 +3237,32 @@ msgstr "Autoplace modules: pas de contours sur pcb, impossible de placer les mod ...@@ -3227,32 +3237,32 @@ msgstr "Autoplace modules: pas de contours sur pcb, impossible de placer les mod
msgid "Ok to set module orientation to %d degrees ?" msgid "Ok to set module orientation to %d degrees ?"
msgstr "Ok pour orientation module %d degrs ?" msgstr "Ok pour orientation module %d degrs ?"
#: pcbnew/class_pad.cpp:797 #: pcbnew/class_pad.cpp:799
msgid "Unknown Pad shape" msgid "Unknown Pad shape"
msgstr "Forme pad inconnue" msgstr "Forme pad inconnue"
#: pcbnew/class_pad.cpp:886 #: pcbnew/class_pad.cpp:888
msgid "RefP" msgid "RefP"
msgstr "RefP" msgstr "RefP"
#: pcbnew/class_pad.cpp:1003 #: pcbnew/class_pad.cpp:1005
msgid "Drill X / Y" msgid "Drill X / Y"
msgstr "Perage X/Y" msgstr "Perage X/Y"
#: pcbnew/class_pad.cpp:1018 #: pcbnew/class_pad.cpp:1020
msgid "X Pos" msgid "X Pos"
msgstr "X Pos" msgstr "X Pos"
#: pcbnew/class_pad.cpp:1022 #: pcbnew/class_pad.cpp:1024
msgid "Y pos" msgid "Y pos"
msgstr "Y pos" msgstr "Y pos"
#: pcbnew/basepcbframe.cpp:129 #: pcbnew/basepcbframe.cpp:131
msgid "3D Frame already opened" msgid "3D Frame already opened"
msgstr "Fenetre 3D dj ouverte" msgstr "Fenetre 3D dj ouverte"
#: pcbnew/basepcbframe.cpp:134 #: pcbnew/basepcbframe.cpp:136
#: pcbnew/basepcbframe.cpp:137 #: pcbnew/basepcbframe.cpp:139
msgid "3D Viewer" msgid "3D Viewer"
msgstr "Visu 3D" msgstr "Visu 3D"
...@@ -3264,35 +3274,35 @@ msgstr "Fichier de secours " ...@@ -3264,35 +3274,35 @@ msgstr "Fichier de secours "
msgid "Ok to load Recovery file " msgid "Ok to load Recovery file "
msgstr "Ok pour charger le fichier de secours" msgstr "Ok pour charger le fichier de secours"
#: pcbnew/files.cpp:143 #: pcbnew/files.cpp:142
msgid "Board Modified: Continue ?" msgid "Board Modified: Continue ?"
msgstr "Circuit imprim modifi, Continuer ?" msgstr "Circuit imprim modifi, Continuer ?"
#: pcbnew/files.cpp:161 #: pcbnew/files.cpp:160
msgid "Load board files:" msgid "Load board files:"
msgstr "Charger Fichiers C.I.:" msgstr "Charger Fichiers C.I.:"
#: pcbnew/files.cpp:269 #: pcbnew/files.cpp:268
msgid "Save board files:" msgid "Save board files:"
msgstr "Sauver Fichiers C.I.:" msgstr "Sauver Fichiers C.I.:"
#: pcbnew/files.cpp:306 #: pcbnew/files.cpp:307
msgid "Warning: unable to create bakfile " msgid "Warning: unable to create bakfile "
msgstr "Attention: Impossible de crer fichier backup " msgstr "Attention: Impossible de crer fichier backup "
#: pcbnew/files.cpp:340 #: pcbnew/files.cpp:341
msgid "Backup file: " msgid "Backup file: "
msgstr "Fichier backup: " msgstr "Fichier backup: "
#: pcbnew/files.cpp:344 #: pcbnew/files.cpp:345
msgid "Wrote board file: " msgid "Wrote board file: "
msgstr "Ecriture fichier CI: " msgstr "Ecriture fichier CI: "
#: pcbnew/files.cpp:346 #: pcbnew/files.cpp:347
msgid "Failed to create " msgid "Failed to create "
msgstr "Impossible de crer fichier " msgstr "Impossible de crer fichier "
#: pcbnew/modedit_onclick.cpp:205 #: pcbnew/modedit_onclick.cpp:207
#: pcbnew/onrightclick.cpp:151 #: pcbnew/onrightclick.cpp:151
#: eeschema/libedit_onrightclick.cpp:73 #: eeschema/libedit_onrightclick.cpp:73
#: eeschema/onrightclick.cpp:125 #: eeschema/onrightclick.cpp:125
...@@ -3300,7 +3310,7 @@ msgstr "Impossible de cr ...@@ -3300,7 +3310,7 @@ msgstr "Impossible de cr
msgid "End Tool" msgid "End Tool"
msgstr "Fin Outil" msgstr "Fin Outil"
#: pcbnew/modedit_onclick.cpp:215 #: pcbnew/modedit_onclick.cpp:217
#: pcbnew/onrightclick.cpp:494 #: pcbnew/onrightclick.cpp:494
#: eeschema/libedit_onrightclick.cpp:252 #: eeschema/libedit_onrightclick.cpp:252
#: eeschema/onrightclick.cpp:581 #: eeschema/onrightclick.cpp:581
...@@ -3308,13 +3318,13 @@ msgstr "Fin Outil" ...@@ -3308,13 +3318,13 @@ msgstr "Fin Outil"
msgid "Cancel Block" msgid "Cancel Block"
msgstr "Annuler Bloc" msgstr "Annuler Bloc"
#: pcbnew/modedit_onclick.cpp:217 #: pcbnew/modedit_onclick.cpp:219
#: pcbnew/onrightclick.cpp:496 #: pcbnew/onrightclick.cpp:496
#: gerbview/onrightclick.cpp:52 #: gerbview/onrightclick.cpp:52
msgid "Zoom Block (Midd butt drag)" msgid "Zoom Block (Midd butt drag)"
msgstr "Zoom Bloc (drag+bouton milieu)" msgstr "Zoom Bloc (drag+bouton milieu)"
#: pcbnew/modedit_onclick.cpp:220 #: pcbnew/modedit_onclick.cpp:222
#: pcbnew/onrightclick.cpp:499 #: pcbnew/onrightclick.cpp:499
#: eeschema/libedit_onrightclick.cpp:260 #: eeschema/libedit_onrightclick.cpp:260
#: eeschema/onrightclick.cpp:589 #: eeschema/onrightclick.cpp:589
...@@ -3322,111 +3332,111 @@ msgstr "Zoom Bloc (drag+bouton milieu)" ...@@ -3322,111 +3332,111 @@ msgstr "Zoom Bloc (drag+bouton milieu)"
msgid "Place Block" msgid "Place Block"
msgstr "Place Bloc" msgstr "Place Bloc"
#: pcbnew/modedit_onclick.cpp:222 #: pcbnew/modedit_onclick.cpp:224
#: pcbnew/onrightclick.cpp:501 #: pcbnew/onrightclick.cpp:501
#: eeschema/libedit_onrightclick.cpp:266 #: eeschema/libedit_onrightclick.cpp:266
#: eeschema/onrightclick.cpp:598 #: eeschema/onrightclick.cpp:598
msgid "Copy Block (shift + drag mouse)" msgid "Copy Block (shift + drag mouse)"
msgstr "Copie Bloc (shift + drag mouse)" msgstr "Copie Bloc (shift + drag mouse)"
#: pcbnew/modedit_onclick.cpp:224 #: pcbnew/modedit_onclick.cpp:226
msgid "Mirror Block (alt + drag mouse)" msgid "Mirror Block (alt + drag mouse)"
msgstr "Bloc Miroir (alt + drag mouse)" msgstr "Bloc Miroir (alt + drag mouse)"
#: pcbnew/modedit_onclick.cpp:226 #: pcbnew/modedit_onclick.cpp:228
#: pcbnew/onrightclick.cpp:505 #: pcbnew/onrightclick.cpp:505
msgid "Rotate Block (ctrl + drag mouse)" msgid "Rotate Block (ctrl + drag mouse)"
msgstr "Rotation Bloc (ctrl + drag mouse)" msgstr "Rotation Bloc (ctrl + drag mouse)"
#: pcbnew/modedit_onclick.cpp:228 #: pcbnew/modedit_onclick.cpp:230
#: pcbnew/onrightclick.cpp:507 #: pcbnew/onrightclick.cpp:507
msgid "Delete Block (shift+ctrl + drag mouse)" msgid "Delete Block (shift+ctrl + drag mouse)"
msgstr "Effacement Bloc (shift+ctrl + drag mouse)" msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
#: pcbnew/modedit_onclick.cpp:250 #: pcbnew/modedit_onclick.cpp:252
#: pcbnew/onrightclick.cpp:713 #: pcbnew/onrightclick.cpp:713
#: pcbnew/onrightclick.cpp:810 #: pcbnew/onrightclick.cpp:810
msgid "Rotate" msgid "Rotate"
msgstr "Rotation" msgstr "Rotation"
#: pcbnew/modedit_onclick.cpp:254 #: pcbnew/modedit_onclick.cpp:256
msgid "Scale" msgid "Scale"
msgstr "Echelle" msgstr "Echelle"
#: pcbnew/modedit_onclick.cpp:255 #: pcbnew/modedit_onclick.cpp:257
msgid "Scale X" msgid "Scale X"
msgstr "Echelle X" msgstr "Echelle X"
#: pcbnew/modedit_onclick.cpp:256 #: pcbnew/modedit_onclick.cpp:258
msgid "Scale Y" msgid "Scale Y"
msgstr "Echelle Y" msgstr "Echelle Y"
#: pcbnew/modedit_onclick.cpp:259 #: pcbnew/modedit_onclick.cpp:261
#: pcbnew/dialog_edit_module.cpp:185 #: pcbnew/dialog_edit_module.cpp:185
msgid "Edit Module" msgid "Edit Module"
msgstr "Edit Module" msgstr "Edit Module"
#: pcbnew/modedit_onclick.cpp:262 #: pcbnew/modedit_onclick.cpp:264
msgid "Transform Module" msgid "Transform Module"
msgstr "Transforme Module" msgstr "Transforme Module"
#: pcbnew/modedit_onclick.cpp:270 #: pcbnew/modedit_onclick.cpp:272
msgid "Move Pad" msgid "Move Pad"
msgstr "Dplace Pad" msgstr "Dplace Pad"
#: pcbnew/modedit_onclick.cpp:272 #: pcbnew/modedit_onclick.cpp:274
#: pcbnew/onrightclick.cpp:752 #: pcbnew/onrightclick.cpp:752
msgid "Edit Pad" msgid "Edit Pad"
msgstr "Edit Pad" msgstr "Edit Pad"
#: pcbnew/modedit_onclick.cpp:274 #: pcbnew/modedit_onclick.cpp:276
#: pcbnew/onrightclick.cpp:756 #: pcbnew/onrightclick.cpp:756
msgid "New Pad Settings" msgid "New Pad Settings"
msgstr "Nouvelles Caract. Pads" msgstr "Nouvelles Caract. Pads"
#: pcbnew/modedit_onclick.cpp:276 #: pcbnew/modedit_onclick.cpp:278
#: pcbnew/onrightclick.cpp:758 #: pcbnew/onrightclick.cpp:758
msgid "Export Pad Settings" msgid "Export Pad Settings"
msgstr "Exporte Caract. Pads" msgstr "Exporte Caract. Pads"
#: pcbnew/modedit_onclick.cpp:278 #: pcbnew/modedit_onclick.cpp:280
msgid "delete Pad" msgid "delete Pad"
msgstr "Supprimer Pad" msgstr "Supprimer Pad"
#: pcbnew/modedit_onclick.cpp:283 #: pcbnew/modedit_onclick.cpp:285
#: pcbnew/onrightclick.cpp:763 #: pcbnew/onrightclick.cpp:763
msgid "Global Pad Settings" msgid "Global Pad Settings"
msgstr "Edition Globale des pads" msgstr "Edition Globale des pads"
#: pcbnew/modedit_onclick.cpp:291 #: pcbnew/modedit_onclick.cpp:293
msgid "Move Text Mod." msgid "Move Text Mod."
msgstr "Move Texte Mod." msgstr "Move Texte Mod."
#: pcbnew/modedit_onclick.cpp:294 #: pcbnew/modedit_onclick.cpp:296
msgid "Rotate Text Mod." msgid "Rotate Text Mod."
msgstr "Rot. Texte Mod." msgstr "Rot. Texte Mod."
#: pcbnew/modedit_onclick.cpp:296 #: pcbnew/modedit_onclick.cpp:298
msgid "Edit Text Mod." msgid "Edit Text Mod."
msgstr "Edit Texte Mod." msgstr "Edit Texte Mod."
#: pcbnew/modedit_onclick.cpp:299 #: pcbnew/modedit_onclick.cpp:301
msgid "Delete Text Mod." msgid "Delete Text Mod."
msgstr "Supprimer Texte Mod." msgstr "Supprimer Texte Mod."
#: pcbnew/modedit_onclick.cpp:306 #: pcbnew/modedit_onclick.cpp:308
msgid "End edge" msgid "End edge"
msgstr "Fin contour" msgstr "Fin contour"
#: pcbnew/modedit_onclick.cpp:309 #: pcbnew/modedit_onclick.cpp:311
msgid "Move edge" msgid "Move edge"
msgstr "Dplace contour" msgstr "Dplace contour"
#: pcbnew/modedit_onclick.cpp:312 #: pcbnew/modedit_onclick.cpp:314
msgid "Place edge" msgid "Place edge"
msgstr "Place contour" msgstr "Place contour"
#: pcbnew/modedit_onclick.cpp:315 #: pcbnew/modedit_onclick.cpp:317
#: pcbnew/onrightclick.cpp:681 #: pcbnew/onrightclick.cpp:681
#: pcbnew/onrightclick.cpp:715 #: pcbnew/onrightclick.cpp:715
#: pcbnew/onrightclick.cpp:812 #: pcbnew/onrightclick.cpp:812
...@@ -3434,27 +3444,27 @@ msgstr "Place contour" ...@@ -3434,27 +3444,27 @@ msgstr "Place contour"
msgid "Edit" msgid "Edit"
msgstr "Editer" msgstr "Editer"
#: pcbnew/modedit_onclick.cpp:317 #: pcbnew/modedit_onclick.cpp:319
msgid "Edit Width (Current)" msgid "Edit Width (Current)"
msgstr "Edit Epaisseur (Courant)" msgstr "Edit Epaisseur (Courant)"
#: pcbnew/modedit_onclick.cpp:319 #: pcbnew/modedit_onclick.cpp:321
msgid "Edit Width (All)" msgid "Edit Width (All)"
msgstr "Edit Epaisseur (Tous)" msgstr "Edit Epaisseur (Tous)"
#: pcbnew/modedit_onclick.cpp:321 #: pcbnew/modedit_onclick.cpp:323
msgid "Edit Layer (Current)" msgid "Edit Layer (Current)"
msgstr "Edit Couche (Courant)" msgstr "Edit Couche (Courant)"
#: pcbnew/modedit_onclick.cpp:323 #: pcbnew/modedit_onclick.cpp:325
msgid "Edit Layer (All)" msgid "Edit Layer (All)"
msgstr "Edit Couche (Tous)" msgstr "Edit Couche (Tous)"
#: pcbnew/modedit_onclick.cpp:325 #: pcbnew/modedit_onclick.cpp:327
msgid "Delete edge" msgid "Delete edge"
msgstr "Effacement contour" msgstr "Effacement contour"
#: pcbnew/modedit_onclick.cpp:366 #: pcbnew/modedit_onclick.cpp:368
msgid "Set Width" msgid "Set Width"
msgstr "Ajuste Epaiss" msgstr "Ajuste Epaiss"
...@@ -3828,7 +3838,7 @@ msgstr "Deselection" ...@@ -3828,7 +3838,7 @@ msgstr "Deselection"
msgid "Deselect this layer to restore its No Change state" msgid "Deselect this layer to restore its No Change state"
msgstr "Deselectionner cette couche pour restorer l'option Pas de Changement" msgstr "Deselectionner cette couche pour restorer l'option Pas de Changement"
#: pcbnew/moduleframe.cpp:178 #: pcbnew/moduleframe.cpp:181
msgid "Module Editor: module modified!, Continue ?" msgid "Module Editor: module modified!, Continue ?"
msgstr "Editeur de Module: module modifi! Continuer ?" msgstr "Editeur de Module: module modifi! Continuer ?"
...@@ -4428,17 +4438,17 @@ msgid "Alternate Via Drill" ...@@ -4428,17 +4438,17 @@ msgid "Alternate Via Drill"
msgstr "Perage vias alternatif" msgstr "Perage vias alternatif"
#: pcbnew/dialog_track_options.cpp:146 #: pcbnew/dialog_track_options.cpp:146
#: pcbnew/pcbnew.h:285 #: pcbnew/pcbnew.h:289
msgid "Blind Via" msgid "Blind Via"
msgstr "Via borgne" msgstr "Via borgne"
#: pcbnew/dialog_track_options.cpp:147 #: pcbnew/dialog_track_options.cpp:147
#: pcbnew/pcbnew.h:286 #: pcbnew/pcbnew.h:290
msgid "Buried Via" msgid "Buried Via"
msgstr "Via enterre" msgstr "Via enterre"
#: pcbnew/dialog_track_options.cpp:148 #: pcbnew/dialog_track_options.cpp:148
#: pcbnew/pcbnew.h:287 #: pcbnew/pcbnew.h:291
msgid "Standard Via" msgid "Standard Via"
msgstr "Via Standard" msgstr "Via Standard"
...@@ -6748,20 +6758,20 @@ msgstr " non trouv ...@@ -6748,20 +6758,20 @@ msgstr " non trouv
msgid "Schematic modified, Save before exit ?" msgid "Schematic modified, Save before exit ?"
msgstr "Schematique modifie, Sauver avant de quitter ?" msgstr "Schematique modifie, Sauver avant de quitter ?"
#: eeschema/schframe.cpp:271 #: eeschema/schframe.cpp:284
msgid "No show Hidden Pins" msgid "No show Hidden Pins"
msgstr "N'affichage pas les pins invisibles" msgstr "N'affichage pas les pins invisibles"
#: eeschema/schframe.cpp:271 #: eeschema/schframe.cpp:284
#: eeschema/tool_sch.cpp:274 #: eeschema/tool_sch.cpp:274
msgid "Show Hidden Pins" msgid "Show Hidden Pins"
msgstr "Force affichage des pins invisibles" msgstr "Force affichage des pins invisibles"
#: eeschema/schframe.cpp:274 #: eeschema/schframe.cpp:287
msgid "Draw lines at any direction" msgid "Draw lines at any direction"
msgstr "Tracer traits de direction quelconque" msgstr "Tracer traits de direction quelconque"
#: eeschema/schframe.cpp:275 #: eeschema/schframe.cpp:288
msgid "Draw lines H, V or 45 deg only" msgid "Draw lines H, V or 45 deg only"
msgstr "Tracer traits H, V ou 45 deg seulement" msgstr "Tracer traits H, V ou 45 deg seulement"
...@@ -7465,7 +7475,7 @@ msgstr "Justifi ...@@ -7465,7 +7475,7 @@ msgstr "Justifi
#: eeschema/edit_component_in_lib.cpp:476 #: eeschema/edit_component_in_lib.cpp:476
#: eeschema/edit_component_in_lib.cpp:478 #: eeschema/edit_component_in_lib.cpp:478
#: share/zoom.cpp:360 #: share/zoom.cpp:356
msgid "Center" msgid "Center"
msgstr "Centrer" msgstr "Centrer"
...@@ -7923,16 +7933,6 @@ msgstr "Format Netliste: ViewLogic net&pkg" ...@@ -7923,16 +7933,6 @@ msgstr "Format Netliste: ViewLogic net&pkg"
msgid "Component [%s] not found in .pkg file" msgid "Component [%s] not found in .pkg file"
msgstr "Composant [%s] non trouv en fichier .pkg" msgstr "Composant [%s] non trouv en fichier .pkg"
#: cvpcb/listlib.cpp:69
#, c-format
msgid "Library file <%s> not found"
msgstr "Librairie %s non trouve"
#: cvpcb/listlib.cpp:79
#, c-format
msgid "Library file <%s> is not a module library"
msgstr "Le fichier %s n'est pas une librairie eeschema"
#: cvpcb/init.cpp:64 #: cvpcb/init.cpp:64
#, c-format #, c-format
msgid "Components: %d (free: %d)" msgid "Components: %d (free: %d)"
...@@ -7949,8 +7949,9 @@ msgid "Componants: %d (free: %d)" ...@@ -7949,8 +7949,9 @@ msgid "Componants: %d (free: %d)"
msgstr "Composants: %d (libres: %d)" msgstr "Composants: %d (libres: %d)"
#: cvpcb/init.cpp:164 #: cvpcb/init.cpp:164
msgid "Save Net List & Cmp" #: cvpcb/tool_cvpcb.cpp:38
msgstr "Sauver netliste et cmp liste" msgid "Save NetList and Components List files"
msgstr "Sauver Netliste et Cmp Liste"
#: cvpcb/init.cpp:180 #: cvpcb/init.cpp:180
msgid "Unable to create component file (.cmp)" msgid "Unable to create component file (.cmp)"
...@@ -7964,6 +7965,16 @@ msgstr "Impossible de cr ...@@ -7964,6 +7965,16 @@ msgstr "Impossible de cr
msgid "Load Net List" msgid "Load Net List"
msgstr "Lire Netliste" msgstr "Lire Netliste"
#: cvpcb/listlib.cpp:69
#, c-format
msgid "Library file <%s> not found"
msgstr "Librairie %s non trouve"
#: cvpcb/listlib.cpp:79
#, c-format
msgid "Library file <%s> is not a module library"
msgstr "Le fichier %s n'est pas une librairie eeschema"
#: cvpcb/setvisu.cpp:42 #: cvpcb/setvisu.cpp:42
msgid "Footprint: " msgid "Footprint: "
msgstr "Module: " msgstr "Module: "
...@@ -7972,17 +7983,17 @@ msgstr "Module: " ...@@ -7972,17 +7983,17 @@ msgstr "Module: "
msgid "Lib: " msgid "Lib: "
msgstr "Lib: " msgstr "Lib: "
#: cvpcb/listboxes.cpp:310 #: cvpcb/listboxes.cpp:328
#, c-format #, c-format
msgid "Footprints: %d" msgid "Footprints: %d"
msgstr "Modules: %d" msgstr "Modules: %d"
#: cvpcb/listboxes.cpp:412 #: cvpcb/listboxes.cpp:452
#, c-format #, c-format
msgid "Footprints (All): %d" msgid "Footprints (All): %d"
msgstr "Modules (Tous): %d" msgstr "Modules (Tous): %d"
#: cvpcb/listboxes.cpp:414 #: cvpcb/listboxes.cpp:454
#, c-format #, c-format
msgid "Footprints (filtered): %d" msgid "Footprints (filtered): %d"
msgstr "Modules filts): %d" msgstr "Modules filts): %d"
...@@ -8044,7 +8055,7 @@ msgid "View &Net + Pkg" ...@@ -8044,7 +8055,7 @@ msgid "View &Net + Pkg"
msgstr "View &Net + Pkg" msgstr "View &Net + Pkg"
#: cvpcb/displayframe.cpp:119 #: cvpcb/displayframe.cpp:119
#: pcbnew/dialog_display_options.h:43 #: pcbnew/dialog_display_options.h:54
#: cvpcb/dialog_display_options.h:51 #: cvpcb/dialog_display_options.h:51
msgid "Display Options" msgid "Display Options"
msgstr "Options d'affichage" msgstr "Options d'affichage"
...@@ -8059,12 +8070,9 @@ msgid "Netlist error: %s" ...@@ -8059,12 +8070,9 @@ msgid "Netlist error: %s"
msgstr "Erreur Netliste: %s" msgstr "Erreur Netliste: %s"
#: cvpcb/tool_cvpcb.cpp:35 #: cvpcb/tool_cvpcb.cpp:35
msgid "Open Netlist" #: cvpcb/tool_cvpcb.cpp:113
msgstr "Lire Netliste" msgid "Open a NetList file"
msgstr "Lire un Fichier Netliste"
#: cvpcb/tool_cvpcb.cpp:38
msgid "Save Nelist and Cmp list"
msgstr "Sauver netliste et cmp liste"
#: cvpcb/tool_cvpcb.cpp:42 #: cvpcb/tool_cvpcb.cpp:42
msgid "Configuration" msgid "Configuration"
...@@ -8107,20 +8115,16 @@ msgid "Display the full footprint list (without filtering)" ...@@ -8107,20 +8115,16 @@ msgid "Display the full footprint list (without filtering)"
msgstr "Montre la liste complte des modules" msgstr "Montre la liste complte des modules"
#: cvpcb/tool_cvpcb.cpp:112 #: cvpcb/tool_cvpcb.cpp:112
msgid "&Load Netlist File" msgid "&Open"
msgstr "&Charger Fichiers Netliste:" msgstr "&Ouvrir "
#: cvpcb/tool_cvpcb.cpp:113
msgid "Load a Netlist"
msgstr "Lire Netliste"
#: cvpcb/tool_cvpcb.cpp:119 #: cvpcb/tool_cvpcb.cpp:119
msgid "&Save Netlist" msgid "&Save As..."
msgstr "&Sauver Netliste" msgstr "&Sauver Sous..."
#: cvpcb/tool_cvpcb.cpp:120 #: cvpcb/tool_cvpcb.cpp:120
msgid "Save New Netlist and Cmp file" msgid "Save New NetList and Components List files"
msgstr "Sauver netliste et cmp liste" msgstr "Sauver Novelles Netliste et Cmp Liste"
#: cvpcb/tool_cvpcb.cpp:125 #: cvpcb/tool_cvpcb.cpp:125
msgid "Quit Cvpcb" msgid "Quit Cvpcb"
...@@ -8186,7 +8190,7 @@ msgid "You must choose a PDF viewer before use this option" ...@@ -8186,7 +8190,7 @@ msgid "You must choose a PDF viewer before use this option"
msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option" msgstr "Vous devez choisir un Visualisateur PDF avant d'utiliser cette option"
#: kicad/preferences.cpp:97 #: kicad/preferences.cpp:97
#: common/gestfich.cpp:628 #: common/gestfich.cpp:616
msgid "Prefered Editor:" msgid "Prefered Editor:"
msgstr "Editeur prfr:" msgstr "Editeur prfr:"
...@@ -8945,59 +8949,128 @@ msgstr "X" ...@@ -8945,59 +8949,128 @@ msgstr "X"
msgid "Y" msgid "Y"
msgstr "Y" msgstr "Y"
#: common/gestfich.cpp:622 #: common/hotkeys_basic.cpp:301
msgid "No default editor found, you must choose it" msgid ""
msgstr "Pas d'diteur par dfaut trouv, vous devez en choisir un" "Current hotkey list:\n"
"\n"
msgstr ""
"Liste des Hotkeys courantes:\n"
"\n"
#: common/hotkeys_basic.cpp:309
msgid "key "
msgstr "touche: "
#: common/edaappl.cpp:487 #: common/hotkeys_basic.cpp:366
#: common/hotkeys_basic.cpp:484
msgid "Hotkey configuration file:"
msgstr "Fichier configuration des Hotkeys:"
#: common/hotkeys_basic.cpp:398
msgid "Allowed keys:\n"
msgstr "Touches autorises:\n"
#: common/hotkeys_basic.cpp:503
msgid "Unable to read "
msgstr "Impossible de lire "
#: common/hotkeys_basic.cpp:610
msgid "Create Hotkey config file"
msgstr "Crer le fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:611
msgid "Create or Recreate the hotkey config file from current hotkey list"
msgstr "Crer ou recrer les fichiers configuration des Hotkeys a partir de la liste courante"
#: common/hotkeys_basic.cpp:616
msgid "Reread Hotkey config file"
msgstr "Relire les fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:617
msgid "Reread the hotkey config file"
msgstr "Relire les fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:621
msgid "Edit Hotkey config file"
msgstr "Editer le fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:622
msgid "Run the text editor and edit the hotkey config file"
msgstr "Lancer l'diteur de texte et diter le fichier de config des hotkeys"
#: common/hotkeys_basic.cpp:628
msgid "home directory"
msgstr "Rpertoire d'accueil (home)"
#: common/hotkeys_basic.cpp:629
msgid "Use home directory to load or store Hotkey config files"
msgstr "Utiliser le rpertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys"
#: common/hotkeys_basic.cpp:634
msgid "kicad/template directory"
msgstr "kicad/template directory"
#: common/hotkeys_basic.cpp:635
msgid "Use kicad/template directory to load or store Hotkey config files"
msgstr "Utiliser rpertoire kicad/template pour charger ou sauver les fichiers de config des Hotkeys"
#: common/hotkeys_basic.cpp:641
msgid "Hotkey config location"
msgstr "Emplacement des Fichiers des Hotkeys"
#: common/hotkeys_basic.cpp:643
msgid "Hotkey config file location selection (home directory or kicad tree)"
msgstr "Selection emplacement des fichiers de config. des hotkeys(\"home\" ou rpertoire kicad)"
#: common/edaappl.cpp:498
msgid "Default" msgid "Default"
msgstr "Defaut" msgstr "Defaut"
#: common/edaappl.cpp:497 #: common/edaappl.cpp:508
msgid "French" msgid "French"
msgstr "French" msgstr "French"
#: common/edaappl.cpp:502 #: common/edaappl.cpp:513
msgid "Spanish" msgid "Spanish"
msgstr "Espagnol" msgstr "Espagnol"
#: common/edaappl.cpp:507 #: common/edaappl.cpp:518
msgid "Portuguese" msgid "Portuguese"
msgstr "Portugais" msgstr "Portugais"
#: common/edaappl.cpp:513 #: common/edaappl.cpp:524
msgid "Italian" msgid "Italian"
msgstr "Italien" msgstr "Italien"
#: common/edaappl.cpp:518 #: common/edaappl.cpp:529
msgid "German" msgid "German"
msgstr "Allemand" msgstr "Allemand"
#: common/edaappl.cpp:523 #: common/edaappl.cpp:534
msgid "Slovenian" msgid "Slovenian"
msgstr "Slovne" msgstr "Slovne"
#: common/edaappl.cpp:528 #: common/edaappl.cpp:539
msgid "Hungarian" msgid "Hungarian"
msgstr "Hongrois" msgstr "Hongrois"
#: common/edaappl.cpp:533 #: common/edaappl.cpp:544
msgid "Polish" msgid "Polish"
msgstr "Polonais" msgstr "Polonais"
#: common/edaappl.cpp:538 #: common/edaappl.cpp:549
msgid "Russian" msgid "Russian"
msgstr "Russe" msgstr "Russe"
#: common/edaappl.cpp:543 #: common/edaappl.cpp:554
msgid "Korean" msgid "Korean"
msgstr "Coren" msgstr "Coren"
#: common/edaappl.cpp:548 #: common/edaappl.cpp:559
msgid "Catalan" msgid "Catalan"
msgstr "Catalan" msgstr "Catalan"
#: common/edaappl.cpp:625 #: common/edaappl.cpp:636
msgid "Language" msgid "Language"
msgstr "Langage" msgstr "Langage"
...@@ -9195,6 +9268,10 @@ msgstr "Contour Pcb" ...@@ -9195,6 +9268,10 @@ msgstr "Contour Pcb"
msgid "--- " msgid "--- "
msgstr "--- " msgstr "--- "
#: common/gestfich.cpp:610
msgid "No default editor found, you must choose it"
msgstr "Pas d'diteur par dfaut trouv, vous devez en choisir un"
#: common/block_commande.cpp:56 #: common/block_commande.cpp:56
msgid "Block Move" msgid "Block Move"
msgstr "Move Bloc" msgstr "Move Bloc"
...@@ -9235,79 +9312,6 @@ msgstr "Inversion Bloc" ...@@ -9235,79 +9312,6 @@ msgstr "Inversion Bloc"
msgid "Block Mirror" msgid "Block Mirror"
msgstr "Bloc Miroir" msgstr "Bloc Miroir"
#: common/hotkeys_basic.cpp:301
msgid ""
"Current hotkey list:\n"
"\n"
msgstr ""
"Liste des Hotkeys courantes:\n"
"\n"
#: common/hotkeys_basic.cpp:309
msgid "key "
msgstr "touche: "
#: common/hotkeys_basic.cpp:366
#: common/hotkeys_basic.cpp:484
msgid "Hotkey configuration file:"
msgstr "Fichier configuration des Hotkeys:"
#: common/hotkeys_basic.cpp:398
msgid "Allowed keys:\n"
msgstr "Touches autorises:\n"
#: common/hotkeys_basic.cpp:503
msgid "Unable to read "
msgstr "Impossible de lire "
#: common/hotkeys_basic.cpp:610
msgid "Create Hotkey config file"
msgstr "Crer le fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:611
msgid "Create or Recreate the hotkey config file from current hotkey list"
msgstr "Crer ou recrer les fichiers configuration des Hotkeys a partir de la liste courante"
#: common/hotkeys_basic.cpp:616
msgid "Reread Hotkey config file"
msgstr "Relire les fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:617
msgid "Reread the hotkey config file"
msgstr "Relire les fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:621
msgid "Edit Hotkey config file"
msgstr "Editer le fichiers configuration des Hotkeys"
#: common/hotkeys_basic.cpp:622
msgid "Run the text editor and edit the hotkey config file"
msgstr "Lancer l'diteur de texte et diter le fichier de config des hotkeys"
#: common/hotkeys_basic.cpp:628
msgid "home directory"
msgstr "Rpertoire d'accueil (home)"
#: common/hotkeys_basic.cpp:629
msgid "Use home directory to load or store Hotkey config files"
msgstr "Utiliser le rpertoire d'accueil pour charger ou sauver les fichiers de config des Hotkeys"
#: common/hotkeys_basic.cpp:634
msgid "kicad/template directory"
msgstr "kicad/template directory"
#: common/hotkeys_basic.cpp:635
msgid "Use kicad/templatedirectory to load or store Hotkey config files"
msgstr "Utiliser kicad/templatedirectory pour charger ou sauver les fichiers de config des Hotkeys"
#: common/hotkeys_basic.cpp:641
msgid "Hotkey config location"
msgstr "Emplacement des Fichiers des Hotkeys"
#: common/hotkeys_basic.cpp:643
msgid "Hotkey config file location selection (home directory or kicad tree)"
msgstr "Selection emplacement des fichiers de config. des hotkeys(\"home\" ou rpertoire kicad)"
#: common/get_component_dialog.cpp:105 #: common/get_component_dialog.cpp:105
msgid "History list:" msgid "History list:"
msgstr "Historique:" msgstr "Historique:"
...@@ -9330,12 +9334,12 @@ msgid "Help file %s not found" ...@@ -9330,12 +9334,12 @@ msgid "Help file %s not found"
msgstr "Fichier d'aide %s non trouv" msgstr "Fichier d'aide %s non trouv"
#: 3d-viewer/3d_canvas.cpp:318 #: 3d-viewer/3d_canvas.cpp:318
#: share/zoom.cpp:361 #: share/zoom.cpp:357
msgid "Zoom +" msgid "Zoom +"
msgstr "Zoom +" msgstr "Zoom +"
#: 3d-viewer/3d_canvas.cpp:323 #: 3d-viewer/3d_canvas.cpp:323
#: share/zoom.cpp:362 #: share/zoom.cpp:358
msgid "Zoom -" msgid "Zoom -"
msgstr "Zoom -" msgstr "Zoom -"
...@@ -9499,27 +9503,27 @@ msgstr "Pre&visualisation" ...@@ -9499,27 +9503,27 @@ msgstr "Pre&visualisation"
msgid "&Print" msgid "&Print"
msgstr "Imp&rimer" msgstr "Imp&rimer"
#: share/zoom.cpp:326 #: share/zoom.cpp:322
msgid "Zoom: " msgid "Zoom: "
msgstr "Zoom: " msgstr "Zoom: "
#: share/zoom.cpp:327 #: share/zoom.cpp:323
msgid "Grid: " msgid "Grid: "
msgstr "Grille: " msgstr "Grille: "
#: share/zoom.cpp:366 #: share/zoom.cpp:362
msgid "Zoom Select" msgid "Zoom Select"
msgstr "Slection Zoom" msgstr "Slection Zoom"
#: share/zoom.cpp:369 #: share/zoom.cpp:365
msgid "Redraw" msgid "Redraw"
msgstr "Redessin" msgstr "Redessin"
#: share/zoom.cpp:385 #: share/zoom.cpp:381
msgid "Grid Select" msgid "Grid Select"
msgstr "Slection Grille" msgstr "Slection Grille"
#: share/zoom.cpp:407 #: share/zoom.cpp:403
msgid "grid user" msgid "grid user"
msgstr "grille user" msgstr "grille user"
......
pcbnew/class_board_item.cpp
View file @ e704c625
...@@ -25,7 +25,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const ...@@ -25,7 +25,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
* @param aPcb = the parent board * @param aPcb = the parent board
*/ */
{ {
wxString text; wxString text, msg;
const BOARD_ITEM* item = this; const BOARD_ITEM* item = this;
EQUIPOT* net; EQUIPOT* net;
D_PAD * pad; D_PAD * pad;
...@@ -174,7 +174,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const ...@@ -174,7 +174,7 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
text << wxT(" ") << _( "Blind" ); text << wxT(" ") << _( "Blind" );
else if( shape == VIA_BLIND ) else if( shape == VIA_BLIND )
text << wxT(" ") << _("Buried"); text << wxT(" ") << _("Buried");
// else say nothing about normal vias // else say nothing about normal (through) vias
net = aPcb->FindNet( via->GetNet() ); net = aPcb->FindNet( via->GetNet() );
if( net ) if( net )
...@@ -203,9 +203,9 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const ...@@ -203,9 +203,9 @@ wxString BOARD_ITEM::MenuText( const BOARD* aPcb ) const
break; break;
case TYPEMIRE: case TYPEMIRE:
text << _( "Target" ) //<< wxT( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim() valeur_param( ((MIREPCB*)item)->m_Size, msg );
// could use if problem with decimal point and user units was fixed: text << _( "Target" ) << _( " on " ) << ReturnPcbLayerName( item->GetLayer() ).Trim()
// << wxT( " " ) << wxT( "size" ) << wxT( " " ) << ((MIREPCB*)item)->m_Size << wxT( " " ) << _( "size" ) << wxT( " " ) << msg
; ;
break; break;
......
pcbnew/class_pad.cpp
View file @ e704c625
...@@ -221,11 +221,10 @@ void D_PAD::UnLink() ...@@ -221,11 +221,10 @@ void D_PAD::UnLink()
void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int draw_mode ) void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int draw_mode )
/*******************************************************************************************/ /*******************************************************************************************/
/* Trac�a l'�ran d'un pad: /** Draw a pad:
* Entree : * @param DC = device context
* ptr_pad = pointeur sur le pad du module * @param offset = draw offset
* offset = offset de trace * @param draw_mode = mode: GR_OR, GR_XOR, GR_AND...
* draw_mode = mode de trace ( GR_OR, GR_XOR, GR_AND)
*/ */
{ {
int ii; int ii;
...@@ -239,20 +238,23 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int ...@@ -239,20 +238,23 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int
wxPoint coord[4]; wxPoint coord[4];
int zoom; int zoom;
int fillpad = 0; int fillpad = 0;
WinEDA_BasePcbFrame* frame; WinEDA_BasePcbFrame* frame = NULL;
wxPoint shape_pos; wxPoint shape_pos;
PCB_SCREEN* screen = panel ? PCB_SCREEN* screen = panel ?
(PCB_SCREEN*) panel->m_Parent->m_CurrentScreen : (PCB_SCREEN*) panel->m_Parent->m_CurrentScreen :
(PCB_SCREEN*) ActiveScreen; (PCB_SCREEN*) ActiveScreen;
// @todo: if panel could have been NULL above, how can we dereference it here safely? if ( panel ) // Use current frame setting
frame = (WinEDA_BasePcbFrame*) panel->m_Parent; {
frame = (WinEDA_BasePcbFrame*) panel->m_Parent;
/* Calcul de l'aspect du pad */ }
if( frame->m_DisplayPadFill == FILLED ) else // Use board frame setting
fillpad = 1; if( DisplayOpt.DisplayPadFill == FILLED )
fillpad = 1;
if( frame->m_DisplayPadFill == FILLED )
fillpad = 1;
zoom = screen->GetZoom(); zoom = screen->GetZoom();
#ifdef PCBNEW #ifdef PCBNEW
...@@ -334,7 +336,7 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int ...@@ -334,7 +336,7 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int
if( m_Attribut==SMD && DisplayOpt.ContrastModeDisplay ) if( m_Attribut==SMD && DisplayOpt.ContrastModeDisplay )
{ {
// when routing tracks // when routing tracks
if( frame->m_ID_current_state == ID_TRACK_BUTT ) if( frame && frame->m_ID_current_state == ID_TRACK_BUTT )
{ {
int routeTop = screen->m_Route_Layer_TOP; int routeTop = screen->m_Route_Layer_TOP;
int routeBot = screen->m_Route_Layer_BOTTOM; int routeBot = screen->m_Route_Layer_BOTTOM;
...@@ -592,8 +594,8 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int ...@@ -592,8 +594,8 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, int
cx0 - dx0, cy0 + dx0, 0, nc_color ); cx0 - dx0, cy0 + dx0, 0, nc_color );
} }
/* Trace de la reference */ /* Draw the pad number */
if( !frame->m_DisplayPadNum ) if( frame && !frame->m_DisplayPadNum )
return; return;
dx = MIN( m_Size.x, m_Size.y ); /* dx = text size */ dx = MIN( m_Size.x, m_Size.y ); /* dx = text size */
......
pcbnew/dialog_display_options.cpp
View file @ e704c625
...@@ -27,15 +27,11 @@ ...@@ -27,15 +27,11 @@
#include "dialog_display_options.h" #include "dialog_display_options.h"
/* Fonctions locales */
/* variables locales */
/*************************************************************************/ /*************************************************************************/
void WinEDA_DisplayOptionsDialog::AcceptPcbOptions(wxCommandEvent& event) void WinEDA_DisplayOptionsDialog::AcceptPcbOptions(wxCommandEvent& event)
/*************************************************************************/ /*************************************************************************/
/* Met a jour les options /* Update variables with new options
*/ */
{ {
if ( m_Show_Page_Limits->GetSelection() == 0 ) g_ShowPageLimits = TRUE; if ( m_Show_Page_Limits->GetSelection() == 0 ) g_ShowPageLimits = TRUE;
...@@ -159,12 +155,14 @@ bool WinEDA_DisplayOptionsDialog::Create( wxWindow* parent, wxWindowID id, const ...@@ -159,12 +155,14 @@ bool WinEDA_DisplayOptionsDialog::Create( wxWindow* parent, wxWindowID id, const
////@end WinEDA_DisplayOptionsDialog member initialisation ////@end WinEDA_DisplayOptionsDialog member initialisation
////@begin WinEDA_DisplayOptionsDialog creation ////@begin WinEDA_DisplayOptionsDialog creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style ); wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls(); CreateControls();
GetSizer()->Fit(this); if (GetSizer())
GetSizer()->SetSizeHints(this); {
GetSizer()->SetSizeHints(this);
}
Centre(); Centre();
////@end WinEDA_DisplayOptionsDialog creation ////@end WinEDA_DisplayOptionsDialog creation
return true; return true;
...@@ -178,7 +176,7 @@ void WinEDA_DisplayOptionsDialog::CreateControls() ...@@ -178,7 +176,7 @@ void WinEDA_DisplayOptionsDialog::CreateControls()
{ {
SetFont(*g_DialogFont); SetFont(*g_DialogFont);
////@begin WinEDA_DisplayOptionsDialog content construction ////@begin WinEDA_DisplayOptionsDialog content construction
// Generated by DialogBlocks, 26/02/2006 15:47:05 (unregistered) // Generated by DialogBlocks, 29/10/2007 15:06:02 (unregistered)
WinEDA_DisplayOptionsDialog* itemDialog1 = this; WinEDA_DisplayOptionsDialog* itemDialog1 = this;
...@@ -189,27 +187,27 @@ void WinEDA_DisplayOptionsDialog::CreateControls() ...@@ -189,27 +187,27 @@ void WinEDA_DisplayOptionsDialog::CreateControls()
wxStaticBoxSizer* itemStaticBoxSizer3 = new wxStaticBoxSizer(itemStaticBoxSizer3Static, wxVERTICAL); wxStaticBoxSizer* itemStaticBoxSizer3 = new wxStaticBoxSizer(itemStaticBoxSizer3Static, wxVERTICAL);
itemBoxSizer2->Add(itemStaticBoxSizer3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer2->Add(itemStaticBoxSizer3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxString m_OptDisplayTracksStrings[] = { wxArrayString m_OptDisplayTracksStrings;
_("Sketch"), m_OptDisplayTracksStrings.Add(_("Sketch"));
_("Filled") m_OptDisplayTracksStrings.Add(_("Filled"));
}; m_OptDisplayTracks = new wxRadioBox( itemDialog1, ID_RADIOBOX_OPT_TRACK, _("Tracks:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayTracks = new wxRadioBox( itemDialog1, ID_RADIOBOX_OPT_TRACK, _("Tracks:"), wxDefaultPosition, wxDefaultSize, 2, m_OptDisplayTracksStrings, 1, wxRA_SPECIFY_COLS ); m_OptDisplayTracks->SetSelection(0);
itemStaticBoxSizer3->Add(m_OptDisplayTracks, 0, wxGROW|wxALL, 5); itemStaticBoxSizer3->Add(m_OptDisplayTracks, 0, wxGROW|wxALL, 5);
wxString m_OptDisplayTracksClearanceStrings[] = { wxArrayString m_OptDisplayTracksClearanceStrings;
_("Always"), m_OptDisplayTracksClearanceStrings.Add(_("Always"));
_("New track"), m_OptDisplayTracksClearanceStrings.Add(_("New track"));
_("Never") m_OptDisplayTracksClearanceStrings.Add(_("Never"));
}; m_OptDisplayTracksClearance = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOWCLR, _("Show Track Clearance"), wxDefaultPosition, wxDefaultSize, m_OptDisplayTracksClearanceStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayTracksClearance = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOWCLR, _("Show Track Clearance"), wxDefaultPosition, wxDefaultSize, 3, m_OptDisplayTracksClearanceStrings, 1, wxRA_SPECIFY_COLS ); m_OptDisplayTracksClearance->SetSelection(0);
itemStaticBoxSizer3->Add(m_OptDisplayTracksClearance, 0, wxGROW|wxALL, 5); itemStaticBoxSizer3->Add(m_OptDisplayTracksClearance, 0, wxGROW|wxALL, 5);
wxString m_OptDisplayViaHoleStrings[] = { wxArrayString m_OptDisplayViaHoleStrings;
_("Never"), m_OptDisplayViaHoleStrings.Add(_("Never"));
_("defined holes"), m_OptDisplayViaHoleStrings.Add(_("defined holes"));
_("Always") m_OptDisplayViaHoleStrings.Add(_("Always"));
}; m_OptDisplayViaHole = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOW_VIAS, _("Show Via Holes"), wxDefaultPosition, wxDefaultSize, m_OptDisplayViaHoleStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayViaHole = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOW_VIAS, _("Show Via Holes"), wxDefaultPosition, wxDefaultSize, 3, m_OptDisplayViaHoleStrings, 1, wxRA_SPECIFY_COLS ); m_OptDisplayViaHole->SetSelection(0);
itemStaticBoxSizer3->Add(m_OptDisplayViaHole, 0, wxGROW|wxALL, 5); itemStaticBoxSizer3->Add(m_OptDisplayViaHole, 0, wxGROW|wxALL, 5);
wxStaticBox* itemStaticBoxSizer7Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Modules")); wxStaticBox* itemStaticBoxSizer7Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Modules"));
...@@ -219,71 +217,75 @@ void WinEDA_DisplayOptionsDialog::CreateControls() ...@@ -219,71 +217,75 @@ void WinEDA_DisplayOptionsDialog::CreateControls()
wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL);
itemStaticBoxSizer7->Add(itemBoxSizer8, 0, wxGROW|wxALL, 5); itemStaticBoxSizer7->Add(itemBoxSizer8, 0, wxGROW|wxALL, 5);
wxString m_OptDisplayModTextsStrings[] = { wxArrayString m_OptDisplayModTextsStrings;
_("Line"), m_OptDisplayModTextsStrings.Add(_("Line"));
_("Filled"), m_OptDisplayModTextsStrings.Add(_("Filled"));
_("Sketch") m_OptDisplayModTextsStrings.Add(_("Sketch"));
}; m_OptDisplayModTexts = new wxRadioBox( itemDialog1, ID_RADIOBOX_MODTXT, _("Module Texts"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModTextsStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayModTexts = new wxRadioBox( itemDialog1, ID_RADIOBOX_MODTXT, _("Module Texts"), wxDefaultPosition, wxDefaultSize, 3, m_OptDisplayModTextsStrings, 1, wxRA_SPECIFY_COLS ); m_OptDisplayModTexts->SetSelection(0);
itemBoxSizer8->Add(m_OptDisplayModTexts, 0, wxGROW|wxALL, 5); itemBoxSizer8->Add(m_OptDisplayModTexts, 0, wxGROW|wxALL, 5);
wxString m_OptDisplayModEdgesStrings[] = { wxArrayString m_OptDisplayModEdgesStrings;
_("Line"), m_OptDisplayModEdgesStrings.Add(_("Line"));
_("Filled"), m_OptDisplayModEdgesStrings.Add(_("Filled"));
_("Sketch") m_OptDisplayModEdgesStrings.Add(_("Sketch"));
}; m_OptDisplayModEdges = new wxRadioBox( itemDialog1, ID_RADIOBOX_MOD_EDGES, _("Module Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayModEdges = new wxRadioBox( itemDialog1, ID_RADIOBOX_MOD_EDGES, _("Module Edges:"), wxDefaultPosition, wxDefaultSize, 3, m_OptDisplayModEdgesStrings, 1, wxRA_SPECIFY_COLS ); m_OptDisplayModEdges->SetSelection(0);
itemBoxSizer8->Add(m_OptDisplayModEdges, 0, wxGROW|wxALL, 5); itemBoxSizer8->Add(m_OptDisplayModEdges, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL);
itemStaticBoxSizer7->Add(itemBoxSizer11, 0, wxGROW|wxALL, 5); itemStaticBoxSizer7->Add(itemBoxSizer11, 0, wxGROW|wxALL, 5);
wxString m_OptDisplayPadsStrings[] = { wxStaticBox* itemStaticBoxSizer12Static = new wxStaticBox(itemDialog1, wxID_ANY, _("Pad Options:"));
_("Sketch"), wxStaticBoxSizer* itemStaticBoxSizer12 = new wxStaticBoxSizer(itemStaticBoxSizer12Static, wxVERTICAL);
_("Filled") itemBoxSizer11->Add(itemStaticBoxSizer12, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
};
m_OptDisplayPads = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOWPADS, _("Pads:"), wxDefaultPosition, wxDefaultSize, 2, m_OptDisplayPadsStrings, 1, wxRA_SPECIFY_COLS ); wxArrayString m_OptDisplayPadsStrings;
itemBoxSizer11->Add(m_OptDisplayPads, 0, wxGROW|wxALL, 5); m_OptDisplayPadsStrings.Add(_("Sketch"));
m_OptDisplayPadsStrings.Add(_("Filled"));
m_OptDisplayPads = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOWPADS, _("Pad Shapes:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayPadsStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayPads->SetSelection(0);
itemStaticBoxSizer12->Add(m_OptDisplayPads, 0, wxGROW|wxALL, 5);
m_OptDisplayPadClearence = new wxCheckBox( itemDialog1, ID_CHECKBOX_PAD_CLR, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_OptDisplayPadClearence = new wxCheckBox( itemDialog1, ID_CHECKBOX_PAD_CLR, _("Show Pad Clearance"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_OptDisplayPadClearence->SetValue(false); m_OptDisplayPadClearence->SetValue(false);
itemBoxSizer11->Add(m_OptDisplayPadClearence, 0, wxGROW|wxALL, 5); itemStaticBoxSizer12->Add(m_OptDisplayPadClearence, 0, wxGROW|wxALL, 5);
m_OptDisplayPadNumber = new wxCheckBox( itemDialog1, ID_CHECKBOX_PADNUM, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_OptDisplayPadNumber = new wxCheckBox( itemDialog1, ID_CHECKBOX_PADNUM, _("Show Pad Number"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_OptDisplayPadNumber->SetValue(false); m_OptDisplayPadNumber->SetValue(false);
itemBoxSizer11->Add(m_OptDisplayPadNumber, 0, wxGROW|wxALL, 5); itemStaticBoxSizer12->Add(m_OptDisplayPadNumber, 0, wxGROW|wxALL, 5);
m_OptDisplayPadNoConn = new wxCheckBox( itemDialog1, ID_CHECKBOX_PADNC, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); m_OptDisplayPadNoConn = new wxCheckBox( itemDialog1, ID_CHECKBOX_PADNC, _("Show Pad NoConnect"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
m_OptDisplayPadNoConn->SetValue(false); m_OptDisplayPadNoConn->SetValue(false);
itemBoxSizer11->Add(m_OptDisplayPadNoConn, 0, wxGROW|wxALL, 5); itemStaticBoxSizer12->Add(m_OptDisplayPadNoConn, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer16 = new wxBoxSizer(wxVERTICAL); wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer2->Add(itemBoxSizer16, 0, wxGROW|wxALL, 5); itemBoxSizer2->Add(itemBoxSizer17, 1, wxGROW|wxALL, 5);
wxString m_OptDisplayDrawingsStrings[] = { wxArrayString m_OptDisplayDrawingsStrings;
_("Line"), m_OptDisplayDrawingsStrings.Add(_("Line"));
_("Filled"), m_OptDisplayDrawingsStrings.Add(_("Filled"));
_("Sketch") m_OptDisplayDrawingsStrings.Add(_("Sketch"));
}; m_OptDisplayDrawings = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOW_OTHERS, _("Display other items:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayDrawingsStrings, 1, wxRA_SPECIFY_COLS );
m_OptDisplayDrawings = new wxRadioBox( itemDialog1, ID_RADIOBOX_SHOW_OTHERS, _("Display other items:"), wxDefaultPosition, wxDefaultSize, 3, m_OptDisplayDrawingsStrings, 1, wxRA_SPECIFY_COLS ); m_OptDisplayDrawings->SetSelection(0);
itemBoxSizer16->Add(m_OptDisplayDrawings, 0, wxGROW|wxALL, 5); itemBoxSizer17->Add(m_OptDisplayDrawings, 0, wxGROW|wxALL, 5);
wxString m_Show_Page_LimitsStrings[] = { wxArrayString m_Show_Page_LimitsStrings;
_("Yes"), m_Show_Page_LimitsStrings.Add(_("Yes"));
_("No") m_Show_Page_LimitsStrings.Add(_("No"));
}; m_Show_Page_Limits = new wxRadioBox( itemDialog1, ID_RADIOBOX_PAGE_LIMITS, _("Show page limits"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsStrings, 1, wxRA_SPECIFY_COLS );
m_Show_Page_Limits = new wxRadioBox( itemDialog1, ID_RADIOBOX_PAGE_LIMITS, _("Show page limits"), wxDefaultPosition, wxDefaultSize, 2, m_Show_Page_LimitsStrings, 1, wxRA_SPECIFY_COLS ); m_Show_Page_Limits->SetSelection(0);
itemBoxSizer16->Add(m_Show_Page_Limits, 0, wxGROW|wxALL, 5); itemBoxSizer17->Add(m_Show_Page_Limits, 0, wxGROW|wxALL, 5);
itemBoxSizer16->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); itemBoxSizer17->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxButton* itemButton20 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButton21 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton20->SetForegroundColour(wxColour(202, 0, 0)); itemButton21->SetForegroundColour(wxColour(202, 0, 0));
itemBoxSizer16->Add(itemButton20, 0, wxGROW|wxALL, 5); itemBoxSizer17->Add(itemButton21, 0, wxGROW|wxALL, 5);
wxButton* itemButton21 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButton22 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton21->SetForegroundColour(wxColour(0, 0, 255)); itemButton22->SetForegroundColour(wxColour(0, 0, 255));
itemBoxSizer16->Add(itemButton21, 0, wxGROW|wxALL, 5); itemBoxSizer17->Add(itemButton22, 0, wxGROW|wxALL, 5);
// Set validators // Set validators
m_OptDisplayViaHole->SetValidator( wxGenericValidator(& DisplayOpt.m_DisplayViaMode) ); m_OptDisplayViaHole->SetValidator( wxGenericValidator(& DisplayOpt.m_DisplayViaMode) );
...@@ -352,3 +354,5 @@ void WinEDA_DisplayOptionsDialog::OnCancelClick( wxCommandEvent& event ) ...@@ -352,3 +354,5 @@ void WinEDA_DisplayOptionsDialog::OnCancelClick( wxCommandEvent& event )
} }
pcbnew/dialog_display_options.h
View file @ e704c625
...@@ -39,11 +39,6 @@ ...@@ -39,11 +39,6 @@
////@begin control identifiers ////@begin control identifiers
#define ID_DIALOG 10000 #define ID_DIALOG 10000
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_TITLE _("Display Options")
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_POSITION wxDefaultPosition
#define ID_RADIOBOX_OPT_TRACK 10001 #define ID_RADIOBOX_OPT_TRACK 10001
#define ID_RADIOBOX_SHOWCLR 10002 #define ID_RADIOBOX_SHOWCLR 10002
#define ID_RADIOBOX_SHOW_VIAS 10003 #define ID_RADIOBOX_SHOW_VIAS 10003
...@@ -55,6 +50,11 @@ ...@@ -55,6 +50,11 @@
#define ID_CHECKBOX_PADNC 10010 #define ID_CHECKBOX_PADNC 10010
#define ID_RADIOBOX_SHOW_OTHERS 10011 #define ID_RADIOBOX_SHOW_OTHERS 10011
#define ID_RADIOBOX_PAGE_LIMITS 10006 #define ID_RADIOBOX_PAGE_LIMITS 10006
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_TITLE _("Display Options")
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_IDNAME ID_DIALOG
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_SIZE wxSize(400, 300)
#define SYMBOL_WINEDA_DISPLAYOPTIONSDIALOG_POSITION wxDefaultPosition
////@end control identifiers ////@end control identifiers
/*! /*!
......
pcbnew/dialog_display_options.pjd
View file @ e704c625
<?xml version="1.0" encoding="windows-1252"?> <?xml version="1.0" encoding="UTF-8"?>
<anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk"> <anthemion-project version="1.0.0.0" xmlns="http://www.anthemion.co.uk">
<header> <header>
<long name="name_counter">0</long> <long name="name_counter">0</long>
...@@ -6,18 +6,20 @@ ...@@ -6,18 +6,20 @@
<string name="title">""</string> <string name="title">""</string>
<string name="author">""</string> <string name="author">""</string>
<string name="description">""</string> <string name="description">""</string>
<long name="doc_count">28</long>
<string name="xrc_filename">""</string> <string name="xrc_filename">""</string>
<bool name="convert_images_to_xpm">0</bool> <bool name="convert_images_to_xpm">0</bool>
<bool name="inline_images">0</bool> <bool name="inline_images">0</bool>
<bool name="generate_cpp_for_xrc">0</bool> <bool name="generate_cpp_for_xrc">0</bool>
<long name="working_mode">1</long>
<bool name="use_help_text_for_tooltips">1</bool> <bool name="use_help_text_for_tooltips">1</bool>
<bool name="translate_strings">1</bool> <bool name="translate_strings">1</bool>
<bool name="make_unicode_strings">1</bool>
<bool name="extract_strings">0</bool> <bool name="extract_strings">0</bool>
<string name="user_name">"jean-pierre Charras"</string> <string name="user_name">"jean-pierre Charras"</string>
<string name="copyright_string">"License GNU"</string> <string name="copyright_string">"License GNU"</string>
<string name="resource_prefix">""</string> <string name="resource_prefix">""</string>
<bool name="use_two_step_construction">0</bool> <bool name="use_two_step_construction">0</bool>
<bool name="use_enums">0</bool>
<string name="current_platform">"&lt;All platforms&gt;"</string> <string name="current_platform">"&lt;All platforms&gt;"</string>
<string name="target_wx_version">"&lt;Any&gt;"</string> <string name="target_wx_version">"&lt;Any&gt;"</string>
<string name="cpp_header_comment">"///////////////////////////////////////////////////////////////////////////// <string name="cpp_header_comment">"/////////////////////////////////////////////////////////////////////////////
...@@ -43,12 +45,6 @@ ...@@ -43,12 +45,6 @@
// Licence: // Licence:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
"</string>
<string name="cpp_function_comment">"
/*!
* %BODY%
*/
"</string> "</string>
<string name="cpp_symbols_file_comment">"///////////////////////////////////////////////////////////////////////////// <string name="cpp_symbols_file_comment">"/////////////////////////////////////////////////////////////////////////////
// Name: %SYMBOLS-FILENAME% // Name: %SYMBOLS-FILENAME%
...@@ -82,6 +78,14 @@ ...@@ -82,6 +78,14 @@
#include &quot;wx/wx.h&quot; #include &quot;wx/wx.h&quot;
#endif #endif
"</string>
<string name="cpp_function_declaration_comment">" /// %BODY%
"</string>
<string name="cpp_function_implementation_comment">"
/*!
* %BODY%
*/
"</string> "</string>
<string name="resource_file_header">"app_resources.h"</string> <string name="resource_file_header">"app_resources.h"</string>
<string name="resource_file_implementation">"app_resources.cpp"</string> <string name="resource_file_implementation">"app_resources.cpp"</string>
...@@ -93,11 +97,22 @@ ...@@ -93,11 +97,22 @@
<string name="external_symbol_filenames">""</string> <string name="external_symbol_filenames">""</string>
<string name="configuration">"&lt;None&gt;"</string> <string name="configuration">"&lt;None&gt;"</string>
<string name="source_encoding">"&lt;System&gt;"</string> <string name="source_encoding">"&lt;System&gt;"</string>
<string name="xrc_encoding">"utf-8"</string>
<string name="project_encoding">"&lt;System&gt;"</string> <string name="project_encoding">"&lt;System&gt;"</string>
<string name="resource_archive">""</string> <string name="resource_archive">""</string>
<long name="text_file_type">0</long>
<bool name="use_tabs">0</bool>
<long name="indent_size">4</long>
<string name="whitespace_after_return_type">" "</string>
<string name="resource_xrc_cpp">""</string>
<bool name="use_resource_archive">0</bool> <bool name="use_resource_archive">0</bool>
<bool name="use_generated_xrc_cpp">0</bool>
<bool name="always_generate_xrc">1</bool>
<bool name="archive_xrc_files">1</bool> <bool name="archive_xrc_files">1</bool>
<bool name="archive_image_files">1</bool> <bool name="archive_image_files">1</bool>
<bool name="archive_all_image_files">0</bool>
<bool name="xrc_retain_relative_paths">1</bool>
<bool name="xrc_generate_id_tags">0</bool>
</header> </header>
<data> <data>
<document> <document>
...@@ -174,7 +189,7 @@ ...@@ -174,7 +189,7 @@
<long name="is-transient">1</long> <long name="is-transient">1</long>
<long name="owns-file">1</long> <long name="owns-file">1</long>
<long name="title-mode">0</long> <long name="title-mode">0</long>
<long name="locked">0</long> <long name="locked">1</long>
<document> <document>
<string name="title">"Windows"</string> <string name="title">"Windows"</string>
<string name="type">"html-document"</string> <string name="type">"html-document"</string>
...@@ -198,7 +213,10 @@ ...@@ -198,7 +213,10 @@
<long name="base-id">10000</long> <long name="base-id">10000</long>
<bool name="use-id-prefix">0</bool> <bool name="use-id-prefix">0</bool>
<string name="id-prefix">""</string> <string name="id-prefix">""</string>
<bool name="use-id-suffix">0</bool>
<string name="id-suffix">""</string>
<long name="use-xrc">0</long> <long name="use-xrc">0</long>
<long name="working-mode">0</long>
<string name="proxy-Id name">"ID_DIALOG"</string> <string name="proxy-Id name">"ID_DIALOG"</string>
<long name="proxy-Id value">10000</long> <long name="proxy-Id value">10000</long>
<string name="proxy-Class">"WinEDA_DisplayOptionsDialog"</string> <string name="proxy-Class">"WinEDA_DisplayOptionsDialog"</string>
...@@ -219,6 +237,13 @@ ...@@ -219,6 +237,13 @@
<bool name="proxy-Hidden">0</bool> <bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool> <bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Texture">""</string>
<string name="proxy-Texture style">"Tiled"</string>
<bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool> <bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
<bool name="proxy-wxCAPTION">1</bool> <bool name="proxy-wxCAPTION">1</bool>
<bool name="proxy-wxRESIZE_BORDER">0</bool> <bool name="proxy-wxRESIZE_BORDER">0</bool>
...@@ -237,7 +262,9 @@ ...@@ -237,7 +262,9 @@
<bool name="proxy-wxRAISED_BORDER">0</bool> <bool name="proxy-wxRAISED_BORDER">0</bool>
<bool name="proxy-wxSTATIC_BORDER">0</bool> <bool name="proxy-wxSTATIC_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxCLIP_CHILDREN ">0</bool> <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxCLIP_CHILDREN">0</bool>
<bool name="proxy-wxTAB_TRAVERSAL">0</bool> <bool name="proxy-wxTAB_TRAVERSAL">0</bool>
<bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool> <bool name="proxy-wxWS_EX_VALIDATE_RECURSIVELY">0</bool>
<bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool> <bool name="proxy-wxWS_EX_BLOCK_EVENTS">1</bool>
...@@ -249,6 +276,7 @@ ...@@ -249,6 +276,7 @@
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
<long name="proxy-Width">400</long> <long name="proxy-Width">400</long>
<long name="proxy-Height">300</long> <long name="proxy-Height">300</long>
<bool name="proxy-AUI manager">0</bool>
<string name="proxy-Event sources">""</string> <string name="proxy-Event sources">""</string>
<document> <document>
<string name="title">"wxBoxSizer H"</string> <string name="title">"wxBoxSizer H"</string>
...@@ -280,13 +308,14 @@ ...@@ -280,13 +308,14 @@
<string name="proxy-Id name">"wxID_ANY"</string> <string name="proxy-Id name">"wxID_ANY"</string>
<long name="proxy-Id value">-1</long> <long name="proxy-Id value">-1</long>
<string name="proxy-Label">"Tracks and vias"</string> <string name="proxy-Label">"Tracks and vias"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Sizer member variable name">""</string> <string name="proxy-Sizer member variable name">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string> <string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool> <bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool> <bool name="proxy-Enabled">1</bool>
<string name="proxy-Static box class">"wxStaticBox"</string>
<string name="proxy-Orientation">"Vertical"</string> <string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string> <string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Centre"</string> <string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long> <long name="proxy-Stretch factor">0</long>
...@@ -312,10 +341,18 @@ ...@@ -312,10 +341,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_OPT_TRACK"</string> <string name="proxy-Id name">"ID_RADIOBOX_OPT_TRACK"</string>
<long name="proxy-Id value">10001</long> <long name="proxy-Id value">10001</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayTracks"</string> <string name="proxy-Member variable name">"m_OptDisplayTracks"</string>
<string name="proxy-Label">"Tracks:"</string> <string name="proxy-Label">"Tracks:"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Sketch|Filled"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -326,10 +363,16 @@ ...@@ -326,10 +363,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string> <string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Sketch|Filled"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -362,10 +405,18 @@ ...@@ -362,10 +405,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_SHOWCLR"</string> <string name="proxy-Id name">"ID_RADIOBOX_SHOWCLR"</string>
<long name="proxy-Id value">10002</long> <long name="proxy-Id value">10002</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayTracksClearance"</string> <string name="proxy-Member variable name">"m_OptDisplayTracksClearance"</string>
<string name="proxy-Label">"Show Track Clearance"</string> <string name="proxy-Label">"Show Track Clearance"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Always|New track|Never"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -376,10 +427,16 @@ ...@@ -376,10 +427,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string> <string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Always|New track|Never"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -412,10 +469,18 @@ ...@@ -412,10 +469,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_SHOW_VIAS"</string> <string name="proxy-Id name">"ID_RADIOBOX_SHOW_VIAS"</string>
<long name="proxy-Id value">10003</long> <long name="proxy-Id value">10003</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayViaHole"</string> <string name="proxy-Member variable name">"m_OptDisplayViaHole"</string>
<string name="proxy-Label">"Show Via Holes"</string> <string name="proxy-Label">"Show Via Holes"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Never|defined holes|Always"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -426,10 +491,16 @@ ...@@ -426,10 +491,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">"DisplayOpt.m_DisplayViaMode"</string> <string name="proxy-Data variable">"DisplayOpt.m_DisplayViaMode"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Never|defined holes|Always"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -464,13 +535,14 @@ ...@@ -464,13 +535,14 @@
<string name="proxy-Id name">"wxID_ANY"</string> <string name="proxy-Id name">"wxID_ANY"</string>
<long name="proxy-Id value">-1</long> <long name="proxy-Id value">-1</long>
<string name="proxy-Label">"Modules"</string> <string name="proxy-Label">"Modules"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Sizer member variable name">""</string> <string name="proxy-Sizer member variable name">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string> <string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool> <bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool> <bool name="proxy-Enabled">1</bool>
<string name="proxy-Static box class">"wxStaticBox"</string>
<string name="proxy-Orientation">"Horizontal"</string> <string name="proxy-Orientation">"Horizontal"</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string> <string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Expand"</string> <string name="proxy-AlignV">"Expand"</string>
<long name="proxy-Stretch factor">0</long> <long name="proxy-Stretch factor">0</long>
...@@ -521,10 +593,18 @@ ...@@ -521,10 +593,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_MODTXT"</string> <string name="proxy-Id name">"ID_RADIOBOX_MODTXT"</string>
<long name="proxy-Id value">10004</long> <long name="proxy-Id value">10004</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayModTexts"</string> <string name="proxy-Member variable name">"m_OptDisplayModTexts"</string>
<string name="proxy-Label">"Module Texts"</string> <string name="proxy-Label">"Module Texts"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Line|Filled|Sketch"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -535,10 +615,16 @@ ...@@ -535,10 +615,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayModText"</string> <string name="proxy-Data variable">"DisplayOpt.DisplayModText"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Line|Filled|Sketch"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -571,10 +657,18 @@ ...@@ -571,10 +657,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_MOD_EDGES"</string> <string name="proxy-Id name">"ID_RADIOBOX_MOD_EDGES"</string>
<long name="proxy-Id value">10005</long> <long name="proxy-Id value">10005</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayModEdges"</string> <string name="proxy-Member variable name">"m_OptDisplayModEdges"</string>
<string name="proxy-Label">"Module Edges:"</string> <string name="proxy-Label">"Module Edges:"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Line|Filled|Sketch"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -585,10 +679,16 @@ ...@@ -585,10 +679,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayModEdge"</string> <string name="proxy-Data variable">"DisplayOpt.DisplayModEdge"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Line|Filled|Sketch"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -635,42 +735,28 @@ ...@@ -635,42 +735,28 @@
<bool name="proxy-wxFIXED_MINSIZE">0</bool> <bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<document> <document>
<string name="title">"wxRadioBox: ID_RADIOBOX_SHOWPADS"</string> <string name="title">"wxStaticBoxSizer V"</string>
<string name="type">"dialog-control-document"</string> <string name="type">"dialog-control-document"</string>
<string name="filename">""</string> <string name="filename">""</string>
<string name="icon-name">"radiobox"</string> <string name="icon-name">"sizer"</string>
<long name="is-transient">0</long> <long name="is-transient">0</long>
<long name="owns-file">1</long> <long name="owns-file">1</long>
<long name="title-mode">0</long> <long name="title-mode">0</long>
<long name="locked">0</long> <long name="locked">0</long>
<string name="created">"25/4/2006"</string> <string name="created">"29/10/2007"</string>
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbStaticBoxSizerProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_SHOWPADS"</string> <string name="proxy-Id name">"wxID_ANY"</string>
<long name="proxy-Id value">10007</long> <long name="proxy-Id value">-1</long>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Label">"Pad Options:"</string>
<string name="proxy-Member variable name">"m_OptDisplayPads"</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"Pads:"</string> <string name="proxy-Sizer member variable name">""</string>
<long name="proxy-Major dimension count">1</long>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string> <string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool> <bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool> <bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Static box class">"wxStaticBox"</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Orientation">"Vertical"</string>
<string name="proxy-Data validator">""</string> <string name="proxy-AlignH">"Centre"</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Sketch|Filled"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string> <string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long> <long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long> <long name="proxy-Border">5</long>
...@@ -681,161 +767,263 @@ ...@@ -681,161 +767,263 @@
<bool name="proxy-wxSHAPED">0</bool> <bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool> <bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool> <bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxCheckBox: ID_CHECKBOX_PAD_CLR"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"checkbox"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"25/4/2006"</string>
<string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="proxy-Id name">"ID_CHECKBOX_PAD_CLR"</string>
<long name="proxy-Id value">10008</long>
<string name="proxy-Class">"wxCheckBox"</string>
<string name="proxy-Member variable name">"m_OptDisplayPadClearence"</string>
<string name="proxy-Label">"Show Pad Clearance"</string>
<bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayPadIsol"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxALIGN_RIGHT">0</bool> <document>
<bool name="proxy-wxCHK_2STATE">1</bool> <string name="title">"wxRadioBox: ID_RADIOBOX_SHOWPADS"</string>
<bool name="proxy-wxCHK_3STATE">0</bool> <string name="type">"dialog-control-document"</string>
<bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool> <string name="filename">""</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <string name="icon-name">"radiobox"</string>
<string name="proxy-Custom styles">""</string> <long name="is-transient">0</long>
<long name="proxy-X">-1</long> <long name="owns-file">1</long>
<long name="proxy-Y">-1</long> <long name="title-mode">0</long>
<long name="proxy-Width">-1</long> <long name="locked">0</long>
<long name="proxy-Height">-1</long> <string name="created">"29/10/2007"</string>
<string name="proxy-AlignH">"Expand"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-AlignV">"Centre"</string> <string name="proxy-Id name">"ID_RADIOBOX_SHOWPADS"</string>
<long name="proxy-Stretch factor">0</long> <long name="proxy-Id value">10007</long>
<long name="proxy-Border">5</long> <string name="proxy-Name">""</string>
<bool name="proxy-wxLEFT">1</bool> <string name="proxy-Class">"wxRadioBox"</string>
<bool name="proxy-wxRIGHT">1</bool> <string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-wxTOP">1</bool> <bool name="proxy-External implementation">1</bool>
<bool name="proxy-wxBOTTOM">1</bool> <bool name="proxy-Separate files">0</bool>
<bool name="proxy-wxSHAPED">0</bool> <string name="proxy-Implementation filename">""</string>
<bool name="proxy-wxADJUST_MINSIZE">0</bool> <string name="proxy-Header filename">""</string>
<bool name="proxy-wxFIXED_MINSIZE">0</bool> <string name="proxy-Member variable name">"m_OptDisplayPads"</string>
<string name="proxy-Custom arguments">""</string> <string name="proxy-Label">"Pad Shapes:"</string>
<string name="proxy-Custom ctor arguments">""</string> <long name="proxy-Major dimension count">1</long>
</document> <string name="proxy-Items">"Sketch|Filled"</string>
<document> <long name="proxy-Initial value">0</long>
<string name="title">"wxCheckBox: ID_CHECKBOX_PADNUM"</string> <string name="proxy-Help text">""</string>
<string name="type">"dialog-control-document"</string> <string name="proxy-Tooltip text">""</string>
<string name="filename">""</string> <string name="proxy-Background colour">""</string>
<string name="icon-name">"checkbox"</string> <string name="proxy-Foreground colour">""</string>
<long name="is-transient">0</long> <string name="proxy-Font">""</string>
<long name="owns-file">1</long> <bool name="proxy-Hidden">0</bool>
<long name="title-mode">0</long> <bool name="proxy-Enabled">1</bool>
<long name="locked">0</long> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="created">"25/4/2006"</string> <string name="proxy-Data variable">""</string>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-Data validator">""</string>
<string name="proxy-Id name">"ID_CHECKBOX_PADNUM"</string> <string name="proxy-Data source">""</string>
<long name="proxy-Id value">10009</long> <string name="proxy-Data class name">""</string>
<string name="proxy-Class">"wxCheckBox"</string> <string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayPadNumber"</string> <string name="proxy-Data class header filename">""</string>
<string name="proxy-Label">"Show Pad Number"</string> <string name="proxy-Data class manager window">""</string>
<bool name="proxy-Initial value">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<string name="proxy-Help text">""</string> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Tooltip text">""</string> <bool name="proxy-wxWANTS_CHARS">0</bool>
<string name="proxy-Data variable">"DisplayOpt.DisplayPadNum"</string> <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Background colour">""</string> <string name="proxy-Custom styles">""</string>
<string name="proxy-Foreground colour">""</string> <long name="proxy-X">-1</long>
<string name="proxy-Font">""</string> <long name="proxy-Y">-1</long>
<bool name="proxy-Hidden">0</bool> <long name="proxy-Width">-1</long>
<bool name="proxy-Enabled">1</bool> <long name="proxy-Height">-1</long>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-AlignH">"Expand"</string>
<bool name="proxy-wxALIGN_RIGHT">0</bool> <string name="proxy-AlignV">"Centre"</string>
<bool name="proxy-wxCHK_2STATE">1</bool> <long name="proxy-Stretch factor">0</long>
<bool name="proxy-wxCHK_3STATE">0</bool> <long name="proxy-Border">5</long>
<bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool> <bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxRIGHT">1</bool>
<string name="proxy-Custom styles">""</string> <bool name="proxy-wxTOP">1</bool>
<long name="proxy-X">-1</long> <bool name="proxy-wxBOTTOM">1</bool>
<long name="proxy-Y">-1</long> <bool name="proxy-wxSHAPED">0</bool>
<long name="proxy-Width">-1</long> <bool name="proxy-wxADJUST_MINSIZE">0</bool>
<long name="proxy-Height">-1</long> <bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-AlignH">"Expand"</string> <string name="proxy-Custom arguments">""</string>
<string name="proxy-AlignV">"Centre"</string> <string name="proxy-Custom ctor arguments">""</string>
<long name="proxy-Stretch factor">0</long> </document>
<long name="proxy-Border">5</long> <document>
<bool name="proxy-wxLEFT">1</bool> <string name="title">"wxCheckBox: ID_CHECKBOX_PAD_CLR"</string>
<bool name="proxy-wxRIGHT">1</bool> <string name="type">"dialog-control-document"</string>
<bool name="proxy-wxTOP">1</bool> <string name="filename">""</string>
<bool name="proxy-wxBOTTOM">1</bool> <string name="icon-name">"checkbox"</string>
<bool name="proxy-wxSHAPED">0</bool> <long name="is-transient">0</long>
<bool name="proxy-wxADJUST_MINSIZE">0</bool> <long name="owns-file">1</long>
<bool name="proxy-wxFIXED_MINSIZE">0</bool> <long name="title-mode">0</long>
<string name="proxy-Custom arguments">""</string> <long name="locked">0</long>
<string name="proxy-Custom ctor arguments">""</string> <string name="created">"29/10/2007"</string>
</document> <string name="proxy-type">"wbCheckBoxProxy"</string>
<document> <string name="proxy-Id name">"ID_CHECKBOX_PAD_CLR"</string>
<string name="title">"wxCheckBox: ID_CHECKBOX_PADNC"</string> <long name="proxy-Id value">10008</long>
<string name="type">"dialog-control-document"</string> <string name="proxy-Name">""</string>
<string name="filename">""</string> <string name="proxy-Class">"wxCheckBox"</string>
<string name="icon-name">"checkbox"</string> <string name="proxy-Base class">"wxCheckBox"</string>
<long name="is-transient">0</long> <bool name="proxy-External implementation">1</bool>
<long name="owns-file">1</long> <bool name="proxy-Separate files">0</bool>
<long name="title-mode">0</long> <string name="proxy-Implementation filename">""</string>
<long name="locked">0</long> <string name="proxy-Header filename">""</string>
<string name="created">"25/4/2006"</string> <string name="proxy-Member variable name">"m_OptDisplayPadClearence"</string>
<string name="proxy-type">"wbCheckBoxProxy"</string> <string name="proxy-Label">"Show Pad Clearance"</string>
<string name="proxy-Id name">"ID_CHECKBOX_PADNC"</string> <bool name="proxy-Initial value">0</bool>
<long name="proxy-Id value">10010</long> <string name="proxy-Help text">""</string>
<string name="proxy-Class">"wxCheckBox"</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Member variable name">"m_OptDisplayPadNoConn"</string> <string name="proxy-Data variable">"DisplayOpt.DisplayPadIsol"</string>
<string name="proxy-Label">"Show Pad NoConnect"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<bool name="proxy-Initial value">0</bool> <string name="proxy-Data source">""</string>
<string name="proxy-Help text">""</string> <string name="proxy-Data class name">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayPadNoConn"</string> <string name="proxy-Data class header filename">""</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string> <string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string> <string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool> <bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool> <bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxALIGN_RIGHT">0</bool> <bool name="proxy-wxALIGN_RIGHT">0</bool>
<bool name="proxy-wxCHK_2STATE">1</bool> <bool name="proxy-wxCHK_2STATE">1</bool>
<bool name="proxy-wxCHK_3STATE">0</bool> <bool name="proxy-wxCHK_3STATE">0</bool>
<bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool> <bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<string name="proxy-Custom styles">""</string> <bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<long name="proxy-X">-1</long> <bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<long name="proxy-Y">-1</long> <string name="proxy-Custom styles">""</string>
<long name="proxy-Width">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Height">-1</long> <long name="proxy-Y">-1</long>
<string name="proxy-AlignH">"Expand"</string> <long name="proxy-Width">-1</long>
<string name="proxy-AlignV">"Centre"</string> <long name="proxy-Height">-1</long>
<long name="proxy-Stretch factor">0</long> <string name="proxy-AlignH">"Expand"</string>
<long name="proxy-Border">5</long> <string name="proxy-AlignV">"Centre"</string>
<bool name="proxy-wxLEFT">1</bool> <long name="proxy-Stretch factor">0</long>
<bool name="proxy-wxRIGHT">1</bool> <long name="proxy-Border">5</long>
<bool name="proxy-wxTOP">1</bool> <bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxBOTTOM">1</bool> <bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxSHAPED">0</bool> <bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool> <bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool> <bool name="proxy-wxSHAPED">0</bool>
<string name="proxy-Custom arguments">""</string> <bool name="proxy-wxADJUST_MINSIZE">0</bool>
<string name="proxy-Custom ctor arguments">""</string> <bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxCheckBox: ID_CHECKBOX_PADNUM"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"checkbox"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"29/10/2007"</string>
<string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="proxy-Id name">"ID_CHECKBOX_PADNUM"</string>
<long name="proxy-Id value">10009</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxCheckBox"</string>
<string name="proxy-Base class">"wxCheckBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayPadNumber"</string>
<string name="proxy-Label">"Show Pad Number"</string>
<bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayPadNum"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxALIGN_RIGHT">0</bool>
<bool name="proxy-wxCHK_2STATE">1</bool>
<bool name="proxy-wxCHK_3STATE">0</bool>
<bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxCheckBox: ID_CHECKBOX_PADNC"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"checkbox"</string>
<long name="is-transient">0</long>
<long name="owns-file">1</long>
<long name="title-mode">0</long>
<long name="locked">0</long>
<string name="created">"29/10/2007"</string>
<string name="proxy-type">"wbCheckBoxProxy"</string>
<string name="proxy-Id name">"ID_CHECKBOX_PADNC"</string>
<long name="proxy-Id value">10010</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxCheckBox"</string>
<string name="proxy-Base class">"wxCheckBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayPadNoConn"</string>
<string name="proxy-Label">"Show Pad NoConnect"</string>
<bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayPadNoConn"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxALIGN_RIGHT">0</bool>
<bool name="proxy-wxCHK_2STATE">1</bool>
<bool name="proxy-wxCHK_3STATE">0</bool>
<bool name="proxy-wxCHK_ALLOW_3RD_STATE_FOR_USER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long>
<long name="proxy-Width">-1</long>
<long name="proxy-Height">-1</long>
<string name="proxy-AlignH">"Expand"</string>
<string name="proxy-AlignV">"Centre"</string>
<long name="proxy-Stretch factor">0</long>
<long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool>
<bool name="proxy-wxTOP">1</bool>
<bool name="proxy-wxBOTTOM">1</bool>
<bool name="proxy-wxSHAPED">0</bool>
<bool name="proxy-wxADJUST_MINSIZE">0</bool>
<bool name="proxy-wxFIXED_MINSIZE">0</bool>
<string name="proxy-Custom arguments">""</string>
<string name="proxy-Custom ctor arguments">""</string>
</document>
</document> </document>
</document> </document>
</document> </document>
...@@ -854,7 +1042,7 @@ ...@@ -854,7 +1042,7 @@
<string name="proxy-Member variable name">""</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-AlignH">"Centre"</string> <string name="proxy-AlignH">"Centre"</string>
<string name="proxy-AlignV">"Expand"</string> <string name="proxy-AlignV">"Expand"</string>
<long name="proxy-Stretch factor">0</long> <long name="proxy-Stretch factor">1</long>
<long name="proxy-Border">5</long> <long name="proxy-Border">5</long>
<bool name="proxy-wxLEFT">1</bool> <bool name="proxy-wxLEFT">1</bool>
<bool name="proxy-wxRIGHT">1</bool> <bool name="proxy-wxRIGHT">1</bool>
...@@ -877,10 +1065,18 @@ ...@@ -877,10 +1065,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_SHOW_OTHERS"</string> <string name="proxy-Id name">"ID_RADIOBOX_SHOW_OTHERS"</string>
<long name="proxy-Id value">10011</long> <long name="proxy-Id value">10011</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_OptDisplayDrawings"</string> <string name="proxy-Member variable name">"m_OptDisplayDrawings"</string>
<string name="proxy-Label">"Display other items:"</string> <string name="proxy-Label">"Display other items:"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Line|Filled|Sketch"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -891,10 +1087,16 @@ ...@@ -891,10 +1087,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">"DisplayOpt.DisplayDrawItems"</string> <string name="proxy-Data variable">"DisplayOpt.DisplayDrawItems"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Line|Filled|Sketch"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -927,10 +1129,18 @@ ...@@ -927,10 +1129,18 @@
<string name="proxy-type">"wbRadioBoxProxy"</string> <string name="proxy-type">"wbRadioBoxProxy"</string>
<string name="proxy-Id name">"ID_RADIOBOX_PAGE_LIMITS"</string> <string name="proxy-Id name">"ID_RADIOBOX_PAGE_LIMITS"</string>
<long name="proxy-Id value">10006</long> <long name="proxy-Id value">10006</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxRadioBox"</string> <string name="proxy-Class">"wxRadioBox"</string>
<string name="proxy-Base class">"wxRadioBox"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">"m_Show_Page_Limits"</string> <string name="proxy-Member variable name">"m_Show_Page_Limits"</string>
<string name="proxy-Label">"Show page limits"</string> <string name="proxy-Label">"Show page limits"</string>
<long name="proxy-Major dimension count">1</long> <long name="proxy-Major dimension count">1</long>
<string name="proxy-Items">"Yes|No"</string>
<long name="proxy-Initial value">0</long>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
...@@ -941,10 +1151,16 @@ ...@@ -941,10 +1151,16 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string> <string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string> <string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool> <bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool> <bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<string name="proxy-Items">"Yes|No"</string>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -1004,12 +1220,25 @@ ...@@ -1004,12 +1220,25 @@
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick"</string> <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick"</string>
<string name="proxy-Id name">"wxID_OK"</string> <string name="proxy-Id name">"wxID_OK"</string>
<long name="proxy-Id value">5100</long> <long name="proxy-Id value">5100</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string> <string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"&amp;OK"</string> <string name="proxy-Label">"&amp;OK"</string>
<bool name="proxy-Default">0</bool> <bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"CA0000"</string> <string name="proxy-Foreground colour">"CA0000"</string>
<string name="proxy-Font">""</string> <string name="proxy-Font">""</string>
...@@ -1023,6 +1252,8 @@ ...@@ -1023,6 +1252,8 @@
<bool name="proxy-wxBU_EXACTFIT">0</bool> <bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool> <bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
...@@ -1056,12 +1287,25 @@ ...@@ -1056,12 +1287,25 @@
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick"</string> <string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick"</string>
<string name="proxy-Id name">"wxID_CANCEL"</string> <string name="proxy-Id name">"wxID_CANCEL"</string>
<long name="proxy-Id value">5101</long> <long name="proxy-Id value">5101</long>
<string name="proxy-Name">""</string>
<string name="proxy-Class">"wxButton"</string> <string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
<bool name="proxy-Separate files">0</bool>
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string> <string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"&amp;Cancel"</string> <string name="proxy-Label">"&amp;Cancel"</string>
<bool name="proxy-Default">0</bool> <bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"0000FF"</string> <string name="proxy-Foreground colour">"0000FF"</string>
<string name="proxy-Font">""</string> <string name="proxy-Font">""</string>
...@@ -1075,6 +1319,8 @@ ...@@ -1075,6 +1319,8 @@
<bool name="proxy-wxBU_EXACTFIT">0</bool> <bool name="proxy-wxBU_EXACTFIT">0</bool>
<bool name="proxy-wxNO_BORDER">0</bool> <bool name="proxy-wxNO_BORDER">0</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool> <bool name="proxy-wxWANTS_CHARS">0</bool>
<bool name="proxy-wxNO_FULL_REPAINT_ON_RESIZE">0</bool>
<bool name="proxy-wxFULL_REPAINT_ON_RESIZE">0</bool>
<string name="proxy-Custom styles">""</string> <string name="proxy-Custom styles">""</string>
<long name="proxy-X">-1</long> <long name="proxy-X">-1</long>
<long name="proxy-Y">-1</long> <long name="proxy-Y">-1</long>
......
pcbnew/edit.cpp
View file @ e704c625
...@@ -151,7 +151,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -151,7 +151,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
{ {
DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc ); DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
} }
if( m_ID_current_state != id ) if( m_ID_current_state != id )
SetToolID( 0, wxCURSOR_ARROW, wxEmptyString ); SetToolID( 0, wxCURSOR_ARROW, wxEmptyString );
break; break;
...@@ -697,6 +697,11 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -697,6 +697,11 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
DrawPanel->MouseToCursorSchema(); DrawPanel->MouseToCursorSchema();
break; break;
case ID_POPUP_PCB_DELETE_MARKER:
RemoveStruct( GetCurItem(), &dc );
DrawPanel->MouseToCursorSchema();
break;
case ID_POPUP_PCB_DELETE_DRAWING_LAYER: case ID_POPUP_PCB_DELETE_DRAWING_LAYER:
Delete_Drawings_All_Layer( (DRAWSEGMENT*) GetCurItem(), &dc ); Delete_Drawings_All_Layer( (DRAWSEGMENT*) GetCurItem(), &dc );
SetCurItem( NULL ); SetCurItem( NULL );
...@@ -865,7 +870,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event ) ...@@ -865,7 +870,7 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
{ {
wxString msg = FindKicadHelpPath(); wxString msg = FindKicadHelpPath();
msg += g_EDA_Appl->m_EDA_CommonConfig->Read( wxT( "module_doc_file" ), msg += g_EDA_Appl->m_EDA_CommonConfig->Read( wxT( "module_doc_file" ),
wxT( "pcbnew/footprints.pdf" ) ); wxT( "pcbnew/footprints.pdf" ) );
GetAssociatedDocument( this, wxEmptyString, msg ); GetAssociatedDocument( this, wxEmptyString, msg );
} }
break; break;
...@@ -917,7 +922,7 @@ static void Process_Move_Item( WinEDA_PcbFrame* frame, ...@@ -917,7 +922,7 @@ static void Process_Move_Item( WinEDA_PcbFrame* frame,
/***************************************************************/ /***************************************************************/
void WinEDA_PcbFrame::RemoveStruct( EDA_BaseStruct* Item, wxDC* DC ) void WinEDA_PcbFrame::RemoveStruct( BOARD_ITEM* Item, wxDC* DC )
/***************************************************************/ /***************************************************************/
{ {
if( Item == NULL ) if( Item == NULL )
...@@ -958,6 +963,14 @@ void WinEDA_PcbFrame::RemoveStruct( EDA_BaseStruct* Item, wxDC* DC ) ...@@ -958,6 +963,14 @@ void WinEDA_PcbFrame::RemoveStruct( EDA_BaseStruct* Item, wxDC* DC )
break; break;
case TYPEMARQUEUR: case TYPEMARQUEUR:
if( Item == GetCurItem() )
SetCurItem( NULL );
( (MARQUEUR*) Item )->Draw( DrawPanel, DC, GR_XOR );
/* unlikf item an free the memory
* (not put in undelete stack, because this seems unnecessary)
*/
Item->DeleteStructure();
break; break;
case TYPEPAD: case TYPEPAD:
...@@ -1009,7 +1022,6 @@ void WinEDA_PcbFrame::SwitchLayer( wxDC* DC, int layer ) ...@@ -1009,7 +1022,6 @@ void WinEDA_PcbFrame::SwitchLayer( wxDC* DC, int layer )
return; return;
} }
} }
// If more than one copper layer is enabled, the "Copper" // If more than one copper layer is enabled, the "Copper"
// and "Component" layers can be selected, but the total // and "Component" layers can be selected, but the total
// number of copper layers determines which internal // number of copper layers determines which internal
...@@ -1017,7 +1029,7 @@ void WinEDA_PcbFrame::SwitchLayer( wxDC* DC, int layer ) ...@@ -1017,7 +1029,7 @@ void WinEDA_PcbFrame::SwitchLayer( wxDC* DC, int layer )
else else
{ {
if( (layer != COPPER_LAYER_N) && (layer != LAYER_CMP_N) if( (layer != COPPER_LAYER_N) && (layer != LAYER_CMP_N)
&& (layer >= m_Pcb->m_BoardSettings->m_CopperLayerCount - 1) ) && (layer >= m_Pcb->m_BoardSettings->m_CopperLayerCount - 1) )
{ {
// Uncomment following command (and line 17) to beep // Uncomment following command (and line 17) to beep
// the speaker. (Doing that would provide feedback to // the speaker. (Doing that would provide feedback to
......
pcbnew/pcbnew.h
View file @ e704c625
/**************************************/ /**************************************/
/* PCBNEW.H : d�larations communes */ /* PCBNEW.H : headers */
/**************************************/ /**************************************/
#ifndef PCBNEW_H #ifndef PCBNEW_H
#define PCBNEW_H #define PCBNEW_H
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#define U_PCB (PCB_INTERNAL_UNIT / EESCHEMA_INTERNAL_UNIT) #define U_PCB (PCB_INTERNAL_UNIT / EESCHEMA_INTERNAL_UNIT)
/* valeur de flag indicant si le pointeur de reference pour une localisation /* Flag used in locate functions
* est le curseur sur grille ou le curseur a deplacement fin hors grille */ * the locate ref point is the on grid cursor or the off grid mouse cursor */
#define CURSEUR_ON_GRILLE (0 << 0) #define CURSEUR_ON_GRILLE (0 << 0)
#define CURSEUR_OFF_GRILLE (1 << 0) #define CURSEUR_OFF_GRILLE (1 << 0)
...@@ -23,30 +23,30 @@ ...@@ -23,30 +23,30 @@
#define VISIBLE_ONLY (1 << 3) ///< if module not on a visible layer, do not select #define VISIBLE_ONLY (1 << 3) ///< if module not on a visible layer, do not select
#define START 0 /* ctes parametre dans les routines de localisation */ #define START 0 /* Flag used in locale routines */
#define END 1 #define END 1
#define DIM_ANCRE_MODULE 3 /* dim du symbole de l'ancre (centre) des modules */ #define DIM_ANCRE_MODULE 3 /* Anchor size (footprint centre) */
#define DIM_ANCRE_TEXTE 2 /* dim du symbole de l'ancre (centre) des textes */ #define DIM_ANCRE_TEXTE 2 /* nchor size (Text centre) */
/* Gestion du Menu Zoom */ /* Used in Zoom menu */
#define ZOOM_PLUS -1 #define ZOOM_PLUS -1
#define ZOOM_MOINS -2 #define ZOOM_MOINS -2
#define ZOOM_AUTO -3 #define ZOOM_AUTO -3
#define ZOOM_CENTER -4 #define ZOOM_CENTER -4
#define ZOOM_REDRAW -5 #define ZOOM_REDRAW -5
/* Definition des cas ou l'on force l'affichage en SKETCH (membre .flags) */ /* Flag to force the SKETCH mode to display items (.flags member) */
#define FORCE_SKETCH (DRAG | EDIT ) #define FORCE_SKETCH (DRAG | EDIT )
/* Constantes pour options lecture fichier PCB */ /* Flags used in read board file */
#define APPEND_PCB 1 /* pour ajout d'un nouveau circuit */ #define APPEND_PCB 1 /* used to append the new board to the existing board */
#define NEWPCB 0 /* pour chargement normal */ #define NEWPCB 0 /* used for normal load file */
eda_global wxArrayString g_LibName_List; // library list to load eda_global wxArrayString g_LibName_List; // library list to load
eda_global wxSize g_GridList[] eda_global wxSize g_GridList[]
#ifdef MAIN #ifdef MAIN
= { = {
wxSize( 1000, 1000 ), wxSize( 500, 500 ), wxSize( 250, 250 ), wxSize( 200, 200 ), wxSize( 1000, 1000 ), wxSize( 500, 500 ), wxSize( 250, 250 ), wxSize( 200, 200 ),
...@@ -60,10 +60,10 @@ eda_global wxSize g_GridList[] ...@@ -60,10 +60,10 @@ eda_global wxSize g_GridList[]
; ;
#define UNDELETE_STACK_SIZE 10 #define UNDELETE_STACK_SIZE 10
eda_global BOARD_ITEM* g_UnDeleteStack[UNDELETE_STACK_SIZE]; // Liste des elements supprimes eda_global BOARD_ITEM* g_UnDeleteStack[UNDELETE_STACK_SIZE]; // Linked list of deleted items
eda_global int g_UnDeleteStackPtr; eda_global int g_UnDeleteStackPtr;
eda_global bool g_ShowGrid eda_global bool g_ShowGrid
#ifdef MAIN #ifdef MAIN
= TRUE = TRUE
#endif #endif
...@@ -82,6 +82,8 @@ eda_global int g_TabOneLayerMask[LAYER_COUNT] ...@@ -82,6 +82,8 @@ eda_global int g_TabOneLayerMask[LAYER_COUNT]
0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x01000000, 0x02000000, 0x04000000, 0x08000000,
0x10000000, 0x20000000, 0x40000000, 0x80000000 0x10000000, 0x20000000, 0x40000000, 0x80000000
} }
#endif #endif
; ;
...@@ -106,8 +108,8 @@ eda_global bool Drc_On ...@@ -106,8 +108,8 @@ eda_global bool Drc_On
= TRUE = TRUE
#endif #endif
; ;
eda_global bool g_AutoDeleteOldTrack /* autorise effacement automatique eda_global bool g_AutoDeleteOldTrack /* Allows automatic deletion of the old track after
* de l'ancienne piste lors des redessins de pistes */ creation of a new track */
#ifdef MAIN #ifdef MAIN
= TRUE = TRUE
#endif #endif
...@@ -126,12 +128,11 @@ eda_global bool g_Raccord_45_Auto ...@@ -126,12 +128,11 @@ eda_global bool g_Raccord_45_Auto
= TRUE = TRUE
#endif #endif
; ;
eda_global bool g_ShowIsolDuringCreateTrack; /* .State controle l'affichage eda_global bool g_ShowIsolDuringCreateTrack; /* Show clearance while track creation */
* de l'isolation en trace de piste */
/**************************************************************/ /*********************************/
/* Options d'affichages (remplissages des segments, textes..) */ /* Displa otions for board items */
/**************************************************************/ /*********************************/
eda_global DISPLAY_OPTIONS DisplayOpt; eda_global DISPLAY_OPTIONS DisplayOpt;
...@@ -142,8 +143,7 @@ eda_global DISPLAY_OPTIONS DisplayOpt; ...@@ -142,8 +143,7 @@ eda_global DISPLAY_OPTIONS DisplayOpt;
* @param layer One of the two allowed layers for modules: CMP_N or COPPER_LAYER_N * @param layer One of the two allowed layers for modules: CMP_N or COPPER_LAYER_N
* @return bool - true if the layer is visible, else false. * @return bool - true if the layer is visible, else false.
*/ */
bool inline IsModuleLayerVisible( int layer ) bool inline IsModuleLayerVisible( int layer ) {
{
if( layer==CMP_N ) if( layer==CMP_N )
return DisplayOpt.Show_Modules_Cmp; return DisplayOpt.Show_Modules_Cmp;
...@@ -156,10 +156,10 @@ bool inline IsModuleLayerVisible( int layer ) ...@@ -156,10 +156,10 @@ bool inline IsModuleLayerVisible( int layer )
eda_global bool Track_45_Only; /* Flag pour limiter l'inclinaison eda_global bool Track_45_Only; /* Flag pour limiter l'inclinaison
* pistes a 45 degres seulement */ * pistes a 45 degres seulement */
eda_global bool Segments_45_Only;/* Flag pour limiter l'inclinaison eda_global bool Segments_45_Only;/* Flag pour limiter l'inclinaison
* edge pcb a 45 degres seulement */ * edge pcb a 45 degres seulement */
eda_global wxString PcbExtBuffer eda_global wxString PcbExtBuffer // Board file extension
#ifdef MAIN #ifdef MAIN
( wxT( ".brd" ) ) ( wxT( ".brd" ) )
#endif #endif
...@@ -169,13 +169,13 @@ eda_global wxString g_SaveFileName // File Name for periodic saving ...@@ -169,13 +169,13 @@ eda_global wxString g_SaveFileName // File Name for periodic saving
( wxT( "$savepcb" ) ) ( wxT( "$savepcb" ) )
#endif #endif
; ;
eda_global wxString NetNameBuffer; eda_global wxString NetNameBuffer; // Netlist file extension
eda_global wxString NetExtBuffer eda_global wxString NetExtBuffer
#ifdef MAIN #ifdef MAIN
( wxT( ".net" ) ) ( wxT( ".net" ) )
#endif #endif
; ;
eda_global wxString NetCmpExtBuffer eda_global wxString NetCmpExtBuffer // cmp/footprint association file extension
#ifdef MAIN #ifdef MAIN
( wxT( ".cmp" ) ) ( wxT( ".cmp" ) )
#endif #endif
...@@ -187,7 +187,7 @@ eda_global wxString LibExtBuffer ...@@ -187,7 +187,7 @@ eda_global wxString LibExtBuffer
( wxT( ".mod" ) ) ( wxT( ".mod" ) )
#endif #endif
; ;
eda_global wxString g_Shapes3DExtBuffer // extension des fichiers de formes 3D eda_global wxString g_Shapes3DExtBuffer //3D shape file extension
#ifdef MAIN #ifdef MAIN
( wxT( ".wrl" ) ) ( wxT( ".wrl" ) )
#endif #endif
...@@ -201,7 +201,8 @@ eda_global int g_CurrentVersionPCB ...@@ -201,7 +201,8 @@ eda_global int g_CurrentVersionPCB
#endif #endif
; ;
#define BUFMEMSIZE 256000 /* taille du buffer de travail (en octets) */ /* A buffer used in some computations (will be removed in next cleanup code, do not use) */
#define BUFMEMSIZE 256000 /* buffer size (in bytes) */
eda_global char* buf_work; /* pointeur sur le buffer de travail */ eda_global char* buf_work; /* pointeur sur le buffer de travail */
eda_global char* adr_lowmem; /* adresse de base memoire de calcul disponible*/ eda_global char* adr_lowmem; /* adresse de base memoire de calcul disponible*/
eda_global char* adr_himem; /* adresse haute limite de la memoire disponible*/ eda_global char* adr_himem; /* adresse haute limite de la memoire disponible*/
...@@ -209,15 +210,16 @@ eda_global char* adr_max; /* adresse haute maxi utilisee pour la memoire * ...@@ -209,15 +210,16 @@ eda_global char* adr_max; /* adresse haute maxi utilisee pour la memoire *
/* variables g�erales */ /* variables g�erales */
eda_global char cbuf[1024]; /* buffer de formatage texte */
eda_global BOARD* g_ModuleEditor_Pcb; /* Pointeur de l'entete pcb de l'editeur de module*/
eda_global int g_TimeOut; // Duree entre 2 sauvegardes automatiques
eda_global int g_SaveTime; // heure de la prochaine sauvegarde
eda_global char cbuf[1024]; /* buffer for some text printing */
eda_global BOARD* g_ModuleEditor_Pcb; /* board used to edit footprints (used by modedit)*/
eda_global int g_TimeOut; // Timer for automatic saving
eda_global int g_SaveTime; // Time for next saving
/* Variables generales d'empreintes */
/* Variables used in footprint handling */
extern int Angle_Rot_Module; extern int Angle_Rot_Module;
eda_global wxSize ModuleTextSize; /* dim des textes sur Modules par defaut */ eda_global wxSize ModuleTextSize; /* Default footprint texts size */
eda_global int ModuleTextWidth; eda_global int ModuleTextWidth;
eda_global int ModuleSegmentWidth; eda_global int ModuleSegmentWidth;
eda_global int Texte_Module_Type; eda_global int Texte_Module_Type;
...@@ -227,12 +229,12 @@ eda_global int Texte_Module_Type; ...@@ -227,12 +229,12 @@ eda_global int Texte_Module_Type;
/* pistes , vias , pads*/ /* pistes , vias , pads*/
/***********************/ /***********************/
#define L_MIN_DESSIN 1 /* seuil de largeur des pistes pour trace autre que filaire */ #define L_MIN_DESSIN 1 /* Min width segments to allow draws with tickness */
// Current designe settings: // Current designe settings:
eda_global class EDA_BoardDesignSettings g_DesignSettings; eda_global class EDA_BoardDesignSettings g_DesignSettings;
// valeurs par defaut des caract. des pads // Default values for pad editions
#ifndef GERBVIEW #ifndef GERBVIEW
#ifdef MAIN #ifdef MAIN
D_PAD g_Pad_Master( (MODULE*) NULL ); D_PAD g_Pad_Master( (MODULE*) NULL );
...@@ -243,18 +245,18 @@ extern D_PAD g_Pad_Master; ...@@ -243,18 +245,18 @@ extern D_PAD g_Pad_Master;
#endif #endif
/* Layer pair for auto routing and switch layers by hotkey */
eda_global int Route_Layer_TOP; eda_global int Route_Layer_TOP;
eda_global int Route_Layer_BOTTOM; /* couches de routage actif */ eda_global int Route_Layer_BOTTOM;
eda_global int g_MaxLinksShowed; // determine le nombre max de links affich� eda_global int g_MaxLinksShowed; // Mxa count links showed in routing
// en routage manuel
eda_global bool g_TwoSegmentTrackBuild // FALSE = 1 segment build, TRUE = 2 45 deg segm build eda_global bool g_TwoSegmentTrackBuild // FALSE = 1 segment build, TRUE = 2 45 deg segm build
#ifdef MAIN #ifdef MAIN
= TRUE = TRUE
#endif #endif
; ;
/* How to handle magentic pad: feature to move the pcb cursor on a pad center */ /* How to handle magnetic pads: feature to move the pcb cursor on a pad center */
enum MagneticPadOptionValues { enum MagneticPadOptionValues {
no_effect, no_effect,
capture_cursor_in_track_tool, capture_cursor_in_track_tool,
...@@ -266,16 +268,18 @@ eda_global int g_MagneticPadOption ...@@ -266,16 +268,18 @@ eda_global int g_MagneticPadOption
= capture_cursor_in_track_tool = capture_cursor_in_track_tool
#endif #endif
; ;
/* Variables to handle hightlight nets */
eda_global bool g_HightLigt_Status; eda_global bool g_HightLigt_Status;
eda_global int g_HightLigth_NetCode /* pour mise en surbrillance des pistes */ eda_global int g_HightLigth_NetCode
#ifdef MAIN #ifdef MAIN
= -1 = -1
#endif #endif
; /* net_code du net a mettre en surbrillance */ ;
eda_global TRACK* g_CurrentTrackSegment; // pointeur sur le segment en cours de trace /* used in track creation : */
eda_global TRACK* g_FirstTrackSegment; // pointeur sur le debut de la piste en cours eda_global TRACK* g_CurrentTrackSegment; // current created segment
eda_global int g_TrackSegmentCount; // nombre de points deja traces eda_global TRACK* g_FirstTrackSegment; // first segment created
eda_global int g_TrackSegmentCount; // New created segment count
eda_global wxString g_ViaType_Name[4] eda_global wxString g_ViaType_Name[4]
......
share/zoom.cpp
View file @ e704c625
...@@ -60,7 +60,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse ) ...@@ -60,7 +60,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )
/************************************************/ /************************************************/
void WinEDA_DrawFrame::PutOnGrid( wxPoint* coord ) void WinEDA_DrawFrame::PutOnGrid( wxPoint* coord )
/************************************************/ /************************************************/
/** Adjust the coordinate to the nearest grig value /** Adjust the coordinate to the nearest grid value
* @param coord = coordinate to adjust * @param coord = coordinate to adjust
*/ */
{ {
......
todo.txt
View file @ e704c625
...@@ -48,15 +48,5 @@ compiler can help with this too. ...@@ -48,15 +48,5 @@ compiler can help with this too.
understanding by new developers. understanding by new developers.
*** Implement the graying in/out of "Edit/Undo", "Edit/Redo" menu items,
when Undo/Redo stack is empty/filled.
*** Implement action for ID_POPUP_PCB_DELETE_MARKER, since onrightclick.cpp
can now identify a marker. To see where the user gets a menu to delete a marker:
void WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
*** Add tooltip text to all non-obvious controls in every dialog window. *** Add tooltip text to all non-obvious controls in every dialog window.
Need to do this using DialogBlocks. Need to do this using DialogBlocks.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment