Skip to content

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

better hotkey.cpp (code cleaning and info messages)

parent 2ac1fe57
Hide whitespace changes
Inline Side-by-side
Showing with 594 additions and 14872 deletions
change_log.txt
View file @ f7d85eca
...@@ -13,10 +13,11 @@ email address. ...@@ -13,10 +13,11 @@ email address.
though I'm not perfectly happy with the implementation -- wxwidgets puts though I'm not perfectly happy with the implementation -- wxwidgets puts
the control-characters in alphabetical order! the control-characters in alphabetical order!
2007-June-21 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr> 2007-June-25 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================ ================================================================================
+ pcbnew + pcbnew
minor enhancement in Edit footprint dialog (some help tool tips). minor enhancement in Edit footprint dialog (more help tool tips).
better hotkey.cpp (code cleaning and info messages)
......
demos/video/video.ps deleted 100644 → 0
View file @ 2ac1fe57
This source diff could not be displayed because it is too large. You can view the blob instead.
gerbview/tool_gerber.cpp
View file @ f7d85eca
...@@ -27,7 +27,7 @@ int ii; ...@@ -27,7 +27,7 @@ int ii;
wxMenuBar * menuBar = GetMenuBar(); wxMenuBar * menuBar = GetMenuBar();
if( menuBar == NULL ) if( menuBar == NULL )
{ {
menuBar = new wxMenuBar(); menuBar = new wxMenuBar();
m_FilesMenu = new wxMenu; m_FilesMenu = new wxMenu;
...@@ -48,7 +48,7 @@ wxMenuBar * menuBar = GetMenuBar(); ...@@ -48,7 +48,7 @@ wxMenuBar * menuBar = GetMenuBar();
m_FilesMenu->Append(ID_GERBVIEW_LOAD_DCODE_FILE, m_FilesMenu->Append(ID_GERBVIEW_LOAD_DCODE_FILE,
_("Load DCodes"), _("Load DCodes"),
_("Load DCodes File"), _("Load D-Codes File"),
FALSE); FALSE);
#if 0 #if 0
m_FilesMenu->Append(ID_GERBVIEW_LOAD_DRILL_FILE, m_FilesMenu->Append(ID_GERBVIEW_LOAD_DRILL_FILE,
...@@ -100,15 +100,15 @@ wxMenuBar * menuBar = GetMenuBar(); ...@@ -100,15 +100,15 @@ wxMenuBar * menuBar = GetMenuBar();
// Configuration: // Configuration:
wxMenu * configmenu = new wxMenu; wxMenu * configmenu = new wxMenu;
configmenu->Append(ID_CONFIG_REQ, _("&Files and Dir"), ADD_MENUITEM_WITH_HELP(configmenu, ID_CONFIG_REQ, _("&File ext"),
_("Setting Files extension, Directories and others...")); _("Setting Files extension"), config_xpm );
configmenu->Append(ID_COLORS_SETUP, _("&Colors"), ADD_MENUITEM_WITH_HELP(configmenu, ID_COLORS_SETUP, _("&Colors"),
_("Select Colors and Display for layers")); _("Select Colors and Display for layers"), palette_xpm);
configmenu->Append(ID_OPTIONS_SETUP, _("&Options"), ADD_MENUITEM_WITH_HELP(configmenu, ID_OPTIONS_SETUP, _("&Options"),
_(" Select general options")); _(" Select general options"), preference_xpm);
configmenu->Append(ID_PCB_LOOK_SETUP, _("Display"), ADD_MENUITEM_WITH_HELP(configmenu, ID_PCB_LOOK_SETUP, _("Display"),
_(" Select how items are displayed")); _(" Select how items are displayed"), display_options_xpm);
// Font selection and setup // Font selection and setup
AddFontSelectionMenu(configmenu); AddFontSelectionMenu(configmenu);
...@@ -116,8 +116,8 @@ wxMenuBar * menuBar = GetMenuBar(); ...@@ -116,8 +116,8 @@ wxMenuBar * menuBar = GetMenuBar();
m_Parent->SetLanguageList(configmenu); m_Parent->SetLanguageList(configmenu);
configmenu->AppendSeparator(); configmenu->AppendSeparator();
configmenu->Append(ID_CONFIG_SAVE, _("&Save Setup"), ADD_MENUITEM_WITH_HELP(configmenu, ID_CONFIG_SAVE, _("&Save Gerbview Setup"),
_("Save application preferences")); _("Save application preferences"), save_setup_xpm);
// Menu drill ( generation fichiers percage) // Menu drill ( generation fichiers percage)
/* wxMenu *drill_menu = new wxMenu; /* wxMenu *drill_menu = new wxMenu;
...@@ -126,18 +126,20 @@ wxMenuBar * menuBar = GetMenuBar(); ...@@ -126,18 +126,20 @@ wxMenuBar * menuBar = GetMenuBar();
*/ */
// Menu d'outils divers // Menu d'outils divers
wxMenu *miscellaneous_menu = new wxMenu; wxMenu *miscellaneous_menu = new wxMenu;
miscellaneous_menu->Append(ID_GERBVIEW_SHOW_LIST_DCODES, _("&List DCodes"), ADD_MENUITEM_WITH_HELP(miscellaneous_menu, ID_GERBVIEW_SHOW_LIST_DCODES, _("&List DCodes"),
_("List and Edit DCodes") ); _("List and Edit DCodes"), show_dcodenumber_xpm );
miscellaneous_menu->Append(ID_GERBVIEW_SHOW_SOURCE,_("&Show source"), ADD_MENUITEM_WITH_HELP(miscellaneous_menu, ID_GERBVIEW_SHOW_SOURCE,_("&Show source"),
_("Show source file for the current layer") ); _("Show source file for the current layer"), tools_xpm );
miscellaneous_menu->AppendSeparator(); miscellaneous_menu->AppendSeparator();
miscellaneous_menu->Append(ID_PCB_GLOBAL_DELETE, _("&Delete Layer"), ADD_MENUITEM_WITH_HELP(miscellaneous_menu, ID_PCB_GLOBAL_DELETE, _("&Delete Layer"),
_("Delete current layer") ); _("Delete current layer"), general_deletions_xpm );
// Menu Help: // Menu Help:
wxMenu *helpMenu = new wxMenu; wxMenu *helpMenu = new wxMenu;
helpMenu->Append(ID_GENERAL_HELP, _("&Contents"), _("Open the gerbview manual") ); ADD_MENUITEM_WITH_HELP(helpMenu, ID_GENERAL_HELP, _("&Contents"),
helpMenu->Append(ID_KICAD_ABOUT, _("&About"), _("About this application") ); _("Open the gerbview manual"), help_xpm );
ADD_MENUITEM_WITH_HELP(helpMenu, ID_KICAD_ABOUT, _("&About"),
_("About this application"), info_xpm );
menuBar->Append(m_FilesMenu, _("&File")); menuBar->Append(m_FilesMenu, _("&File"));
menuBar->Append(configmenu, _("&Preferences")); menuBar->Append(configmenu, _("&Preferences"));
...@@ -147,7 +149,7 @@ wxMenuBar * menuBar = GetMenuBar(); ...@@ -147,7 +149,7 @@ wxMenuBar * menuBar = GetMenuBar();
// Associate the menu bar with the frame // Associate the menu bar with the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
} }
else // simple mise a jour de la liste des fichiers anciens else // simple mise a jour de la liste des fichiers anciens
{ {
...@@ -255,32 +257,32 @@ int ii; ...@@ -255,32 +257,32 @@ int ii;
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject *) NULL, -1, -1, (wxObject *) NULL,
_("Zoom + (F1)")); _("zoom + (F1)"));
m_HToolBar->AddTool(ID_ZOOM_MOINS_BUTT, BITMAP(zoom_out_xpm), m_HToolBar->AddTool(ID_ZOOM_MOINS_BUTT, BITMAP(zoom_out_xpm),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject *) NULL, -1, -1, (wxObject *) NULL,
_("Zoom - (F2)")); _("zoom - (F2)"));
m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, BITMAP(repaint_xpm), m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, BITMAP(repaint_xpm),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject *) NULL, -1, -1, (wxObject *) NULL,
_("Redraw (F3)")); _("redraw (F3)"));
m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, BITMAP(zoom_optimal_xpm), m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, BITMAP(zoom_optimal_xpm),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject *) NULL, -1, -1, (wxObject *) NULL,
_("Auto zoom")); _("auto zoom"));
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool(ID_FIND_ITEMS, BITMAP(find_xpm), m_HToolBar->AddTool(ID_FIND_ITEMS, BITMAP(find_xpm),
wxNullBitmap, wxNullBitmap,
FALSE, FALSE,
-1, -1, (wxObject *) NULL, -1, -1, (wxObject *) NULL,
_("Find DCodes")); _("Find D Codes"));
wxArrayString choices; wxArrayString choices;
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
...@@ -426,7 +428,7 @@ void WinEDA_GerberFrame::ReCreateOptToolbar(void) ...@@ -426,7 +428,7 @@ void WinEDA_GerberFrame::ReCreateOptToolbar(void)
wxNullBitmap, wxNullBitmap,
TRUE, TRUE,
-1, -1, (wxObject *) NULL, -1, -1, (wxObject *) NULL,
_("Show DCode number")); _("Show dcode number"));
m_OptionsToolBar->Realize(); m_OptionsToolBar->Realize();
......
include/build_version.h
View file @ f7d85eca
...@@ -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-06-21)")) (wxT("(2007-06-25)"))
#endif #endif
; ;
......
include/macros.h
View file @ f7d85eca
...@@ -51,6 +51,11 @@ ...@@ -51,6 +51,11 @@
l_item = new wxMenuItem(menu, id, text);\ l_item = new wxMenuItem(menu, id, text);\
l_item->SetBitmap(icon); menu->Append(l_item);} l_item->SetBitmap(icon); menu->Append(l_item);}
#define ADD_MENUITEM_WITH_HELP(menu, id, text, help, icon) {\
wxMenuItem * l_item;\
l_item = new wxMenuItem(menu, id, text, help);\
l_item->SetBitmap(icon); menu->Append(l_item);}
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#define ADD_MENUITEM_WITH_SUBMENU(menu, submenu, id, text, icon) {\ #define ADD_MENUITEM_WITH_SUBMENU(menu, submenu, id, text, icon) {\
wxMenuItem * l_item;\ wxMenuItem * l_item;\
......
internat/fr/kicad.mo
View file @ f7d85eca
No preview for this file type
internat/fr/kicad.po
View file @ f7d85eca
...@@ -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-06-19 07:25+0100\n" "PO-Revision-Date: 2007-06-24 17:50+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"
...@@ -105,182 +105,6 @@ msgstr "Ecriture fichier CI: " ...@@ -105,182 +105,6 @@ msgstr "Ecriture fichier CI: "
msgid "Failed to create " msgid "Failed to create "
msgstr "Impossible de crer fichier " msgstr "Impossible de crer fichier "
#: pcbnew/dialog_general_options.cpp:264
#: gerbview/options.cpp:181
msgid "No Display"
msgstr "Pas d'affichage"
#: pcbnew/dialog_general_options.cpp:265
#: pcbnew/pcbtexte.cpp:178
#: pcbnew/dialog_edit_mod_text.cpp:232
#: pcbnew/cotation.cpp:119
#: pcbnew/affiche.cpp:84
#: eeschema/affiche.cpp:85
#: gerbview/options.cpp:182
#: gerbview/tool_gerber.cpp:110
msgid "Display"
msgstr "Affichage"
#: pcbnew/dialog_general_options.cpp:267
#: gerbview/options.cpp:183
msgid "Display Polar Coord"
msgstr "Affichage coord Polaires"
#: pcbnew/dialog_general_options.cpp:271
#: pcbnew/set_grid.cpp:147
#: gerbview/options.cpp:191
msgid "Inches"
msgstr "Pouces"
#: pcbnew/dialog_general_options.cpp:272
#: pcbnew/gendrill.cpp:167
#: eeschema/options.cpp:185
#: gerbview/options.cpp:192
msgid "millimeters"
msgstr "millimetres"
#: pcbnew/dialog_general_options.cpp:274
#: eeschema/optionsframe.cpp:135
#: eeschema/dialog_options.cpp:248
#: eeschema/options.cpp:187
#: gerbview/options.cpp:193
msgid "Units"
msgstr "Units"
#: pcbnew/dialog_general_options.cpp:279
#: gerbview/options.cpp:199
msgid "Small"
msgstr "Petit"
#: pcbnew/dialog_general_options.cpp:280
#: gerbview/options.cpp:199
msgid "Big"
msgstr "Grand"
#: pcbnew/dialog_general_options.cpp:282
#: gerbview/options.cpp:200
msgid "Cursor"
msgstr "Curseur"
#: pcbnew/dialog_general_options.cpp:289
msgid "Number of Layers:"
msgstr "Nombre de Couches:"
#: pcbnew/dialog_general_options.cpp:296
msgid "Max Links:"
msgstr "Liens max:"
#: pcbnew/dialog_general_options.cpp:303
msgid "Auto Save (minuts):"
msgstr "Sauveg. Auto (min)"
#: pcbnew/dialog_general_options.cpp:313
#: eeschema/netlist_control.cpp:94
#: share/dialog_print.cpp:167
msgid "Options:"
msgstr "Options :"
#: pcbnew/dialog_general_options.cpp:317
msgid "Drc ON"
msgstr "Drc ACTIVE"
#: pcbnew/dialog_general_options.cpp:322
msgid "Show Ratsnest"
msgstr "Monter le chevelu gnral"
#: pcbnew/dialog_general_options.cpp:326
msgid "Show Mod Ratsnest"
msgstr "Monter le chevelu du module"
#: pcbnew/dialog_general_options.cpp:330
msgid "Tracks Auto Del"
msgstr "Auto Supp. Pistes"
#: pcbnew/dialog_general_options.cpp:334
msgid "Track 45 Only"
msgstr "Pistes 45 seulement"
#: pcbnew/dialog_general_options.cpp:338
msgid "Segments 45 Only"
msgstr "Segments 45 seulement"
#: pcbnew/dialog_general_options.cpp:342
#: eeschema/dialog_options.cpp:239
#: eeschema/options.cpp:124
msgid "Auto PAN"
msgstr "Auto PAN"
#: pcbnew/dialog_general_options.cpp:347
msgid "Double Segm Track"
msgstr "2 segments pour piste"
#: pcbnew/dialog_general_options.cpp:353
#: pcbnew/dialog_display_options.cpp:202
#: pcbnew/dialog_display_options.cpp:208
msgid "Never"
msgstr "Jamais"
#: pcbnew/dialog_general_options.cpp:354
msgid "When creating tracks"
msgstr "En creation de pistes"
#: pcbnew/dialog_general_options.cpp:355
#: pcbnew/dialog_display_options.cpp:200
#: pcbnew/dialog_display_options.cpp:210
msgid "Always"
msgstr "Toujours"
#: pcbnew/dialog_general_options.cpp:357
msgid "Magnetic Pads"
msgstr " Pads magntiques"
#: pcbnew/dialog_general_options.cpp:359
msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
msgstr "Controle la capture du curseur pcb quand le curseuir souris est sur le pad"
#: pcbnew/dialog_general_options.cpp:365
#: pcbnew/dialog_graphic_items_options.cpp:261
#: pcbnew/dialog_edit_mod_text.cpp:213
#: pcbnew/dialog_initpcb.cpp:161
#: pcbnew/dialog_track_options.cpp:181
#: pcbnew/dialog_display_options.cpp:280
#: pcbnew/set_grid.cpp:171
#: pcbnew/dialog_pad_edit.cpp:221
#: eeschema/symbtext.cpp:174
#: eeschema/dialog_options.cpp:274
#: eeschema/sheet.cpp:187
#: eeschema/dialog_edit_component_in_lib.cpp:218
#: eeschema/dialog_edit_label.cpp:176
#: eeschema/dialog_create_component.cpp:195
#: eeschema/dialog_edit_component_in_schematic.cpp:243
#: eeschema/dialog_cmp_graphic_properties.cpp:178
#: eeschema/pinedit-dialog.cpp:308
#: cvpcb/dialog_cvpcb_config.cpp:135
#: share/setpage.cpp:232
msgid "&OK"
msgstr "&OK"
#: pcbnew/dialog_general_options.cpp:369
#: pcbnew/dialog_graphic_items_options.cpp:265
#: pcbnew/dialog_edit_mod_text.cpp:217
#: pcbnew/dialog_initpcb.cpp:164
#: pcbnew/dialog_track_options.cpp:185
#: pcbnew/dialog_display_options.cpp:284
#: pcbnew/zones.cpp:180
#: pcbnew/set_grid.cpp:176
#: pcbnew/dialog_pad_edit.cpp:225
#: eeschema/plothpgl.cpp:274
#: eeschema/symbtext.cpp:178
#: eeschema/dialog_options.cpp:278
#: eeschema/sheet.cpp:183
#: eeschema/dialog_edit_component_in_lib.cpp:214
#: eeschema/dialog_create_component.cpp:200
#: eeschema/dialog_cmp_graphic_properties.cpp:182
#: eeschema/pinedit-dialog.cpp:304
#: share/setpage.cpp:237
msgid "&Cancel"
msgstr "&Annuler"
#: pcbnew/edit_track_width.cpp:85 #: pcbnew/edit_track_width.cpp:85
msgid "Change track width (entire NET) ?" msgid "Change track width (entire NET) ?"
msgstr "Changelargeur piste ( NET complet) ?" msgstr "Changelargeur piste ( NET complet) ?"
...@@ -317,21 +141,21 @@ msgstr "It ...@@ -317,21 +141,21 @@ msgstr "It
msgid "Ok to abort ?" msgid "Ok to abort ?"
msgstr "Ok pour arrter ?" msgstr "Ok pour arrter ?"
#: pcbnew/dialog_edit_module.cpp:43 #: pcbnew/dialog_edit_module.cpp:41
msgid "Module properties" msgid "Module properties"
msgstr "Proprits du Module" msgstr "Proprits du Module"
#: pcbnew/dialog_edit_module.cpp:102 #: pcbnew/dialog_edit_module.cpp:94
msgid "Properties" msgid "Properties"
msgstr "Proprits" msgstr "Proprits"
#: pcbnew/dialog_edit_module.cpp:106 #: pcbnew/dialog_edit_module.cpp:98
#: pcbnew/dialog_edit_module.cpp:115 #: pcbnew/dialog_edit_module.cpp:107
#: pcbnew/dialog_edit_module.cpp:146 #: pcbnew/dialog_edit_module.cpp:138
msgid "3D settings" msgid "3D settings"
msgstr "3D Caract" msgstr "3D Caract"
#: pcbnew/dialog_edit_module.cpp:127 #: pcbnew/dialog_edit_module.cpp:119
#: pcbnew/pcbtexte.cpp:113 #: pcbnew/pcbtexte.cpp:113
#: pcbnew/muonde.cpp:341 #: pcbnew/muonde.cpp:341
#: pcbnew/block.cpp:117 #: pcbnew/block.cpp:117
...@@ -346,7 +170,7 @@ msgstr "3D Caract" ...@@ -346,7 +170,7 @@ msgstr "3D Caract"
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
#: pcbnew/dialog_edit_module.cpp:132 #: pcbnew/dialog_edit_module.cpp:124
#: pcbnew/pcbtexte.cpp:118 #: pcbnew/pcbtexte.cpp:118
#: pcbnew/muonde.cpp:345 #: pcbnew/muonde.cpp:345
#: pcbnew/modedit_onclick.cpp:195 #: pcbnew/modedit_onclick.cpp:195
...@@ -379,15 +203,15 @@ msgstr "Ok" ...@@ -379,15 +203,15 @@ msgstr "Ok"
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: pcbnew/dialog_edit_module.cpp:187 #: pcbnew/dialog_edit_module.cpp:179
msgid "Change module(s)" msgid "Change module(s)"
msgstr "Change module(s)" msgstr "Change module(s)"
#: pcbnew/dialog_edit_module.cpp:191 #: pcbnew/dialog_edit_module.cpp:183
msgid "Goto Module Editor" msgid "Goto Module Editor"
msgstr "Ouvrir Editeur de modules" msgstr "Ouvrir Editeur de modules"
#: pcbnew/dialog_edit_module.cpp:197 #: pcbnew/dialog_edit_module.cpp:189
#: eeschema/fieldedi.cpp:283 #: eeschema/fieldedi.cpp:283
#: eeschema/onrightclick.cpp:315 #: eeschema/onrightclick.cpp:315
#: eeschema/dialog_edit_component_in_lib.cpp:203 #: eeschema/dialog_edit_component_in_lib.cpp:203
...@@ -395,36 +219,37 @@ msgstr "Ouvrir Editeur de modules" ...@@ -395,36 +219,37 @@ msgstr "Ouvrir Editeur de modules"
msgid "Doc" msgid "Doc"
msgstr "Doc" msgstr "Doc"
#: pcbnew/dialog_edit_module.cpp:203 #: pcbnew/dialog_edit_module.cpp:195
msgid "Keywords" msgid "Keywords"
msgstr "Mots Cles" msgstr "Mots Cles"
#: pcbnew/dialog_edit_module.cpp:210 #: pcbnew/dialog_edit_module.cpp:202
msgid "Fields:" msgid "Fields:"
msgstr "Champs:" msgstr "Champs:"
#: pcbnew/dialog_edit_module.cpp:220 #: pcbnew/dialog_edit_module.cpp:212
msgid "Add Field" msgid "Add Field"
msgstr "Ajouter Champ" msgstr "Ajouter Champ"
#: pcbnew/dialog_edit_module.cpp:225 #: pcbnew/dialog_edit_module.cpp:217
#: eeschema/onrightclick.cpp:253 #: eeschema/onrightclick.cpp:253
msgid "Edit Field" msgid "Edit Field"
msgstr "Editer Champ" msgstr "Editer Champ"
#: pcbnew/dialog_edit_module.cpp:230 #: pcbnew/dialog_edit_module.cpp:222
msgid "Delete Field" msgid "Delete Field"
msgstr "Supprimer Champ" msgstr "Supprimer Champ"
#: pcbnew/dialog_edit_module.cpp:237 #: pcbnew/dialog_edit_module.cpp:229
msgid "Componant" #: common/common.cpp:242
msgid "Component"
msgstr "Composant" msgstr "Composant"
#: pcbnew/dialog_edit_module.cpp:237 #: pcbnew/dialog_edit_module.cpp:229
msgid "Copper" msgid "Copper"
msgstr "Cuivre" msgstr "Cuivre"
#: pcbnew/dialog_edit_module.cpp:238 #: pcbnew/dialog_edit_module.cpp:230
#: pcbnew/class_pad.cpp:769 #: pcbnew/class_pad.cpp:769
#: pcbnew/affiche.cpp:36 #: pcbnew/affiche.cpp:36
#: pcbnew/affiche.cpp:91 #: pcbnew/affiche.cpp:91
...@@ -437,8 +262,8 @@ msgstr "Cuivre" ...@@ -437,8 +262,8 @@ msgstr "Cuivre"
msgid "Layer" msgid "Layer"
msgstr "Couche" msgstr "Couche"
#: pcbnew/dialog_edit_module.cpp:245 #: pcbnew/dialog_edit_module.cpp:237
#: pcbnew/dialog_edit_module.cpp:287 #: pcbnew/dialog_edit_module.cpp:279
#: pcbnew/pcbtexte.cpp:177 #: pcbnew/pcbtexte.cpp:177
#: pcbnew/muonde.cpp:353 #: pcbnew/muonde.cpp:353
#: pcbnew/cotation.cpp:118 #: pcbnew/cotation.cpp:118
...@@ -449,12 +274,12 @@ msgstr "Couche" ...@@ -449,12 +274,12 @@ msgstr "Couche"
msgid "Normal" msgid "Normal"
msgstr "Normal" msgstr "Normal"
#: pcbnew/dialog_edit_module.cpp:245 #: pcbnew/dialog_edit_module.cpp:237
#: pcbnew/dialog_pad_edit.cpp:191 #: pcbnew/dialog_pad_edit.cpp:191
msgid "User" msgid "User"
msgstr "User" msgstr "User"
#: pcbnew/dialog_edit_module.cpp:246 #: pcbnew/dialog_edit_module.cpp:238
#: pcbnew/class_pad.cpp:810 #: pcbnew/class_pad.cpp:810
#: pcbnew/affiche.cpp:47 #: pcbnew/affiche.cpp:47
#: pcbnew/affiche.cpp:103 #: pcbnew/affiche.cpp:103
...@@ -464,80 +289,104 @@ msgstr "User" ...@@ -464,80 +289,104 @@ msgstr "User"
msgid "Orient" msgid "Orient"
msgstr "Orient" msgstr "Orient"
#: pcbnew/dialog_edit_module.cpp:278 #: pcbnew/dialog_edit_module.cpp:270
msgid "Orient (0.1 deg)" msgid "Orient (0.1 deg)"
msgstr "Orient (0.1 deg)" msgstr "Orient (0.1 deg)"
#: pcbnew/dialog_edit_module.cpp:287 #: pcbnew/dialog_edit_module.cpp:279
msgid "Normal+Insert" msgid "Normal+Insert"
msgstr "Normal+Insert" msgstr "Normal+Insert"
#: pcbnew/dialog_edit_module.cpp:287 #: pcbnew/dialog_edit_module.cpp:279
msgid "Virtual" msgid "Virtual"
msgstr "Virtuel" msgstr "Virtuel"
#: pcbnew/dialog_edit_module.cpp:288 #: pcbnew/dialog_edit_module.cpp:280
msgid "Attributs" msgid "Attributs"
msgstr "Attributs" msgstr "Attributs"
#: pcbnew/dialog_edit_module.cpp:312 #: pcbnew/dialog_edit_module.cpp:282
msgid "Use this attribute for most non smd components"
msgstr "Utiliser cet attribut pour la plupart des composants"
#: pcbnew/dialog_edit_module.cpp:284
msgid ""
"Use this attribute for smd components.\n"
"Only components with this option are put in the footprint position list file"
msgstr ""
"Uiliser cet attribut pour les composants CMS.\n"
"Seuls les composantsavec cette option sont mis dans le fichier de position des composants"
#: pcbnew/dialog_edit_module.cpp:286
msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)"
msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessins sur le PCB (tel que les vieux connecteurs ISA de PC)"
#: pcbnew/dialog_edit_module.cpp:309
msgid "Free" msgid "Free"
msgstr "Libre" msgstr "Libre"
#: pcbnew/dialog_edit_module.cpp:312 #: pcbnew/dialog_edit_module.cpp:309
msgid "Locked" msgid "Locked"
msgstr "Verrouill" msgstr "Verrouill"
#: pcbnew/dialog_edit_module.cpp:313 #: pcbnew/dialog_edit_module.cpp:310
msgid "Auto Place" msgid "Move and Auto Place"
msgstr "Auto Place" msgstr "Move et Placement Automatique"
#: pcbnew/dialog_edit_module.cpp:314
msgid "Enable hotkey move commands and Auto Placement"
msgstr "Autoriser les commandes clavier de dplacement et l'auto placement"
#: pcbnew/dialog_edit_module.cpp:319 #: pcbnew/dialog_edit_module.cpp:315
msgid "Disable hotkey move commands and Auto Placement"
msgstr "Interdire les commandes clavier de dplacement et l'auto placement"
#: pcbnew/dialog_edit_module.cpp:318
msgid "Rot 90" msgid "Rot 90"
msgstr "Rot 90" msgstr "Rot 90"
#: pcbnew/dialog_edit_module.cpp:326 #: pcbnew/dialog_edit_module.cpp:325
msgid "Rot 180" msgid "Rot 180"
msgstr "Rot 180" msgstr "Rot 180"
#: pcbnew/dialog_edit_module.cpp:356 #: pcbnew/dialog_edit_module.cpp:355
msgid "3D Shape Name" msgid "3D Shape Name"
msgstr "3D forme" msgstr "3D forme"
#: pcbnew/dialog_edit_module.cpp:372 #: pcbnew/dialog_edit_module.cpp:371
#: eeschema/dialog_eeschema_config.cpp:227 #: eeschema/dialog_eeschema_config.cpp:227
msgid "Browse" msgid "Browse"
msgstr "Examiner" msgstr "Examiner"
#: pcbnew/dialog_edit_module.cpp:376 #: pcbnew/dialog_edit_module.cpp:375
msgid "Add 3D Shape" msgid "Add 3D Shape"
msgstr "Ajout Forme 3D" msgstr "Ajout Forme 3D"
#: pcbnew/dialog_edit_module.cpp:382 #: pcbnew/dialog_edit_module.cpp:381
msgid "Remove 3D Shape" msgid "Remove 3D Shape"
msgstr "Suppr. Forme 3D:" msgstr "Suppr. Forme 3D:"
#: pcbnew/dialog_edit_module.cpp:388 #: pcbnew/dialog_edit_module.cpp:387
msgid "Shape Scale:" msgid "Shape Scale:"
msgstr "Echelle de la forme:" msgstr "Echelle de la forme:"
#: pcbnew/dialog_edit_module.cpp:394 #: pcbnew/dialog_edit_module.cpp:393
msgid "Shape Offset:" msgid "Shape Offset:"
msgstr "Offset forme:" msgstr "Offset forme:"
#: pcbnew/dialog_edit_module.cpp:401 #: pcbnew/dialog_edit_module.cpp:400
msgid "Shape Rotation:" msgid "Shape Rotation:"
msgstr "Rot de la forme" msgstr "Rot de la forme"
#: pcbnew/dialog_edit_module.cpp:438 #: pcbnew/dialog_edit_module.cpp:437
msgid "3D Shape:" msgid "3D Shape:"
msgstr "Forme 3D:" msgstr "Forme 3D:"
#: pcbnew/dialog_edit_module.cpp:727 #: pcbnew/dialog_edit_module.cpp:726
msgid "Reference or Value cannot be deleted" msgid "Reference or Value cannot be deleted"
msgstr "Rfrence ou Valeur ne peut etre efface" msgstr "Rfrence ou Valeur ne peut etre efface"
#: pcbnew/dialog_edit_module.cpp:731 #: pcbnew/dialog_edit_module.cpp:730
#, c-format #, c-format
msgid "Delete [%s]" msgid "Delete [%s]"
msgstr "Supprimer [%s]" msgstr "Supprimer [%s]"
...@@ -1171,6 +1020,17 @@ msgstr "Orientation" ...@@ -1171,6 +1020,17 @@ msgstr "Orientation"
msgid "Mirror" msgid "Mirror"
msgstr "Miroir" msgstr "Miroir"
#: pcbnew/pcbtexte.cpp:178
#: pcbnew/dialog_edit_mod_text.cpp:232
#: pcbnew/cotation.cpp:119
#: pcbnew/affiche.cpp:84
#: pcbnew/dialog_general_options.cpp:264
#: eeschema/affiche.cpp:85
#: gerbview/options.cpp:182
#: gerbview/tool_gerber.cpp:110
msgid "Display"
msgstr "Affichage"
#: pcbnew/autorout.cpp:52 #: pcbnew/autorout.cpp:52
msgid "Net not selected" msgid "Net not selected"
msgstr " Net non slectionn" msgstr " Net non slectionn"
...@@ -1318,6 +1178,49 @@ msgstr "Hauteur Texte Module" ...@@ -1318,6 +1178,49 @@ msgstr "Hauteur Texte Module"
msgid "Text Module Size H" msgid "Text Module Size H"
msgstr "Largeur Texte Module" msgstr "Largeur Texte Module"
#: pcbnew/dialog_graphic_items_options.cpp:261
#: pcbnew/dialog_edit_mod_text.cpp:213
#: pcbnew/dialog_initpcb.cpp:161
#: pcbnew/dialog_track_options.cpp:181
#: pcbnew/dialog_display_options.cpp:280
#: pcbnew/set_grid.cpp:171
#: pcbnew/dialog_pad_edit.cpp:221
#: pcbnew/dialog_general_options.cpp:364
#: eeschema/symbtext.cpp:174
#: eeschema/dialog_options.cpp:274
#: eeschema/sheet.cpp:187
#: eeschema/dialog_edit_component_in_lib.cpp:218
#: eeschema/dialog_edit_label.cpp:176
#: eeschema/dialog_create_component.cpp:195
#: eeschema/dialog_edit_component_in_schematic.cpp:243
#: eeschema/dialog_cmp_graphic_properties.cpp:178
#: eeschema/pinedit-dialog.cpp:308
#: cvpcb/dialog_cvpcb_config.cpp:135
#: share/setpage.cpp:232
msgid "&OK"
msgstr "&OK"
#: pcbnew/dialog_graphic_items_options.cpp:265
#: pcbnew/dialog_edit_mod_text.cpp:217
#: pcbnew/dialog_initpcb.cpp:164
#: pcbnew/dialog_track_options.cpp:185
#: pcbnew/dialog_display_options.cpp:284
#: pcbnew/zones.cpp:180
#: pcbnew/set_grid.cpp:176
#: pcbnew/dialog_pad_edit.cpp:225
#: pcbnew/dialog_general_options.cpp:368
#: eeschema/plothpgl.cpp:274
#: eeschema/symbtext.cpp:178
#: eeschema/dialog_options.cpp:278
#: eeschema/sheet.cpp:183
#: eeschema/dialog_edit_component_in_lib.cpp:214
#: eeschema/dialog_create_component.cpp:200
#: eeschema/dialog_cmp_graphic_properties.cpp:182
#: eeschema/pinedit-dialog.cpp:304
#: share/setpage.cpp:237
msgid "&Cancel"
msgstr "&Annuler"
#: pcbnew/basepcbframe.cpp:94 #: pcbnew/basepcbframe.cpp:94
msgid "3D Frame already opened" msgid "3D Frame already opened"
msgstr "Fenetre 3D dj ouverte" msgstr "Fenetre 3D dj ouverte"
...@@ -1450,43 +1353,43 @@ msgid "Print Module" ...@@ -1450,43 +1353,43 @@ msgid "Print Module"
msgstr "Imprimer Module" msgstr "Imprimer Module"
#: pcbnew/tool_modedit.cpp:106 #: pcbnew/tool_modedit.cpp:106
#: pcbnew/tool_pcb.cpp:242 #: pcbnew/tool_pcb.cpp:246
#: eeschema/tool_sch.cpp:104 #: eeschema/tool_sch.cpp:104
#: eeschema/tool_lib.cpp:170 #: eeschema/tool_lib.cpp:170
#: eeschema/tool_viewlib.cpp:70 #: eeschema/tool_viewlib.cpp:70
#: cvpcb/displayframe.cpp:118 #: cvpcb/displayframe.cpp:118
#: gerbview/tool_gerber.cpp:258 #: gerbview/tool_gerber.cpp:260
#: 3d-viewer/3d_toolbar.cpp:43 #: 3d-viewer/3d_toolbar.cpp:43
msgid "zoom + (F1)" msgid "zoom + (F1)"
msgstr "zoom + (F1)" msgstr "zoom + (F1)"
#: pcbnew/tool_modedit.cpp:109 #: pcbnew/tool_modedit.cpp:109
#: pcbnew/tool_pcb.cpp:243 #: pcbnew/tool_pcb.cpp:247
#: eeschema/tool_sch.cpp:107 #: eeschema/tool_sch.cpp:107
#: eeschema/tool_lib.cpp:174 #: eeschema/tool_lib.cpp:174
#: eeschema/tool_viewlib.cpp:74 #: eeschema/tool_viewlib.cpp:74
#: cvpcb/displayframe.cpp:121 #: cvpcb/displayframe.cpp:121
#: gerbview/tool_gerber.cpp:264 #: gerbview/tool_gerber.cpp:266
#: 3d-viewer/3d_toolbar.cpp:46 #: 3d-viewer/3d_toolbar.cpp:46
msgid "zoom - (F2)" msgid "zoom - (F2)"
msgstr "zoom - (F2)" msgstr "zoom - (F2)"
#: pcbnew/tool_modedit.cpp:112 #: pcbnew/tool_modedit.cpp:112
#: pcbnew/tool_pcb.cpp:244 #: pcbnew/tool_pcb.cpp:248
#: eeschema/tool_sch.cpp:110 #: eeschema/tool_sch.cpp:110
#: eeschema/tool_lib.cpp:178 #: eeschema/tool_lib.cpp:178
#: eeschema/tool_viewlib.cpp:78 #: eeschema/tool_viewlib.cpp:78
#: cvpcb/displayframe.cpp:124 #: cvpcb/displayframe.cpp:124
#: gerbview/tool_gerber.cpp:270 #: gerbview/tool_gerber.cpp:272
#: 3d-viewer/3d_toolbar.cpp:49 #: 3d-viewer/3d_toolbar.cpp:49
msgid "redraw (F3)" msgid "redraw (F3)"
msgstr "Redessin (F3)" msgstr "Redessin (F3)"
#: pcbnew/tool_modedit.cpp:115 #: pcbnew/tool_modedit.cpp:115
#: pcbnew/tool_pcb.cpp:246 #: pcbnew/tool_pcb.cpp:250
#: eeschema/tool_sch.cpp:113 #: eeschema/tool_sch.cpp:113
#: eeschema/tool_lib.cpp:182 #: eeschema/tool_lib.cpp:182
#: gerbview/tool_gerber.cpp:276 #: gerbview/tool_gerber.cpp:278
#: 3d-viewer/3d_toolbar.cpp:52 #: 3d-viewer/3d_toolbar.cpp:52
msgid "auto zoom" msgid "auto zoom"
msgstr "Zoom automatique" msgstr "Zoom automatique"
...@@ -1508,27 +1411,27 @@ msgid "Add Pads" ...@@ -1508,27 +1411,27 @@ msgid "Add Pads"
msgstr "Addition de \"pins\"" msgstr "Addition de \"pins\""
#: pcbnew/tool_modedit.cpp:153 #: pcbnew/tool_modedit.cpp:153
#: pcbnew/tool_pcb.cpp:382 #: pcbnew/tool_pcb.cpp:386
#: eeschema/tool_sch.cpp:216 #: eeschema/tool_sch.cpp:216
msgid "Add graphic line or polygon" msgid "Add graphic line or polygon"
msgstr "Addition de lignes ou polygones graphiques" msgstr "Addition de lignes ou polygones graphiques"
#: pcbnew/tool_modedit.cpp:157 #: pcbnew/tool_modedit.cpp:157
#: pcbnew/tool_pcb.cpp:386 #: pcbnew/tool_pcb.cpp:390
msgid "Add graphic circle" msgid "Add graphic circle"
msgstr "Addition de graphiques (Cercle)" msgstr "Addition de graphiques (Cercle)"
#: pcbnew/tool_modedit.cpp:161 #: pcbnew/tool_modedit.cpp:161
#: pcbnew/tool_pcb.cpp:390 #: pcbnew/tool_pcb.cpp:394
msgid "Add graphic arc" msgid "Add graphic arc"
msgstr "Addition de graphiques (Arc de Cercle)" msgstr "Addition de graphiques (Arc de Cercle)"
#: pcbnew/tool_modedit.cpp:165 #: pcbnew/tool_modedit.cpp:165
#: pcbnew/edit.cpp:552 #: pcbnew/edit.cpp:552
#: pcbnew/tool_pcb.cpp:394 #: pcbnew/tool_pcb.cpp:398
#: eeschema/schedit.cpp:309 #: eeschema/schedit.cpp:309
#: eeschema/libframe.cpp:487 #: eeschema/libframe.cpp:487
#: gerbview/tool_gerber.cpp:359 #: gerbview/tool_gerber.cpp:361
msgid "Add Text" msgid "Add Text"
msgstr "Ajout de Texte" msgstr "Ajout de Texte"
...@@ -1538,49 +1441,49 @@ msgid "Place anchor" ...@@ -1538,49 +1441,49 @@ msgid "Place anchor"
msgstr "Place Ancre" msgstr "Place Ancre"
#: pcbnew/tool_modedit.cpp:175 #: pcbnew/tool_modedit.cpp:175
#: pcbnew/tool_pcb.cpp:408 #: pcbnew/tool_pcb.cpp:412
#: eeschema/tool_sch.cpp:225 #: eeschema/tool_sch.cpp:225
#: eeschema/tool_lib.cpp:92 #: eeschema/tool_lib.cpp:92
#: gerbview/tool_gerber.cpp:367 #: gerbview/tool_gerber.cpp:369
msgid "Delete items" msgid "Delete items"
msgstr "Suppression d'lments" msgstr "Suppression d'lments"
#: pcbnew/tool_modedit.cpp:196 #: pcbnew/tool_modedit.cpp:196
#: pcbnew/tool_pcb.cpp:289 #: pcbnew/tool_pcb.cpp:293
#: eeschema/tool_sch.cpp:246 #: eeschema/tool_sch.cpp:246
#: gerbview/tool_gerber.cpp:387 #: gerbview/tool_gerber.cpp:389
msgid "Display Grid OFF" msgid "Display Grid OFF"
msgstr "Suppression de l'affichage de la grille" msgstr "Suppression de l'affichage de la grille"
#: pcbnew/tool_modedit.cpp:200 #: pcbnew/tool_modedit.cpp:200
#: pcbnew/tool_pcb.cpp:291 #: pcbnew/tool_pcb.cpp:295
#: gerbview/tool_gerber.cpp:393 #: gerbview/tool_gerber.cpp:395
msgid "Display Polar Coord ON" msgid "Display Polar Coord ON"
msgstr "Activer affichage coord Polaires" msgstr "Activer affichage coord Polaires"
#: pcbnew/tool_modedit.cpp:204 #: pcbnew/tool_modedit.cpp:204
#: pcbnew/tool_pcb.cpp:293 #: pcbnew/tool_pcb.cpp:297
#: eeschema/tool_sch.cpp:250 #: eeschema/tool_sch.cpp:250
#: gerbview/tool_gerber.cpp:397 #: gerbview/tool_gerber.cpp:399
msgid "Units = Inch" msgid "Units = Inch"
msgstr "Units = pouce" msgstr "Units = pouce"
#: pcbnew/tool_modedit.cpp:208 #: pcbnew/tool_modedit.cpp:208
#: pcbnew/tool_pcb.cpp:295 #: pcbnew/tool_pcb.cpp:299
#: eeschema/tool_sch.cpp:254 #: eeschema/tool_sch.cpp:254
#: gerbview/tool_gerber.cpp:401 #: gerbview/tool_gerber.cpp:403
msgid "Units = mm" msgid "Units = mm"
msgstr "Units = mm" msgstr "Units = mm"
#: pcbnew/tool_modedit.cpp:214 #: pcbnew/tool_modedit.cpp:214
#: pcbnew/tool_pcb.cpp:297 #: pcbnew/tool_pcb.cpp:301
#: eeschema/tool_sch.cpp:258 #: eeschema/tool_sch.cpp:258
#: gerbview/tool_gerber.cpp:407 #: gerbview/tool_gerber.cpp:409
msgid "Change Cursor Shape" msgid "Change Cursor Shape"
msgstr "Slection de la forme du curseur" msgstr "Slection de la forme du curseur"
#: pcbnew/tool_modedit.cpp:222 #: pcbnew/tool_modedit.cpp:222
#: pcbnew/tool_pcb.cpp:318 #: pcbnew/tool_pcb.cpp:322
msgid "Show Pads Sketch" msgid "Show Pads Sketch"
msgstr "Afficher pastilles en contour" msgstr "Afficher pastilles en contour"
...@@ -1593,7 +1496,7 @@ msgid "Show Edges Sketch" ...@@ -1593,7 +1496,7 @@ msgid "Show Edges Sketch"
msgstr "Afficher Modules en contour" msgstr "Afficher Modules en contour"
#: pcbnew/tool_modedit.cpp:268 #: pcbnew/tool_modedit.cpp:268
#: pcbnew/tool_pcb.cpp:508 #: pcbnew/tool_pcb.cpp:512
#: eeschema/plotps.cpp:168 #: eeschema/plotps.cpp:168
#: share/zoom.cpp:353 #: share/zoom.cpp:353
msgid "Auto" msgid "Auto"
...@@ -1615,7 +1518,7 @@ msgid "Grid %.3f" ...@@ -1615,7 +1518,7 @@ msgid "Grid %.3f"
msgstr "Grille %.3f" msgstr "Grille %.3f"
#: pcbnew/tool_modedit.cpp:294 #: pcbnew/tool_modedit.cpp:294
#: pcbnew/tool_pcb.cpp:538 #: pcbnew/tool_pcb.cpp:542
msgid "User Grid" msgid "User Grid"
msgstr "Grille perso" msgstr "Grille perso"
...@@ -1632,6 +1535,13 @@ msgstr "Effacer Pad (module %s %s) " ...@@ -1632,6 +1535,13 @@ msgstr "Effacer Pad (module %s %s) "
msgid "Drill tools" msgid "Drill tools"
msgstr "Outils de perage" msgstr "Outils de perage"
#: pcbnew/gendrill.cpp:167
#: pcbnew/dialog_general_options.cpp:271
#: eeschema/options.cpp:185
#: gerbview/options.cpp:192
msgid "millimeters"
msgstr "millimetres"
#: pcbnew/gendrill.cpp:167 #: pcbnew/gendrill.cpp:167
#: eeschema/dialog_options.cpp:246 #: eeschema/dialog_options.cpp:246
#: eeschema/options.cpp:185 #: eeschema/options.cpp:185
...@@ -2331,17 +2241,17 @@ msgid "Alternate Via Drill" ...@@ -2331,17 +2241,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:270 #: pcbnew/pcbnew.h:271
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:271 #: pcbnew/pcbnew.h:272
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:272 #: pcbnew/pcbnew.h:273
msgid "Standard Via" msgid "Standard Via"
msgstr "Via Standard" msgstr "Via Standard"
...@@ -2388,10 +2298,22 @@ msgstr "Pistes et vias" ...@@ -2388,10 +2298,22 @@ msgstr "Pistes et vias"
msgid "Tracks:" msgid "Tracks:"
msgstr "Pistes:" msgstr "Pistes:"
#: pcbnew/dialog_display_options.cpp:200
#: pcbnew/dialog_display_options.cpp:210
#: pcbnew/dialog_general_options.cpp:354
msgid "Always"
msgstr "Toujours"
#: pcbnew/dialog_display_options.cpp:201 #: pcbnew/dialog_display_options.cpp:201
msgid "New track" msgid "New track"
msgstr "Nouvelle piste" msgstr "Nouvelle piste"
#: pcbnew/dialog_display_options.cpp:202
#: pcbnew/dialog_display_options.cpp:208
#: pcbnew/dialog_general_options.cpp:352
msgid "Never"
msgstr "Jamais"
#: pcbnew/dialog_display_options.cpp:204 #: pcbnew/dialog_display_options.cpp:204
msgid "Show Track Clearance" msgid "Show Track Clearance"
msgstr "Monter Isolation Piste" msgstr "Monter Isolation Piste"
...@@ -2461,14 +2383,6 @@ msgstr "Non" ...@@ -2461,14 +2383,6 @@ msgstr "Non"
msgid "Show page limits" msgid "Show page limits"
msgstr " Afficher limites de page" msgstr " Afficher limites de page"
#: pcbnew/essai.cpp:103
msgid "Static text"
msgstr "Static text"
#: pcbnew/essai.cpp:109
msgid "X:"
msgstr "X:"
#: pcbnew/edgemod.cpp:212 #: pcbnew/edgemod.cpp:212
msgid "New Width (1/10000\"):" msgid "New Width (1/10000\"):"
msgstr "Novelle largeur (1/10000\"):" msgstr "Novelle largeur (1/10000\"):"
...@@ -3131,45 +3045,6 @@ msgstr "Editeur de Module: module modifi ...@@ -3131,45 +3045,6 @@ msgstr "Editeur de Module: module modifi
msgid "Pcbnew is already running, Continue?" msgid "Pcbnew is already running, Continue?"
msgstr "Pcbnew est est cours d'excution. Continuer ?" msgstr "Pcbnew est est cours d'excution. Continuer ?"
#: pcbnew/find.cpp:130
msgid "Marker found"
msgstr "Marqueur trouv"
#: pcbnew/find.cpp:131
#, c-format
msgid "<%s> Found"
msgstr "<%s> trouv"
#: pcbnew/find.cpp:139
msgid "Marker not found"
msgstr "Marqueur non trouv"
#: pcbnew/find.cpp:140
#, c-format
msgid "<%s> Not Found"
msgstr "<%s> Non trouv"
#: pcbnew/find.cpp:232
#: eeschema/dialog_find.cpp:107
msgid "Item to find:"
msgstr "Elment a chercher:"
#: pcbnew/find.cpp:244
msgid "Find Item"
msgstr "Chercher Item"
#: pcbnew/find.cpp:249
msgid "Find Next Item"
msgstr "Chercher Item Suivant"
#: pcbnew/find.cpp:256
msgid "Find Marker"
msgstr "Chercher Marqueur"
#: pcbnew/find.cpp:260
msgid "Find Next Marker"
msgstr "Marqueur Suivant"
#: pcbnew/cotation.cpp:88 #: pcbnew/cotation.cpp:88
msgid "Cotation properties" msgid "Cotation properties"
msgstr "Proprits des Cotations" msgstr "Proprits des Cotations"
...@@ -3479,6 +3354,12 @@ msgstr "Autoplace modules: pas de contours sur pcb, impossible de placer les mod ...@@ -3479,6 +3354,12 @@ 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/set_grid.cpp:147
#: pcbnew/dialog_general_options.cpp:270
#: gerbview/options.cpp:191
msgid "Inches"
msgstr "Pouces"
#: pcbnew/set_grid.cpp:148 #: pcbnew/set_grid.cpp:148
#: share/drawframe.cpp:349 #: share/drawframe.cpp:349
msgid "mm" msgid "mm"
...@@ -3770,7 +3651,7 @@ msgid "Add Tracks" ...@@ -3770,7 +3651,7 @@ msgid "Add Tracks"
msgstr "Addition de pistes" msgstr "Addition de pistes"
#: pcbnew/edit.cpp:529 #: pcbnew/edit.cpp:529
#: pcbnew/tool_pcb.cpp:377 #: pcbnew/tool_pcb.cpp:381
msgid "Add Zones" msgid "Add Zones"
msgstr "Addition de Zones" msgstr "Addition de Zones"
...@@ -3795,7 +3676,7 @@ msgid "Add Modules" ...@@ -3795,7 +3676,7 @@ msgid "Add Modules"
msgstr "Addition de Modules" msgstr "Addition de Modules"
#: pcbnew/edit.cpp:560 #: pcbnew/edit.cpp:560
#: pcbnew/tool_pcb.cpp:399 #: pcbnew/tool_pcb.cpp:403
msgid "Add Cotation" msgid "Add Cotation"
msgstr "Addition de Cotations" msgstr "Addition de Cotations"
...@@ -3944,7 +3825,7 @@ msgstr "Ne pas monter Zones" ...@@ -3944,7 +3825,7 @@ msgstr "Ne pas monter Zones"
#: pcbnew/pcbframe.cpp:384 #: pcbnew/pcbframe.cpp:384
#: pcbnew/set_color.cpp:387 #: pcbnew/set_color.cpp:387
#: pcbnew/tool_pcb.cpp:313 #: pcbnew/tool_pcb.cpp:317
msgid "Show Zones" msgid "Show Zones"
msgstr "Monter Zones" msgstr "Monter Zones"
...@@ -3969,7 +3850,7 @@ msgid "Normal Contrast Mode Display" ...@@ -3969,7 +3850,7 @@ msgid "Normal Contrast Mode Display"
msgstr "Mode d'affichage Contraste normal" msgstr "Mode d'affichage Contraste normal"
#: pcbnew/pcbframe.cpp:399 #: pcbnew/pcbframe.cpp:399
#: pcbnew/tool_pcb.cpp:326 #: pcbnew/tool_pcb.cpp:330
msgid "Hight Contrast Mode Display" msgid "Hight Contrast Mode Display"
msgstr "Mode d'affichage Haut Contraste" msgstr "Mode d'affichage Haut Contraste"
...@@ -4043,7 +3924,7 @@ msgid "Anchors" ...@@ -4043,7 +3924,7 @@ msgid "Anchors"
msgstr "Ancres" msgstr "Ancres"
#: pcbnew/set_color.cpp:378 #: pcbnew/set_color.cpp:378
#: pcbnew/tool_pcb.cpp:525 #: pcbnew/tool_pcb.cpp:529
#: gerbview/set_color.h:246 #: gerbview/set_color.h:246
msgid "Grid" msgid "Grid"
msgstr "Grille" msgstr "Grille"
...@@ -4083,9 +3964,8 @@ msgstr "Quitter" ...@@ -4083,9 +3964,8 @@ msgstr "Quitter"
#: pcbnew/win_eda_cleaningoptionsframe.cpp:138 #: pcbnew/win_eda_cleaningoptionsframe.cpp:138
#: pcbnew/win_eda_cleaningoptionsframe.cpp:162 #: pcbnew/win_eda_cleaningoptionsframe.cpp:162
#: pcbnew/cleaningoptions_dialog.cpp:146 #: pcbnew/cleaningoptions_dialog.cpp:146
#, fuzzy
msgid "Static" msgid "Static"
msgstr "Stat" msgstr "Static"
#: pcbnew/win_eda_cleaningoptionsframe.cpp:142 #: pcbnew/win_eda_cleaningoptionsframe.cpp:142
#: pcbnew/cleaningoptions_dialog.cpp:150 #: pcbnew/cleaningoptions_dialog.cpp:150
...@@ -4107,11 +3987,12 @@ msgid "Delete unconnected tracks" ...@@ -4107,11 +3987,12 @@ msgid "Delete unconnected tracks"
msgstr "Suppression Pistes non connectes" msgstr "Suppression Pistes non connectes"
#: pcbnew/win_eda_cleaningoptionsframe.cpp:158 #: pcbnew/win_eda_cleaningoptionsframe.cpp:158
#: pcbnew/cleaningoptions_dialog.cpp:162
msgid "Connect to Pads" msgid "Connect to Pads"
msgstr "Connection aux pads" msgstr "Connection aux pads"
#: pcbnew/win_eda_cleaningoptionsframe.cpp:166 #: pcbnew/win_eda_cleaningoptionsframe.cpp:166
#: pcbnew/cleaningoptions_dialog.cpp:169 #: pcbnew/cleaningoptions_dialog.cpp:171
msgid "Clean pcb" msgid "Clean pcb"
msgstr "Nettoyage PCB" msgstr "Nettoyage PCB"
...@@ -4120,10 +4001,6 @@ msgstr "Nettoyage PCB" ...@@ -4120,10 +4001,6 @@ msgstr "Nettoyage PCB"
msgid "Infos:" msgid "Infos:"
msgstr "Infos:" msgstr "Infos:"
#: pcbnew/cleaningoptions_dialog.cpp:162
msgid "Connect stubs to Pads"
msgstr "Connecter raccords aux Pads"
#: pcbnew/menubarmodedit.cpp:40 #: pcbnew/menubarmodedit.cpp:40
msgid "Sizes and Widths" msgid "Sizes and Widths"
msgstr "Dims. et Epaiss." msgstr "Dims. et Epaiss."
...@@ -4168,7 +4045,7 @@ msgstr "Ouvrir la documentation de pcbnew" ...@@ -4168,7 +4045,7 @@ msgstr "Ouvrir la documentation de pcbnew"
#: eeschema/menubar.cpp:157 #: eeschema/menubar.cpp:157
#: cvpcb/tool_cvpcb.cpp:162 #: cvpcb/tool_cvpcb.cpp:162
#: kicad/buildmnu.cpp:204 #: kicad/buildmnu.cpp:204
#: gerbview/tool_gerber.cpp:140 #: gerbview/tool_gerber.cpp:141
msgid "&About" msgid "&About"
msgstr "&Infos logiciel" msgstr "&Infos logiciel"
...@@ -4177,7 +4054,7 @@ msgstr "&Infos logiciel" ...@@ -4177,7 +4054,7 @@ msgstr "&Infos logiciel"
#: eeschema/menubar.cpp:157 #: eeschema/menubar.cpp:157
#: cvpcb/tool_cvpcb.cpp:163 #: cvpcb/tool_cvpcb.cpp:163
#: kicad/buildmnu.cpp:204 #: kicad/buildmnu.cpp:204
#: gerbview/tool_gerber.cpp:140 #: gerbview/tool_gerber.cpp:142
msgid "About this application" msgid "About this application"
msgstr "Au sujet de cette application" msgstr "Au sujet de cette application"
...@@ -4206,7 +4083,7 @@ msgstr "&3D Visu" ...@@ -4206,7 +4083,7 @@ msgstr "&3D Visu"
#: eeschema/menubar.cpp:164 #: eeschema/menubar.cpp:164
#: cvpcb/tool_cvpcb.cpp:169 #: cvpcb/tool_cvpcb.cpp:169
#: kicad/buildmnu.cpp:212 #: kicad/buildmnu.cpp:212
#: gerbview/tool_gerber.cpp:146 #: gerbview/tool_gerber.cpp:148
msgid "&Help" msgid "&Help"
msgstr "&Aide" msgstr "&Aide"
...@@ -4292,7 +4169,7 @@ msgid "&Plot" ...@@ -4292,7 +4169,7 @@ msgid "&Plot"
msgstr "&Tracer" msgstr "&Tracer"
#: pcbnew/menubarpcb.cpp:93 #: pcbnew/menubarpcb.cpp:93
#: pcbnew/tool_pcb.cpp:239 #: pcbnew/tool_pcb.cpp:243
msgid "Plot (Hplg, Postscript, or Gerber format)" msgid "Plot (Hplg, Postscript, or Gerber format)"
msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER" msgstr "Tracer en format HPGL, POSTSCRIPT ou GERBER"
...@@ -4486,7 +4363,7 @@ msgstr "Permutation de couches" ...@@ -4486,7 +4363,7 @@ msgstr "Permutation de couches"
#: pcbnew/menubarpcb.cpp:280 #: pcbnew/menubarpcb.cpp:280
#: eeschema/menubar.cpp:162 #: eeschema/menubar.cpp:162
#: cvpcb/tool_cvpcb.cpp:167 #: cvpcb/tool_cvpcb.cpp:167
#: gerbview/tool_gerber.cpp:142 #: gerbview/tool_gerber.cpp:144
#: 3d-viewer/3d_toolbar.cpp:107 #: 3d-viewer/3d_toolbar.cpp:107
msgid "&File" msgid "&File"
msgstr "&Fichiers" msgstr "&Fichiers"
...@@ -4495,13 +4372,13 @@ msgstr "&Fichiers" ...@@ -4495,13 +4372,13 @@ msgstr "&Fichiers"
#: eeschema/menubar.cpp:163 #: eeschema/menubar.cpp:163
#: cvpcb/tool_cvpcb.cpp:168 #: cvpcb/tool_cvpcb.cpp:168
#: kicad/buildmnu.cpp:211 #: kicad/buildmnu.cpp:211
#: gerbview/tool_gerber.cpp:143 #: gerbview/tool_gerber.cpp:145
#: 3d-viewer/3d_toolbar.cpp:115 #: 3d-viewer/3d_toolbar.cpp:115
msgid "&Preferences" msgid "&Preferences"
msgstr "&Prfrences" msgstr "&Prfrences"
#: pcbnew/menubarpcb.cpp:283 #: pcbnew/menubarpcb.cpp:283
#: gerbview/tool_gerber.cpp:144 #: gerbview/tool_gerber.cpp:146
msgid "&Miscellaneous" msgid "&Miscellaneous"
msgstr "&Divers" msgstr "&Divers"
...@@ -4509,10 +4386,6 @@ msgstr "&Divers" ...@@ -4509,10 +4386,6 @@ msgstr "&Divers"
msgid "P&ostprocess" msgid "P&ostprocess"
msgstr "P&ostprocesseurs" msgstr "P&ostprocesseurs"
#: pcbnew/hotkeys.cpp:254
msgid "Delete module?"
msgstr "Effacer Module?"
#: pcbnew/tool_pcb.cpp:49 #: pcbnew/tool_pcb.cpp:49
msgid "" msgid ""
"Show active layer selections\n" "Show active layer selections\n"
...@@ -4521,97 +4394,97 @@ msgstr "" ...@@ -4521,97 +4394,97 @@ msgstr ""
"Affiche selections couche active\n" "Affiche selections couche active\n"
"et selection paire de couches pour routage and placement via" "et selection paire de couches pour routage and placement via"
#: pcbnew/tool_pcb.cpp:215 #: pcbnew/tool_pcb.cpp:219
msgid "New Board" msgid "New Board"
msgstr "Nouveau Circuit Imprim" msgstr "Nouveau Circuit Imprim"
#: pcbnew/tool_pcb.cpp:216 #: pcbnew/tool_pcb.cpp:220
msgid "Open existing Board" msgid "Open existing Board"
msgstr "Ouvrir C.I. existant" msgstr "Ouvrir C.I. existant"
#: pcbnew/tool_pcb.cpp:217 #: pcbnew/tool_pcb.cpp:221
msgid "Save Board" msgid "Save Board"
msgstr "Sauver Circuit Imprim" msgstr "Sauver Circuit Imprim"
#: pcbnew/tool_pcb.cpp:220 #: pcbnew/tool_pcb.cpp:224
#: eeschema/tool_sch.cpp:61 #: eeschema/tool_sch.cpp:61
#: gerbview/tool_gerber.cpp:215 #: gerbview/tool_gerber.cpp:217
msgid "page settings (size, texts)" msgid "page settings (size, texts)"
msgstr "Ajustage de la feuille de dessin (dimensions, textes)" msgstr "Ajustage de la feuille de dessin (dimensions, textes)"
#: pcbnew/tool_pcb.cpp:224 #: pcbnew/tool_pcb.cpp:228
msgid "Open Module Editor" msgid "Open Module Editor"
msgstr "Ouvrir Editeur de modules" msgstr "Ouvrir Editeur de modules"
#: pcbnew/tool_pcb.cpp:227 #: pcbnew/tool_pcb.cpp:231
#: eeschema/tool_sch.cpp:77 #: eeschema/tool_sch.cpp:77
#: gerbview/tool_gerber.cpp:226 #: gerbview/tool_gerber.cpp:228
msgid "Cut selected item" msgid "Cut selected item"
msgstr "Suppression des lments slectionns" msgstr "Suppression des lments slectionns"
#: pcbnew/tool_pcb.cpp:230 #: pcbnew/tool_pcb.cpp:234
#: eeschema/tool_sch.cpp:80 #: eeschema/tool_sch.cpp:80
#: gerbview/tool_gerber.cpp:231 #: gerbview/tool_gerber.cpp:233
msgid "Copy selected item" msgid "Copy selected item"
msgstr "Copie des lments slectionns" msgstr "Copie des lments slectionns"
#: pcbnew/tool_pcb.cpp:232 #: pcbnew/tool_pcb.cpp:236
#: eeschema/tool_sch.cpp:83 #: eeschema/tool_sch.cpp:83
#: gerbview/tool_gerber.cpp:237 #: gerbview/tool_gerber.cpp:239
msgid "Paste" msgid "Paste"
msgstr "Copie des lments sauvegards" msgstr "Copie des lments sauvegards"
#: pcbnew/tool_pcb.cpp:235 #: pcbnew/tool_pcb.cpp:239
#: gerbview/tool_gerber.cpp:244 #: gerbview/tool_gerber.cpp:246
msgid "Undelete" msgid "Undelete"
msgstr "Annulation du dernier effacement" msgstr "Annulation du dernier effacement"
#: pcbnew/tool_pcb.cpp:238 #: pcbnew/tool_pcb.cpp:242
msgid "Print Board" msgid "Print Board"
msgstr "Imprimer C.I." msgstr "Imprimer C.I."
#: pcbnew/tool_pcb.cpp:249 #: pcbnew/tool_pcb.cpp:253
#: eeschema/tool_sch.cpp:117 #: eeschema/tool_sch.cpp:117
msgid "Find components and texts" msgid "Find components and texts"
msgstr "Recherche de composants et textes" msgstr "Recherche de composants et textes"
#: pcbnew/tool_pcb.cpp:252 #: pcbnew/tool_pcb.cpp:256
msgid "Read Netlist" msgid "Read Netlist"
msgstr "Lire Netliste" msgstr "Lire Netliste"
#: pcbnew/tool_pcb.cpp:253 #: pcbnew/tool_pcb.cpp:257
msgid "Pcb Design Rules Check" msgid "Pcb Design Rules Check"
msgstr "Controle des rgles de conception" msgstr "Controle des rgles de conception"
#: pcbnew/tool_pcb.cpp:263 #: pcbnew/tool_pcb.cpp:267
msgid "Mode Module: Manual and Automatic Move or Place for modules" msgid "Mode Module: Manual and Automatic Move or Place for modules"
msgstr "Mode Module: Dplacements ou Placement Manuel ou Automatique des modules" msgstr "Mode Module: Dplacements ou Placement Manuel ou Automatique des modules"
#: pcbnew/tool_pcb.cpp:265 #: pcbnew/tool_pcb.cpp:269
msgid "Mode Track and Autorouting" msgid "Mode Track and Autorouting"
msgstr "Mode Pistes and Autoroutage" msgstr "Mode Pistes and Autoroutage"
#: pcbnew/tool_pcb.cpp:287 #: pcbnew/tool_pcb.cpp:291
msgid "Drc OFF" msgid "Drc OFF"
msgstr "Drc DESACTIVEE" msgstr "Drc DESACTIVEE"
#: pcbnew/tool_pcb.cpp:302 #: pcbnew/tool_pcb.cpp:306
msgid "Show General Ratsnest" msgid "Show General Ratsnest"
msgstr "Monter le chevelu gnral" msgstr "Monter le chevelu gnral"
#: pcbnew/tool_pcb.cpp:305 #: pcbnew/tool_pcb.cpp:309
msgid "Show Module Ratsnest when moving" msgid "Show Module Ratsnest when moving"
msgstr "Monter le chevelu du module pendant dplacement" msgstr "Monter le chevelu du module pendant dplacement"
#: pcbnew/tool_pcb.cpp:309 #: pcbnew/tool_pcb.cpp:313
msgid "Enable Auto Del Track" msgid "Enable Auto Del Track"
msgstr "Autoriser l'effacement automatique des pistes" msgstr "Autoriser l'effacement automatique des pistes"
#: pcbnew/tool_pcb.cpp:322 #: pcbnew/tool_pcb.cpp:326
msgid "Show Tracks Sketch" msgid "Show Tracks Sketch"
msgstr "Afficher pistes en contour" msgstr "Afficher pistes en contour"
#: pcbnew/tool_pcb.cpp:334 #: pcbnew/tool_pcb.cpp:338
msgid "" msgid ""
"Display auxiliary vertical toolbar (tools for micro wave applications)\n" "Display auxiliary vertical toolbar (tools for micro wave applications)\n"
" This is a very experimental feature (under development)" " This is a very experimental feature (under development)"
...@@ -4619,59 +4492,207 @@ msgstr "" ...@@ -4619,59 +4492,207 @@ msgstr ""
"Affiche toolbar vertical auxiliaire (outils pour applications micro-ondes)\n" "Affiche toolbar vertical auxiliaire (outils pour applications micro-ondes)\n"
"C'est un outil exprimental (en cours de dveloppement)" "C'est un outil exprimental (en cours de dveloppement)"
#: pcbnew/tool_pcb.cpp:360 #: pcbnew/tool_pcb.cpp:364
msgid "Net highlight" msgid "Net highlight"
msgstr "Surbrillance des quipotentielles" msgstr "Surbrillance des quipotentielles"
#: pcbnew/tool_pcb.cpp:364 #: pcbnew/tool_pcb.cpp:368
msgid "Display local ratsnest (pad or module)" msgid "Display local ratsnest (pad or module)"
msgstr "Afficher le chevelu local (pastilles ou modules)" msgstr "Afficher le chevelu local (pastilles ou modules)"
#: pcbnew/tool_pcb.cpp:369 #: pcbnew/tool_pcb.cpp:373
msgid "Add modules" msgid "Add modules"
msgstr "Addition de Modules" msgstr "Addition de Modules"
#: pcbnew/tool_pcb.cpp:373 #: pcbnew/tool_pcb.cpp:377
msgid "Add Tracks an vias" msgid "Add Tracks an vias"
msgstr "Ajouter pistes et vias" msgstr "Ajouter pistes et vias"
#: pcbnew/tool_pcb.cpp:403 #: pcbnew/tool_pcb.cpp:407
#: gerbview/tool_gerber.cpp:352 #: gerbview/tool_gerber.cpp:354
msgid "Add Mires" msgid "Add Mires"
msgstr "Addition de Mires de superposition" msgstr "Addition de Mires de superposition"
#: pcbnew/tool_pcb.cpp:413 #: pcbnew/tool_pcb.cpp:417
msgid "Offset adjust for drill and place files" msgid "Offset adjust for drill and place files"
msgstr "Ajuste offset pour fichier de perage et placement" msgstr "Ajuste offset pour fichier de perage et placement"
#: pcbnew/tool_pcb.cpp:436 #: pcbnew/tool_pcb.cpp:440
msgid "Create line of specified length for microwave applications" msgid "Create line of specified length for microwave applications"
msgstr "Creation de lignes de longueur spcifie (pour applications micro-ondes)" msgstr "Creation de lignes de longueur spcifie (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:442 #: pcbnew/tool_pcb.cpp:446
msgid "Create gap of specified length for microwave applications" msgid "Create gap of specified length for microwave applications"
msgstr "Creation de gaps de longueur spcifie (pour applications micro-ondes)" msgstr "Creation de gaps de longueur spcifie (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:450 #: pcbnew/tool_pcb.cpp:454
msgid "Create stub of specified length for microwave applications" msgid "Create stub of specified length for microwave applications"
msgstr "Creation de stub de longueur spcifie (pour applications micro-ondes)" msgstr "Creation de stub de longueur spcifie (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:456 #: pcbnew/tool_pcb.cpp:460
msgid "Create stub (arc) of specified length for microwave applications" msgid "Create stub (arc) of specified length for microwave applications"
msgstr "Creation de stub (arc) de longueur spcifie (pour applications micro-ondes)" msgstr "Creation de stub (arc) de longueur spcifie (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:462 #: pcbnew/tool_pcb.cpp:466
msgid "Create a polynomial shape for microwave applications" msgid "Create a polynomial shape for microwave applications"
msgstr "Creation de formes polynomiales (pour applications micro-ondes)" msgstr "Creation de formes polynomiales (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:512 #: pcbnew/tool_pcb.cpp:516
msgid "Zoom " msgid "Zoom "
msgstr "Zoom " msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:587 #: pcbnew/tool_pcb.cpp:591
msgid "+/- to switch" msgid "+/- to switch"
msgstr "+/- pour commuter" msgstr "+/- pour commuter"
#: pcbnew/dialog_general_options.cpp:263
#: gerbview/options.cpp:181
msgid "No Display"
msgstr "Pas d'affichage"
#: pcbnew/dialog_general_options.cpp:266
#: gerbview/options.cpp:183
msgid "Display Polar Coord"
msgstr "Affichage coord Polaires"
#: pcbnew/dialog_general_options.cpp:273
#: eeschema/optionsframe.cpp:135
#: eeschema/dialog_options.cpp:248
#: eeschema/options.cpp:187
#: gerbview/options.cpp:193
msgid "Units"
msgstr "Units"
#: pcbnew/dialog_general_options.cpp:278
#: gerbview/options.cpp:199
msgid "Small"
msgstr "Petit"
#: pcbnew/dialog_general_options.cpp:279
#: gerbview/options.cpp:199
msgid "Big"
msgstr "Grand"
#: pcbnew/dialog_general_options.cpp:281
#: gerbview/options.cpp:200
msgid "Cursor"
msgstr "Curseur"
#: pcbnew/dialog_general_options.cpp:288
msgid "Number of Layers:"
msgstr "Nombre de Couches:"
#: pcbnew/dialog_general_options.cpp:295
msgid "Max Links:"
msgstr "Liens max:"
#: pcbnew/dialog_general_options.cpp:302
msgid "Auto Save (minuts):"
msgstr "Sauveg. Auto (min)"
#: pcbnew/dialog_general_options.cpp:312
#: eeschema/netlist_control.cpp:94
#: share/dialog_print.cpp:167
msgid "Options:"
msgstr "Options :"
#: pcbnew/dialog_general_options.cpp:316
msgid "Drc ON"
msgstr "Drc ACTIVE"
#: pcbnew/dialog_general_options.cpp:321
msgid "Show Ratsnest"
msgstr "Monter le chevelu gnral"
#: pcbnew/dialog_general_options.cpp:325
msgid "Show Mod Ratsnest"
msgstr "Monter le chevelu du module"
#: pcbnew/dialog_general_options.cpp:329
msgid "Tracks Auto Del"
msgstr "Auto Supp. Pistes"
#: pcbnew/dialog_general_options.cpp:333
msgid "Track 45 Only"
msgstr "Pistes 45 seulement"
#: pcbnew/dialog_general_options.cpp:337
msgid "Segments 45 Only"
msgstr "Segments 45 seulement"
#: pcbnew/dialog_general_options.cpp:341
#: eeschema/dialog_options.cpp:239
#: eeschema/options.cpp:124
msgid "Auto PAN"
msgstr "Auto PAN"
#: pcbnew/dialog_general_options.cpp:346
msgid "Double Segm Track"
msgstr "2 segments pour piste"
#: pcbnew/dialog_general_options.cpp:353
msgid "When creating tracks"
msgstr "En creation de pistes"
#: pcbnew/dialog_general_options.cpp:356
msgid "Magnetic Pads"
msgstr " Pads magntiques"
#: pcbnew/dialog_general_options.cpp:358
msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area"
msgstr "Controle la capture du curseur pcb quand le curseuir souris est sur le pad"
#: pcbnew/find.cpp:130
msgid "Marker found"
msgstr "Marqueur trouv"
#: pcbnew/find.cpp:131
#, c-format
msgid "<%s> Found"
msgstr "<%s> trouv"
#: pcbnew/find.cpp:139
msgid "Marker not found"
msgstr "Marqueur non trouv"
#: pcbnew/find.cpp:140
#, c-format
msgid "<%s> Not Found"
msgstr "<%s> Non trouv"
#: pcbnew/find.cpp:232
#: eeschema/dialog_find.cpp:107
msgid "Item to find:"
msgstr "Elment a chercher:"
#: pcbnew/find.cpp:244
msgid "Find Item"
msgstr "Chercher Item"
#: pcbnew/find.cpp:249
msgid "Find Next Item"
msgstr "Chercher Item Suivant"
#: pcbnew/find.cpp:256
msgid "Find Marker"
msgstr "Chercher Marqueur"
#: pcbnew/find.cpp:260
msgid "Find Next Marker"
msgstr "Marqueur Suivant"
#: pcbnew/hotkeys.cpp:129
msgid "Footprint found, but locked"
msgstr "Module trouv, mais verrouill"
#: pcbnew/hotkeys.cpp:130
msgid "Footprint found, but not on this layer"
msgstr "\"Module trouv, mais pas sur cette couche"
#: pcbnew/hotkeys.cpp:251
msgid "Delete module?"
msgstr "Effacer Module?"
#: eeschema/save_schemas.cpp:71 #: eeschema/save_schemas.cpp:71
#: eeschema/files-io.cpp:62 #: eeschema/files-io.cpp:62
#: eeschema/eeload.cpp:56 #: eeschema/eeload.cpp:56
...@@ -8415,120 +8436,76 @@ msgid "Create a New Directory" ...@@ -8415,120 +8436,76 @@ msgid "Create a New Directory"
msgstr "Crer un nouveau Rpertoire" msgstr "Crer un nouveau Rpertoire"
#: kicad/treeprj_frame.cpp:89 #: kicad/treeprj_frame.cpp:89
msgid "New &Schematic"
msgstr "Nouveau Projet &Schmatique"
#: kicad/treeprj_frame.cpp:89
msgid "Create a New Schematic File"
msgstr "Crer un nouveau Fichier schmatique:"
#: kicad/treeprj_frame.cpp:93
msgid "New &PCB"
msgstr "Neveau &PCB"
#: kicad/treeprj_frame.cpp:93
#, fuzzy
msgid "Create a New PCB File"
msgstr "Crer &Fichier"
#: kicad/treeprj_frame.cpp:97
#, fuzzy
msgid "New &Gerber File"
msgstr "Fichiers Gerber:"
#: kicad/treeprj_frame.cpp:97
#, fuzzy
msgid "Create a New Gerber File"
msgstr "Effacer et charger fichier Gerber"
#: kicad/treeprj_frame.cpp:101
#, fuzzy
msgid "New &Netlist"
msgstr "&Netliste"
#: kicad/treeprj_frame.cpp:101
#, fuzzy
msgid "Create a New Netlist"
msgstr "Lire Netliste"
#: kicad/treeprj_frame.cpp:107
msgid "New P&ython Script" msgid "New P&ython Script"
msgstr "Nouveau Script P&ython" msgstr "Nouveau Script P&ython"
#: kicad/treeprj_frame.cpp:107 #: kicad/treeprj_frame.cpp:89
#, fuzzy
msgid "Create a New Python Script" msgid "Create a New Python Script"
msgstr "Crer un nouveau descripteur de projet" msgstr "Crer un nouveau script Python"
#: kicad/treeprj_frame.cpp:112 #: kicad/treeprj_frame.cpp:94
#, fuzzy
msgid "New &Text File" msgid "New &Text File"
msgstr "Net ext: " msgstr "Nouveau Fichier &Texte"
#: kicad/treeprj_frame.cpp:112 #: kicad/treeprj_frame.cpp:94
msgid "Create a New Txt File" msgid "Create a New Txt File"
msgstr "Crer un nouveau Fichier texte" msgstr "Crer un nouveau Fichier texte"
#: kicad/treeprj_frame.cpp:116 #: kicad/treeprj_frame.cpp:98
#, fuzzy
msgid "New &File" msgid "New &File"
msgstr "&Fichiers" msgstr "Nouveau &Fichier"
#: kicad/treeprj_frame.cpp:116 #: kicad/treeprj_frame.cpp:98
msgid "Create a New File" msgid "Create a New File"
msgstr "Crer un nouveau Fichier" msgstr "Crer un nouveau Fichier"
#: kicad/treeprj_frame.cpp:127 #: kicad/treeprj_frame.cpp:109
msgid "&Rename File" msgid "&Rename File"
msgstr "&Renommer Fichier" msgstr "&Renommer Fichier"
#: kicad/treeprj_frame.cpp:127 #: kicad/treeprj_frame.cpp:109
msgid "&Rename Directory" msgid "&Rename Directory"
msgstr "&Renommer Rpertoire" msgstr "&Renommer Rpertoire"
#: kicad/treeprj_frame.cpp:128 #: kicad/treeprj_frame.cpp:110
#, fuzzy
msgid "Rename the File" msgid "Rename the File"
msgstr "Crer &Fichier" msgstr "Renommer le Fichier"
#: kicad/treeprj_frame.cpp:128 #: kicad/treeprj_frame.cpp:110
#, fuzzy
msgid "&Rename the Directory" msgid "&Rename the Directory"
msgstr "Rpertoire Cible" msgstr "&Renommer le Rpertoire"
#: kicad/treeprj_frame.cpp:132 #: kicad/treeprj_frame.cpp:114
msgid "&Delete File" msgid "&Delete File"
msgstr "&Supprimer Fichier" msgstr "&Supprimer Fichier"
#: kicad/treeprj_frame.cpp:132 #: kicad/treeprj_frame.cpp:114
msgid "&Delete Directory" msgid "&Delete Directory"
msgstr "&Supprimer le Rpertoire" msgstr "&Supprimer le Rpertoire"
#: kicad/treeprj_frame.cpp:133 #: kicad/treeprj_frame.cpp:115
msgid "Delete the File" msgid "Delete the File"
msgstr "Supprimer le fichier" msgstr "Supprimer le fichier"
#: kicad/treeprj_frame.cpp:133 #: kicad/treeprj_frame.cpp:115
msgid "&Delete the Directory and its content" msgid "&Delete the Directory and its content"
msgstr "Effacer le Rpertoire et son contenu" msgstr "Effacer le Rpertoire et son contenu"
#: kicad/treeprj_frame.cpp:360 #: kicad/treeprj_frame.cpp:342
msgid "Create New File:" msgid "Create New File:"
msgstr "Crer un nouveau Fichier" msgstr "Crer un nouveau Fichier"
#: kicad/treeprj_frame.cpp:360 #: kicad/treeprj_frame.cpp:342
#, fuzzy
msgid "Create New Directory" msgid "Create New Directory"
msgstr "Rpertoire Cible" msgstr "Crer un nouveau Rpertoire"
#: kicad/treeprj_frame.cpp:362 #: kicad/treeprj_frame.cpp:344
msgid "noname" msgid "noname"
msgstr "noname" msgstr "noname"
#: kicad/treeprj_frame.cpp:661 #: kicad/treeprj_frame.cpp:643
#, fuzzy
msgid "Change File Name: " msgid "Change File Name: "
msgstr "Nom en librairie" msgstr "ChangerNom Fichier: "
#: kicad/treeprj_datas.cpp:186 #: kicad/treeprj_datas.cpp:186
msgid "Unable to move file ... " msgid "Unable to move file ... "
...@@ -8760,7 +8737,7 @@ msgid "Delete Dcode items" ...@@ -8760,7 +8737,7 @@ msgid "Delete Dcode items"
msgstr "Suppression d'lments par DCode" msgstr "Suppression d'lments par DCode"
#: gerbview/affiche.cpp:33 #: gerbview/affiche.cpp:33
#: gerbview/tool_gerber.cpp:290 #: gerbview/tool_gerber.cpp:292
msgid "Layer " msgid "Layer "
msgstr "Couche " msgstr "Couche "
...@@ -8959,12 +8936,12 @@ msgid "Quit Gerbview" ...@@ -8959,12 +8936,12 @@ msgid "Quit Gerbview"
msgstr "Quitter Gerbview" msgstr "Quitter Gerbview"
#: gerbview/tool_gerber.cpp:103 #: gerbview/tool_gerber.cpp:103
msgid "&Files and Dir" msgid "&File ext"
msgstr "&Libs et Rep" msgstr "Ext. &Fichiers"
#: gerbview/tool_gerber.cpp:104 #: gerbview/tool_gerber.cpp:104
msgid "Setting Files extension, Directories and others..." msgid "Setting Files extension"
msgstr "Slectionner les extensions de fichiers, les rpertoires et autres..." msgstr "Slectionner les extensions de fichiers"
#: gerbview/tool_gerber.cpp:106 #: gerbview/tool_gerber.cpp:106
msgid "Select Colors and Display for layers" msgid "Select Colors and Display for layers"
...@@ -9006,55 +8983,55 @@ msgstr "&Effacer couche" ...@@ -9006,55 +8983,55 @@ msgstr "&Effacer couche"
msgid "Delete current layer" msgid "Delete current layer"
msgstr "&Effacer couche active" msgstr "&Effacer couche active"
#: gerbview/tool_gerber.cpp:139 #: gerbview/tool_gerber.cpp:140
msgid "Open the gerbview manual" msgid "Open the gerbview manual"
msgstr "Ouvrir la documentation de gerbview" msgstr "Ouvrir la documentation de gerbview"
#: gerbview/tool_gerber.cpp:197 #: gerbview/tool_gerber.cpp:199
msgid "New World" msgid "New World"
msgstr "Nouvelle photo" msgstr "Nouvelle photo"
#: gerbview/tool_gerber.cpp:202 #: gerbview/tool_gerber.cpp:204
msgid "Open existing Layer" msgid "Open existing Layer"
msgstr "Ouvrir couche existante" msgstr "Ouvrir couche existante"
#: gerbview/tool_gerber.cpp:208 #: gerbview/tool_gerber.cpp:210
msgid "Save World" msgid "Save World"
msgstr "Sauver photo" msgstr "Sauver photo"
#: gerbview/tool_gerber.cpp:251 #: gerbview/tool_gerber.cpp:253
msgid "Print World" msgid "Print World"
msgstr "Imprimer photo" msgstr "Imprimer photo"
#: gerbview/tool_gerber.cpp:283 #: gerbview/tool_gerber.cpp:285
msgid "Find D Codes" msgid "Find D Codes"
msgstr "Trouver DCodes" msgstr "Trouver DCodes"
#: gerbview/tool_gerber.cpp:300 #: gerbview/tool_gerber.cpp:302
msgid "No tool" msgid "No tool"
msgstr "Ps d'outil" msgstr "Ps d'outil"
#: gerbview/tool_gerber.cpp:304 #: gerbview/tool_gerber.cpp:306
msgid "Tool " msgid "Tool "
msgstr "Outil " msgstr "Outil "
#: gerbview/tool_gerber.cpp:340 #: gerbview/tool_gerber.cpp:342
msgid "Add Flashes" msgid "Add Flashes"
msgstr "Addition de Flash" msgstr "Addition de Flash"
#: gerbview/tool_gerber.cpp:346 #: gerbview/tool_gerber.cpp:348
msgid "Add Lines" msgid "Add Lines"
msgstr "Addition de lignes" msgstr "Addition de lignes"
#: gerbview/tool_gerber.cpp:415 #: gerbview/tool_gerber.cpp:417
msgid "Show Spots Sketch" msgid "Show Spots Sketch"
msgstr "Afficher flashs en contour" msgstr "Afficher flashs en contour"
#: gerbview/tool_gerber.cpp:422 #: gerbview/tool_gerber.cpp:424
msgid "Show Lines Sketch" msgid "Show Lines Sketch"
msgstr "Afficher lignes en contour" msgstr "Afficher lignes en contour"
#: gerbview/tool_gerber.cpp:429 #: gerbview/tool_gerber.cpp:431
msgid "Show dcode number" msgid "Show dcode number"
msgstr "Afficher le n de DCode" msgstr "Afficher le n de DCode"
...@@ -9151,10 +9128,6 @@ msgstr "Interne 13" ...@@ -9151,10 +9128,6 @@ msgstr "Interne 13"
msgid "Inner L14" msgid "Inner L14"
msgstr "Interne 14" msgstr "Interne 14"
#: common/common.cpp:242
msgid "Component"
msgstr "Composant"
#: common/common.cpp:243 #: common/common.cpp:243
msgid "Adhes Cop" msgid "Adhes Cop"
msgstr "Adhes Cu " msgstr "Adhes Cu "
...@@ -9739,10 +9712,6 @@ msgstr "S ...@@ -9739,10 +9712,6 @@ msgstr "S
msgid "Fill Zones Options" msgid "Fill Zones Options"
msgstr "Options de remplissage de Zone" msgstr "Options de remplissage de Zone"
#: pcbnew/essai.h:43
msgid "essai"
msgstr ""
#: pcbnew/dialog_edit_mod_text.h:43 #: pcbnew/dialog_edit_mod_text.h:43
msgid "TextMod properties" msgid "TextMod properties"
msgstr "Proprits du Texte sur Module" msgstr "Proprits du Texte sur Module"
...@@ -9831,9 +9800,8 @@ msgstr "Propri ...@@ -9831,9 +9800,8 @@ msgstr "Propri
#: eeschema/optionsframe.h:60 #: eeschema/optionsframe.h:60
#: eeschema/optionsframe.h:63 #: eeschema/optionsframe.h:63
#, fuzzy
msgid "optionsframe" msgid "optionsframe"
msgstr "Options" msgstr "optionsframe"
#: eeschema/plothpgl.h:45 #: eeschema/plothpgl.h:45
msgid "EESchema Plot HPGL" msgid "EESchema Plot HPGL"
......
kicad/treeprj_frame.cpp
View file @ f7d85eca
...@@ -85,24 +85,6 @@ WinEDA_PrjFrame::WinEDA_PrjFrame(WinEDA_MainFrame * parent, ...@@ -85,24 +85,6 @@ WinEDA_PrjFrame::WinEDA_PrjFrame(WinEDA_MainFrame * parent,
item->SetBitmap( directory_xpm ); item->SetBitmap( directory_xpm );
menu->Append( item ); menu->Append( item );
#if 0
item = new wxMenuItem(menu, ID_PROJECT_NEWSCH, _("New &Schematic"), _("Create a New Schematic File") );
item->SetBitmap( new_sch_xpm );
menu->Append( item );
item = new wxMenuItem(menu, ID_PROJECT_NEWBRD, _("New &PCB"), _("Create a New PCB File") );
item->SetBitmap( new_pcb_xpm );
menu->Append( item );
item = new wxMenuItem(menu, ID_PROJECT_NEWGERBER, _("New &Gerber File"), _("Create a New Gerber File") );
item->SetBitmap( new_gerb_xpm );
menu->Append( item );
item = new wxMenuItem(menu, ID_PROJECT_NEWNET, _("New &Netlist"), _("Create a New Netlist") );
item->SetBitmap( new_cvpcb_xpm );
menu->Append( item );
#endif
#ifdef KICAD_PYTHON #ifdef KICAD_PYTHON
item = new wxMenuItem(menu, ID_PROJECT_NEWPY, _("New P&ython Script"), _("Create a New Python Script") ); item = new wxMenuItem(menu, ID_PROJECT_NEWPY, _("New P&ython Script"), _("Create a New Python Script") );
item->SetBitmap( new_python_xpm ); item->SetBitmap( new_python_xpm );
......
news.txt
View file @ f7d85eca
************************************************************** **************************************************************
Update 25 may 2007 Update 25 jun 2007
pcbnew: pcbnew:
bug fix (problem in postscript generation due to the internationalization bug fix (problem in postscript generation due to the internationalization
of floating point number notation ) of floating point number notation )
......
pcbnew/cleaningoptions_dialog.cpp
View file @ f7d85eca
...@@ -133,7 +133,7 @@ void WinEDA_CleaningOptionsFrame::Init() ...@@ -133,7 +133,7 @@ void WinEDA_CleaningOptionsFrame::Init()
void WinEDA_CleaningOptionsFrame::CreateControls() void WinEDA_CleaningOptionsFrame::CreateControls()
{ {
////@begin WinEDA_CleaningOptionsFrame content construction ////@begin WinEDA_CleaningOptionsFrame content construction
// Generated by DialogBlocks, 28/05/2007 19:08:46 (unregistered) // Generated by DialogBlocks, 21/06/2007 19:58:26 (unregistered)
WinEDA_CleaningOptionsFrame* itemDialog1 = this; WinEDA_CleaningOptionsFrame* itemDialog1 = this;
...@@ -159,16 +159,18 @@ void WinEDA_CleaningOptionsFrame::CreateControls() ...@@ -159,16 +159,18 @@ void WinEDA_CleaningOptionsFrame::CreateControls()
m_DeleteunconnectedOpt->SetValue(false); m_DeleteunconnectedOpt->SetValue(false);
itemStaticBoxSizer4->Add(m_DeleteunconnectedOpt, 0, wxALIGN_LEFT|wxALL, 5); itemStaticBoxSizer4->Add(m_DeleteunconnectedOpt, 0, wxALIGN_LEFT|wxALL, 5);
m_ConnectToPadsOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Connect stubs to Pads"), wxDefaultPosition, wxDefaultSize, 0 ); m_ConnectToPadsOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Connect to Pads"), wxDefaultPosition, wxDefaultSize, 0 );
m_ConnectToPadsOpt->SetValue(false); m_ConnectToPadsOpt->SetValue(false);
itemStaticBoxSizer4->Add(m_ConnectToPadsOpt, 0, wxALIGN_LEFT|wxALL, 5); itemStaticBoxSizer4->Add(m_ConnectToPadsOpt, 0, wxALIGN_LEFT|wxALL, 5);
wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL); itemStaticBoxSizer4->Add(5, 5, 0, wxGROW|wxALL, 5);
itemBoxSizer3->Add(itemBoxSizer9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* itemButton10 = new wxButton( itemDialog1, ID_BUTTON_EXECUTE, _("Clean pcb"), wxDefaultPosition, wxDefaultSize, 0 ); wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL);
itemButton10->SetDefault(); itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
itemBoxSizer9->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxButton* itemButton11 = new wxButton( itemDialog1, ID_BUTTON_EXECUTE, _("Clean pcb"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton11->SetDefault();
itemBoxSizer10->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
// Set validators // Set validators
m_CleanViasOpt->SetValidator( wxGenericValidator(& s_CleanVias) ); m_CleanViasOpt->SetValidator( wxGenericValidator(& s_CleanVias) );
......
pcbnew/dialog_edit_module.cpp
View file @ f7d85eca
...@@ -34,14 +34,11 @@ BEGIN_EVENT_TABLE(Panel3D_Ctrl, wxPanel) ...@@ -34,14 +34,11 @@ BEGIN_EVENT_TABLE(Panel3D_Ctrl, wxPanel)
END_EVENT_TABLE() END_EVENT_TABLE()
#define H_SIZE 430
#define V_SIZE 530
/**************************************************************************************/ /**************************************************************************************/
WinEDA_ModulePropertiesFrame::WinEDA_ModulePropertiesFrame(WinEDA_BasePcbFrame *parent, WinEDA_ModulePropertiesFrame::WinEDA_ModulePropertiesFrame(WinEDA_BasePcbFrame *parent,
MODULE * Module,wxDC * DC, MODULE * Module,wxDC * DC,
const wxPoint & framepos): const wxPoint & framepos):
wxDialog(parent, -1, _("Module properties"), framepos, wxDialog(parent, -1, _("Module properties"), framepos, wxDefaultSize, DIALOG_STYLE)
wxSize(H_SIZE, V_SIZE), DIALOG_STYLE)
/**************************************************************************************/ /**************************************************************************************/
{ {
wxString number; wxString number;
...@@ -77,20 +74,15 @@ void WinEDA_ModulePropertiesFrame::CreateControls(void) ...@@ -77,20 +74,15 @@ void WinEDA_ModulePropertiesFrame::CreateControls(void)
{ {
wxPoint pos; wxPoint pos;
wxButton * Button; wxButton * Button;
wxSize usize;
bool FullOptions = FALSE; bool FullOptions = FALSE;
if ( m_Parent->m_Ident == PCB_FRAME ) FullOptions = TRUE; if ( m_Parent->m_Ident == PCB_FRAME ) FullOptions = TRUE;
usize = GetClientSize();
m_GeneralBoxSizer = new wxBoxSizer(wxVERTICAL); m_GeneralBoxSizer = new wxBoxSizer(wxVERTICAL);
SetSizer(m_GeneralBoxSizer); SetSizer(m_GeneralBoxSizer);
m_NoteBook = new wxNotebook(this, ID_NOTEBOOK, m_NoteBook = new wxNotebook(this, ID_NOTEBOOK);
wxDefaultPosition,wxSize(usize.x,usize.y - 34) );
m_NoteBook->SetFont(*g_DialogFont); m_NoteBook->SetFont(*g_DialogFont);
m_GeneralBoxSizer->Add(m_NoteBook, 0, wxGROW|wxALL, 5); m_GeneralBoxSizer->Add(m_NoteBook, 0, wxGROW|wxALL, 5);
// Add panels // Add panels
......
pcbnew/essai.cpp deleted 100644 → 0
View file @ 2ac1fe57
/////////////////////////////////////////////////////////////////////////////
// Name: essai.cpp
// Purpose:
// Author: jean-pierre Charras
// Modified by:
// Created: 28/02/2006 07:46:42
// RCS-ID:
// Copyright: License GNU
// Licence:
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 28/02/2006 07:46:42
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "essai.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
////@begin includes
////@end includes
#include "essai.h"
////@begin XPM images
////@end XPM images
/*!
* essai type definition
*/
IMPLEMENT_DYNAMIC_CLASS( essai, wxDialog )
/*!
* essai event table definition
*/
BEGIN_EVENT_TABLE( essai, wxDialog )
////@begin essai event table entries
////@end essai event table entries
END_EVENT_TABLE()
/*!
* essai constructors
*/
essai::essai( )
{
}
essai::essai( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
{
Create(parent, id, caption, pos, size, style);
}
/*!
* essai creator
*/
bool essai::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
{
////@begin essai member initialisation
GridSizer = NULL;
////@end essai member initialisation
////@begin essai creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
CreateControls();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Centre();
////@end essai creation
return true;
}
/*!
* Control creation for essai
*/
void essai::CreateControls()
{
////@begin essai content construction
// Generated by DialogBlocks, 28/02/2006 07:48:35 (unregistered)
essai* itemDialog1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
itemDialog1->SetSizer(itemBoxSizer2);
wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Static text"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer2->Add(itemStaticText3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5);
GridSizer = new wxFlexGridSizer(3, 2, 0, 0);
itemBoxSizer2->Add(GridSizer, 0, wxGROW|wxALL, 5);
wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
GridSizer->Add(itemStaticText5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5);
wxTextCtrl* itemTextCtrl6 = new wxTextCtrl( itemDialog1, ID_TEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
GridSizer->Add(itemTextCtrl6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
////@end essai content construction
}
/*!
* Should we show tooltips?
*/
bool essai::ShowToolTips()
{
return true;
}
/*!
* Get bitmap resources
*/
wxBitmap essai::GetBitmapResource( const wxString& name )
{
// Bitmap retrieval
////@begin essai bitmap retrieval
wxUnusedVar(name);
return wxNullBitmap;
////@end essai bitmap retrieval
}
/*!
* Get icon resources
*/
wxIcon essai::GetIconResource( const wxString& name )
{
// Icon retrieval
////@begin essai icon retrieval
wxUnusedVar(name);
return wxNullIcon;
////@end essai icon retrieval
}
pcbnew/essai.h deleted 100644 → 0
View file @ 2ac1fe57
/////////////////////////////////////////////////////////////////////////////
// Name: essai.h
// Purpose:
// Author: jean-pierre Charras
// Modified by:
// Created: 28/02/2006 07:46:42
// RCS-ID:
// Copyright: License GNU
// Licence:
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 28/02/2006 07:46:42
#ifndef _ESSAI_H_
#define _ESSAI_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "essai.h"
#endif
/*!
* Includes
*/
////@begin includes
////@end includes
/*!
* Forward declarations
*/
////@begin forward declarations
class wxFlexGridSizer;
////@end forward declarations
/*!
* Control identifiers
*/
////@begin control identifiers
#define ID_DIALOG 10000
#define SYMBOL_ESSAI_STYLE wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
#define SYMBOL_ESSAI_TITLE _("essai")
#define SYMBOL_ESSAI_IDNAME ID_DIALOG
#define SYMBOL_ESSAI_SIZE wxSize(400, 300)
#define SYMBOL_ESSAI_POSITION wxDefaultPosition
#define ID_TEXTCTRL 10001
////@end control identifiers
/*!
* Compatibility
*/
#ifndef wxCLOSE_BOX
#define wxCLOSE_BOX 0x1000
#endif
/*!
* essai class declaration
*/
class essai: public wxDialog
{
DECLARE_DYNAMIC_CLASS( essai )
DECLARE_EVENT_TABLE()
public:
/// Constructors
essai( );
essai( wxWindow* parent, wxWindowID id = SYMBOL_ESSAI_IDNAME, const wxString& caption = SYMBOL_ESSAI_TITLE, const wxPoint& pos = SYMBOL_ESSAI_POSITION, const wxSize& size = SYMBOL_ESSAI_SIZE, long style = SYMBOL_ESSAI_STYLE );
/// Creation
bool Create( wxWindow* parent, wxWindowID id = SYMBOL_ESSAI_IDNAME, const wxString& caption = SYMBOL_ESSAI_TITLE, const wxPoint& pos = SYMBOL_ESSAI_POSITION, const wxSize& size = SYMBOL_ESSAI_SIZE, long style = SYMBOL_ESSAI_STYLE );
/// Creates the controls and sizers
void CreateControls();
////@begin essai event handler declarations
////@end essai event handler declarations
////@begin essai member function declarations
/// Retrieves bitmap resources
wxBitmap GetBitmapResource( const wxString& name );
/// Retrieves icon resources
wxIcon GetIconResource( const wxString& name );
////@end essai member function declarations
/// Should we show tooltips?
static bool ShowToolTips();
////@begin essai member variables
wxFlexGridSizer* GridSizer;
////@end essai member variables
};
#endif
// _ESSAI_H_
pcbnew/essai.rc deleted 100644 → 0
View file @ 2ac1fe57
#include "wx/msw/wx.rc"
pcbnew/hotkeys.cpp
View file @ f7d85eca
...@@ -40,163 +40,129 @@ sous le courseur souris ...@@ -40,163 +40,129 @@ sous le courseur souris
MODULE* module = NULL; MODULE* module = NULL;
hotkey = toupper(hotkey);
switch (hotkey) switch (hotkey)
{ {
case WXK_DELETE: case WXK_DELETE:
case WXK_NUMPAD_DELETE: case WXK_NUMPAD_DELETE:
OnHotkeyDeleteItem(DC, DrawStruct); OnHotkeyDeleteItem(DC, DrawStruct);
break; break;
case WXK_BACK: case WXK_BACK:
{ {
if( m_ID_current_state == ID_TRACK_BUTT && if( m_ID_current_state == ID_TRACK_BUTT &&
GetScreen()->m_Active_Layer <= CMP_N ) GetScreen()->m_Active_Layer <= CMP_N )
{ {
bool ItemFree = (GetScreen()->m_CurrentItem == NULL ) || bool ItemFree = (GetScreen()->m_CurrentItem == NULL ) ||
(GetScreen()->m_CurrentItem->m_Flags == 0); (GetScreen()->m_CurrentItem->m_Flags == 0);
if ( ItemFree ) if ( ItemFree )
{ {
//no track is currently being edited - select a segment and remove it. //no track is currently being edited - select a segment and remove it.
DrawStruct = PcbGeneralLocateAndDisplay(); DrawStruct = PcbGeneralLocateAndDisplay();
//don't let backspace delete modules!! //don't let backspace delete modules!!
if ( DrawStruct && (DrawStruct->m_StructType == TYPETRACK if ( DrawStruct && (DrawStruct->m_StructType == TYPETRACK
|| DrawStruct->m_StructType == TYPEVIA)) || DrawStruct->m_StructType == TYPEVIA))
Delete_Segment(DC, (TRACK*)DrawStruct); Delete_Segment(DC, (TRACK*)DrawStruct);
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
else if ( GetScreen()->m_CurrentItem->m_StructType == TYPETRACK ) else if ( GetScreen()->m_CurrentItem->m_StructType == TYPETRACK )
{ {
//then an element is being edited - remove the last segment. //then an element is being edited - remove the last segment.
GetScreen()->m_CurrentItem = GetScreen()->m_CurrentItem =
Delete_Segment(DC, (TRACK*)GetScreen()->m_CurrentItem); Delete_Segment(DC, (TRACK*)GetScreen()->m_CurrentItem);
GetScreen()->SetModify(); GetScreen()->SetModify();
} }
} }
break; break;
}
case WXK_END:
DrawPanel->MouseToCursorSchema();
End_Route( (TRACK *) (GetScreen()->m_CurrentItem), DC);
break;
case (int('f') + GR_KB_CTRL) :
case (int('F') + GR_KB_CTRL) :
case 1030:{ // f = letter 6 in the alphabet + 1024 = 1030
wxCommandEvent evt;
evt.SetId(ID_FIND_ITEMS);
Process_Special_Functions(evt);
} }
break;
case WXK_END:
case 'v': // Switch to alternate layer and Place a via if a track is in progress DrawPanel->MouseToCursorSchema();
case 'V': End_Route( (TRACK *) (GetScreen()->m_CurrentItem), DC);
if ( m_ID_current_state != ID_TRACK_BUTT ) return; break;
if ( ItemFree )
{
Other_Layer_Route( NULL, DC);
break;
}
if ( GetScreen()->m_CurrentItem->m_StructType != TYPETRACK )
return;
if ( (GetScreen()->m_CurrentItem->m_Flags & IS_NEW) == 0 )
return;
Other_Layer_Route( (TRACK *) GetScreen()->m_CurrentItem, DC);
if ( DisplayOpt.ContrastModeDisplay )
GetScreen()->SetRefreshReq();
break;
case 'o': case 'V': // Switch to alternate layer and Place a via if a track is in progress
case 'O': if ( m_ID_current_state != ID_TRACK_BUTT ) return;
case (int('o') + GR_KB_CTRL) : if ( ItemFree )
case (int('O') + GR_KB_CTRL) : {
case 1039: //o is the 15th letter in the alphabet + 1024 = 1039 Other_Layer_Route( NULL, DC);
if( hotkey & GR_KB_CTRL ){ break;
//try not to duplicate save, load code etc. }
wxCommandEvent evt; if ( GetScreen()->m_CurrentItem->m_StructType != TYPETRACK )
evt.SetId(ID_LOAD_FILE); return;
Files_io(evt); if ( (GetScreen()->m_CurrentItem->m_Flags & IS_NEW) == 0 )
} return;
break; Other_Layer_Route( (TRACK *) GetScreen()->m_CurrentItem, DC);
case 'r': // Rotation if ( DisplayOpt.ContrastModeDisplay )
case 'R': GetScreen()->SetRefreshReq();
if ( ItemFree ) break;
module = Locate_Prefered_Module(m_Pcb,
CURSEUR_ON_GRILLE | IGNORE_LOCKED | MATCH_LAYER );
else if (GetScreen()->m_CurrentItem->m_StructType == TYPEMODULE)
{
module = (MODULE*)GetScreen()->m_CurrentItem;
// @todo: might need to add a layer check in if() below
if( module->IsLocked() )
module = 0; // do not move it.
}
if ( module )
{
GetScreen()->m_CurrentItem = module;
module->Display_Infos(this);
Rotate_Module(DC, module, 900, TRUE);
}
break;
case 's': // move to other side // Footprint edition:
case 'S': case 'L': // toggle module "MODULE_is_LOCKED" status:
case (int('s') + GR_KB_CTRL) : // get any module, locked or not locked and toggle its locked status
case (int('S') + GR_KB_CTRL) :
case 1043: //as before, 19th letter..
if( hotkey & GR_KB_CTRL ){
//try not to duplicate save, load code etc.
wxCommandEvent evt;
evt.SetId(ID_SAVE_BOARD);
Files_io(evt);
}else{
if ( ItemFree ) if ( ItemFree )
module = Locate_Prefered_Module( m_Pcb, CURSEUR_ON_GRILLE | MATCH_LAYER );
else if (GetScreen()->m_CurrentItem->m_StructType == TYPEMODULE)
module = (MODULE*)GetScreen()->m_CurrentItem;
if( module )
{
GetScreen()->m_CurrentItem = module;
module->SetLocked( !module->IsLocked() );
module->Display_Infos(this);
}
break;
case 'G': // Start move (and drag) module
case 'M': // Start move module
if ( PopupOn ) break;
case 'R': // Rotation
case 'S': // move to other side
if ( ItemFree )
{
module = Locate_Prefered_Module(m_Pcb, module = Locate_Prefered_Module(m_Pcb,
CURSEUR_ON_GRILLE | IGNORE_LOCKED | MATCH_LAYER ); CURSEUR_ON_GRILLE | IGNORE_LOCKED | MATCH_LAYER );
if ( module == NULL ) // no footprint found
{
module = Locate_Prefered_Module(m_Pcb, CURSEUR_ON_GRILLE );
if ( module ) // a footprint is found, but locked or on an other layer
{
if ( module->IsLocked() ) DisplayInfo(this, _("Footprint found, but locked") );
else DisplayInfo(this, _("Footprint found, but not on this layer") );
module = NULL;
}
}
}
else if (GetScreen()->m_CurrentItem->m_StructType == TYPEMODULE) else if (GetScreen()->m_CurrentItem->m_StructType == TYPEMODULE)
{ {
module = (MODULE*)GetScreen()->m_CurrentItem; module = (MODULE*)GetScreen()->m_CurrentItem;
// @todo: might need to add a layer check in if() below // @todo: might need to add a layer check in if() below
if( module->IsLocked() ) if ( (GetScreen()->m_CurrentItem->m_Flags == 0) &&
module = 0; // do not move it. module->IsLocked() )
module = NULL; // do not move, rotate ... it.
} }
if ( module ) if ( module == NULL) break;
GetScreen()->m_CurrentItem = module;
switch (hotkey)
{ {
GetScreen()->m_CurrentItem = module; case 'R': // Rotation
module->Display_Infos(this); Rotate_Module(DC, module, 900, TRUE);
Change_Side_Module(module, DC); break;
}
}
break;
case 'L': // toggle module "MODULE_is_LOCKED" status:
case 'l':
// get any module, locked or not locked and toggle its locked status
module = Locate_Prefered_Module( m_Pcb, CURSEUR_ON_GRILLE | MATCH_LAYER );
if( module )
{
GetScreen()->m_CurrentItem = module;
module->SetLocked( !module->IsLocked() );
module->Display_Infos(this);
}
break;
case 'g':
case 'G': // Start move (and drag) module
g_Drag_Pistes_On = TRUE;
// fall through
case 'm': case 'S': // move to other side
case 'M': // Start move module Change_Side_Module(module, DC);
if ( PopupOn ) break; break;
module = Locate_Prefered_Module( m_Pcb,
CURSEUR_ON_GRILLE | IGNORE_LOCKED | MATCH_LAYER ); case 'G': // Start move (and drag) module
if( module ) g_Drag_Pistes_On = TRUE;
{ // fall through
GetScreen()->m_CurrentItem = module; case 'M': // Start move module
module->Display_Infos(this); StartMove_Module( module, DC);
StartMove_Module( module, DC); break;
} }
break; module->Display_Infos(this);
break;
} }
} }
......
pcbnew/pcbnew.h
View file @ f7d85eca
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
est le curseur sur grille ou le curseur a deplacement fin hors grille */ est le curseur sur grille ou le curseur a deplacement fin hors grille */
#define CURSEUR_ON_GRILLE (0<<0) #define CURSEUR_ON_GRILLE (0<<0)
#define CURSEUR_OFF_GRILLE (1<<0) #define CURSEUR_OFF_GRILLE (1<<0)
#define IGNORE_LOCKED (1<<1) ///< if module is locked, do not select for single module operation #define IGNORE_LOCKED (1<<1) ///< if module is locked, do not select for single module operation
#define MATCH_LAYER (1<<2) ///< if module not on current layer, do not select #define MATCH_LAYER (1<<2) ///< if module not on current layer, do not select
#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
......
pcbnew/tool_pcb.cpp
View file @ f7d85eca
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
/* Data to build the layer pair indicator button */ /* Data to build the layer pair indicator button */
static wxBitmap * LayerPairBitmap = NULL; static wxBitmap * LayerPairBitmap = NULL;
static char s_BitmapLayerIcon[16][16] = { static char s_BitmapLayerIcon[16][16] = {
// 0 = draw pixel with active layer color
// 1 = draw pixel with top layer color (top/bottom layer used in autoroute and place via)
// 2 = draw pixel with bottom layer color
// 3 = draw pixel with via color
{0,0,0,0,0,0,0,3,3,3,1,1,1,1,0,0}, {0,0,0,0,0,0,0,3,3,3,1,1,1,1,0,0},
{0,0,0,0,0,0,3,3,3,3,3,1,1,0,0,0}, {0,0,0,0,0,0,3,3,3,3,3,1,1,0,0,0},
{0,0,0,0,0,3,3,0,1,1,3,3,0,0,0,0}, {0,0,0,0,0,3,3,0,1,1,3,3,0,0,0,0},
...@@ -116,7 +120,7 @@ bool change = false; ...@@ -116,7 +120,7 @@ bool change = false;
LayerPairBitmap = new wxBitmap(16, 16); LayerPairBitmap = new wxBitmap(16, 16);
} }
/* Draw the icon, witj colors according to the active layer and layer pairs for /* Draw the icon, with colors according to the active layer and layer pairs for
via command (change layer) */ via command (change layer) */
wxMemoryDC iconDC; wxMemoryDC iconDC;
iconDC.SelectObject( *LayerPairBitmap ); iconDC.SelectObject( *LayerPairBitmap );
......
running_kicad_under_W98.txt
View file @ f7d85eca
Since the 2007-05-25 version, Kicad (which used unicode strings) can run under W98, Since the 2007-05-25 version, Kicad (which uses unicode strings) can run under W98,
if the library unicows.dll is found by kicad. if the library unicows.dll is found by kicad.
If you want to use kicad you must download unicows.dll, If you want to use kicad you must download unicows.dll,
......
version.txt 0 → 100644
View file @ f7d85eca
release version:
25 jun 2007
files (.zip,.tgz):
kicad-2007-06-25
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