Skip to content

K
kicad-source-mirror
Commit 24ce9409 authored by charras's avatar charras
Browse files
Options

more about Netclasses work

parent 9b4d215b
Show whitespace changes
Inline Side-by-side
Showing with 1138 additions and 1135 deletions
include/wxPcbStruct.h
View file @ 24ce9409
......@@ -51,11 +51,11 @@ class GENERAL_COLLECTORS_GUIDE;
class WinEDA_PcbFrame: public WinEDA_BasePcbFrame
{
public:
WinEDAChoiceBox* m_SelLayerBox;
WinEDAChoiceBox* m_SelTrackWidthBox;
wxTextCtrl* m_ClearanceBox;
wxTextCtrl* m_NetClassSelectedBox;
WinEDAChoiceBox* m_SelViaSizeBox;
WinEDAChoiceBox* m_SelLayerBox; // a combo box to display and select active layer
WinEDAChoiceBox* m_SelTrackWidthBox; // a combo box to display and select current track width
WinEDAChoiceBox* m_SelViaSizeBox; // a combo box to display and select current via diameter
wxTextCtrl* m_ClearanceBox; // a text ctrl to display the current tracks and vias clearance
wxTextCtrl* m_NetClassSelectedBox; // a text ctrl to display the current NetClass
private:
bool m_TrackAndViasSizesList_Changed;
......@@ -90,6 +90,7 @@ public:
void OnCloseWindow( wxCloseEvent& Event );
void Process_Special_Functions( wxCommandEvent& event );
void Tracks_and_Vias_Size_Event( wxCommandEvent& event );
void ProcessMuWaveFunctions( wxCommandEvent& event );
void MuWaveCommand( wxDC* DC, const wxPoint& MousePos );
......@@ -388,7 +389,6 @@ public:
// Track and via edition:
void Via_Edit_Control( wxCommandEvent& event );
void DisplayTrackSettings();
/**
* Function Other_Layer_Route
......
internat/fr/kicad.mo
View file @ 24ce9409
No preview for this file type
internat/fr/kicad.po
View file @ 24ce9409
......@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-09-29 12:18+0100\n"
"PO-Revision-Date: 2009-09-29 12:23+0100\n"
"POT-Creation-Date: 2009-10-02 18:07+0100\n"
"PO-Revision-Date: 2009-10-02 18:08+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
......@@ -758,39 +758,50 @@ msgstr "Création de stub (arc) de longueur spécifiée (pour applications micro
msgid "Create a polynomial shape for microwave applications"
msgstr "Création de formes polynomiales (pour applications micro-ondes)"
#: pcbnew/tool_pcb.cpp:573
#: pcbnew/tool_pcb.cpp:581
msgid "Current NetClass clearance value"
msgstr "Valeur isolation NetClass courante"
#: pcbnew/tool_pcb.cpp:578
msgid ""
"Auto track width: when starting on an existing track use its width\n"
"otherwise, use current width setting"
#: pcbnew/tool_pcb.cpp:590
msgid "Name of the current NetClass"
msgstr "Nom de la NetClass courante"
#: pcbnew/tool_pcb.cpp:598
msgid "Strategy selection for tracks widths and vias diameters:\n"
msgstr ""
#: pcbnew/tool_pcb.cpp:599
msgid "Normal: use NetClass values\n"
msgstr ""
#: pcbnew/tool_pcb.cpp:600
#, fuzzy
msgid "Auto: when starting a track on an existing track use its width.O therwise, use NetClass value\n"
msgstr ""
"Largeur de piste automatique: si on démarre sur une piste existante, utiliser sa largeur\n"
" sinon utiliser la largeur courante"
#: pcbnew/tool_pcb.cpp:595
msgid "Name of the current NetClass"
msgstr "Nom de la NetClass courante"
#: pcbnew/tool_pcb.cpp:601
msgid "Manual: use selected values"
msgstr ""
#: pcbnew/tool_pcb.cpp:611
#: pcbnew/tool_pcb.cpp:618
msgid "Auto"
msgstr "Auto"
#: pcbnew/tool_pcb.cpp:615
#: pcbnew/tool_pcb.cpp:622
msgid "Zoom "
msgstr "Zoom "
#: pcbnew/tool_pcb.cpp:635
#: pcbnew/tool_pcb.cpp:642
msgid "Grid"
msgstr "Grille"
#: pcbnew/tool_pcb.cpp:653
#: pcbnew/tool_pcb.cpp:660
msgid "User Grid"
msgstr "Grille perso"
#: pcbnew/tool_pcb.cpp:764
#: pcbnew/tool_pcb.cpp:769
msgid "+/- to switch"
msgstr "+/- pour commuter"
......@@ -1511,19 +1522,19 @@ msgstr "Forme X"
msgid "Target Shape:"
msgstr "Forme Mire:"
#: pcbnew/pcbframe.cpp:303
#: pcbnew/pcbframe.cpp:302
msgid "Board modified, Save before exit ?"
msgstr "Circuit Imprimé modifié, Sauver avant de quitter ?"
#: pcbnew/pcbframe.cpp:304
#: pcbnew/pcbframe.cpp:303
msgid "Confirmation"
msgstr "Confirmation"
#: pcbnew/pcbframe.cpp:352
#: pcbnew/pcbframe.cpp:351
msgid "3D Frame already opened"
msgstr "Fenêtre 3D déjà ouverte"
#: pcbnew/pcbframe.cpp:356
#: pcbnew/pcbframe.cpp:355
msgid "3D Viewer"
msgstr "Visu 3D"
......@@ -1673,44 +1684,44 @@ msgstr "Ok pour charger le fichier de secours"
msgid "Board Modified: Continue ?"
msgstr "Circuit imprimé modifié, Continuer ?"
#: pcbnew/files.cpp:167
#: pcbnew/files.cpp:166
msgid "Open Board File"
msgstr "Ouvrir Fichier C.I."
#: pcbnew/files.cpp:190
#: pcbnew/files.cpp:189
#, c-format
msgid "File <%s> not found"
msgstr " fichier %s non trouvé"
#: pcbnew/files.cpp:210
#: pcbnew/files.cpp:209
msgid "This file was created by a more recent version of PCBnew and may not load correctly. Please consider updating!"
msgstr "Ce fichier a été créé par une version plus récente de PCBnew et peut être incorrectement chargé. SVP penser à une mise à jour!"
#: pcbnew/files.cpp:215
#: pcbnew/files.cpp:214
msgid "This file was created by an older version of PCBnew. It will be stored in the new file format when you save this file again."
msgstr "Ce fichier a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: pcbnew/files.cpp:308
#: pcbnew/files.cpp:307
msgid "Save Board File"
msgstr "Sauver Fichier C.I."
#: pcbnew/files.cpp:342
#: pcbnew/files.cpp:341
msgid "Warning: unable to create backup file "
msgstr "Attention: impossible de créer un fichier backup "
#: pcbnew/files.cpp:359
#: pcbnew/files.cpp:358
msgid "Unable to create "
msgstr "Impossible de créer "
#: pcbnew/files.cpp:378
#: pcbnew/files.cpp:377
msgid "Backup file: "
msgstr "Fichier backup: "
#: pcbnew/files.cpp:382
#: pcbnew/files.cpp:381
msgid "Wrote board file: "
msgstr "Ecriture fichier CI: "
#: pcbnew/files.cpp:384
#: pcbnew/files.cpp:383
msgid "Failed to create "
msgstr "Impossible de créer fichier "
......@@ -3488,27 +3499,27 @@ msgstr "Autoplace modules: Pas de contours sur pcb. Impossible de placer les mod
msgid "This is the default net class."
msgstr "Ceci est la Netclass par défaut"
#: pcbnew/class_board.cpp:548
#: pcbnew/class_board.cpp:575
msgid "Vias"
msgstr "Vias"
#: pcbnew/class_board.cpp:551
#: pcbnew/class_board.cpp:578
msgid "Nodes"
msgstr "Nodes"
#: pcbnew/class_board.cpp:554
#: pcbnew/class_board.cpp:581
msgid "Nets"
msgstr "Nets"
#: pcbnew/class_board.cpp:562
#: pcbnew/class_board.cpp:589
msgid "Links"
msgstr "Liens"
#: pcbnew/class_board.cpp:565
#: pcbnew/class_board.cpp:592
msgid "Connect"
msgstr "Connect"
#: pcbnew/class_board.cpp:568
#: pcbnew/class_board.cpp:595
msgid "NoConn"
msgstr "Non Conn"
......@@ -4428,49 +4439,49 @@ msgstr "Le PCB peut être corrompu. Ne pas le sauver"
msgid "Fix problem and try again."
msgstr "Fixer le problème et recommencer."
#: pcbnew/specctra_import.cpp:129
#: pcbnew/specctra_import.cpp:128
msgid "Session file imported and merged OK."
msgstr "Fichier Session importé et fusionné correctement."
#: pcbnew/specctra_import.cpp:204
#: pcbnew/specctra_import.cpp:312
#: pcbnew/specctra_import.cpp:203
#: pcbnew/specctra_import.cpp:311
#, c-format
msgid "Session file uses invalid layer id \"%s\""
msgstr "Le Fichier Session utilise une couche invalide n° \"%s\""
#: pcbnew/specctra_import.cpp:254
#: pcbnew/specctra_import.cpp:253
msgid "Session via padstack has no shapes"
msgstr "Dans le fichier Session une via n'a pas de forme"
#: pcbnew/specctra_import.cpp:261
#: pcbnew/specctra_import.cpp:279
#: pcbnew/specctra_import.cpp:303
#: pcbnew/specctra_import.cpp:260
#: pcbnew/specctra_import.cpp:278
#: pcbnew/specctra_import.cpp:302
#, c-format
msgid "Unsupported via shape: \"%s\""
msgstr "Forme via non supportée: \"%s\""
#: pcbnew/specctra_import.cpp:360
#: pcbnew/specctra_import.cpp:359
msgid "Session file is missing the \"session\" section"
msgstr "Manque dans le Fichier Session file la section \"session\""
#: pcbnew/specctra_import.cpp:363
#: pcbnew/specctra_import.cpp:362
msgid "Session file is missing the \"placement\" section"
msgstr "Manque dans le Fichier Session file la section \"placement\""
#: pcbnew/specctra_import.cpp:366
#: pcbnew/specctra_import.cpp:365
msgid "Session file is missing the \"routes\" section"
msgstr "Manque dans le Fichier Session file la section \"routes\""
#: pcbnew/specctra_import.cpp:369
#: pcbnew/specctra_import.cpp:368
msgid "Session file is missing the \"library_out\" section"
msgstr "Manque dans le Fichier Session file la section \"library_out\""
#: pcbnew/specctra_import.cpp:395
#: pcbnew/specctra_import.cpp:394
#, c-format
msgid "Session file has 'reference' to non-existent component \"%s\""
msgstr "Le fichier Session a une 'reference' à un composant non existant \"%s\""
#: pcbnew/specctra_import.cpp:539
#: pcbnew/specctra_import.cpp:538
#, c-format
msgid "A wire_via references a missing padstack \"%s\""
msgstr "Une piste ou via a une référence vers un pad \"%s\" manquant"
......@@ -5118,79 +5129,79 @@ msgstr " mm"
msgid "NetClass: "
msgstr "NetClass: "
#: pcbnew/toolbars_update_user_interface.cpp:186
#: pcbnew/toolbars_update_user_interface.cpp:187
msgid "DRC Off (Disable !!!), Currently: DRC is active"
msgstr "DRC off (désactivée !!!), actuellement DRC active"
#: pcbnew/toolbars_update_user_interface.cpp:187
#: pcbnew/toolbars_update_user_interface.cpp:188
msgid "DRC On (Currently: DRC is inactive !!!)"
msgstr "DRC On (Actuellement, DRC désactivée !!!)"
#: pcbnew/toolbars_update_user_interface.cpp:198
#: pcbnew/toolbars_update_user_interface.cpp:199
msgid "Polar coords not show"
msgstr "Coord Polaires non affichées"
#: pcbnew/toolbars_update_user_interface.cpp:199
#: pcbnew/toolbars_update_user_interface.cpp:200
msgid "Display polar coords"
msgstr "Affichage coord Polaires"
#: pcbnew/toolbars_update_user_interface.cpp:204
#: pcbnew/toolbars_update_user_interface.cpp:205
msgid "Show grid"
msgstr "Afficher grille"
#: pcbnew/toolbars_update_user_interface.cpp:213
#: pcbnew/toolbars_update_user_interface.cpp:214
msgid "Hide general ratsnest"
msgstr "Ne pas afficher le chevelu général"
#: pcbnew/toolbars_update_user_interface.cpp:214
#: pcbnew/toolbars_update_user_interface.cpp:215
msgid "Show general ratsnest"
msgstr "Afficher le chevelu général"
#: pcbnew/toolbars_update_user_interface.cpp:220
#: pcbnew/toolbars_update_user_interface.cpp:221
msgid "Hide module ratsnest"
msgstr "Ne pas montrer le chevelu du module"
#: pcbnew/toolbars_update_user_interface.cpp:221
#: pcbnew/toolbars_update_user_interface.cpp:222
msgid "Show module ratsnest"
msgstr "Montrer le chevelu du module"
#: pcbnew/toolbars_update_user_interface.cpp:228
#: pcbnew/toolbars_update_user_interface.cpp:229
msgid "Disable auto delete old track"
msgstr "Ne pas Autoriser l'effacement automatique des pistes"
#: pcbnew/toolbars_update_user_interface.cpp:229
#: pcbnew/toolbars_update_user_interface.cpp:230
msgid "Enable auto delete old track"
msgstr "Autoriser l'effacement automatique des pistes"
#: pcbnew/toolbars_update_user_interface.cpp:236
#: pcbnew/toolbars_update_user_interface.cpp:237
msgid "Show pads sketch mode"
msgstr "Afficher pastilles en mode contour"
#: pcbnew/toolbars_update_user_interface.cpp:244
#: pcbnew/toolbars_update_user_interface.cpp:245
msgid "Show vias sketch mode"
msgstr "Afficher vias en mode contour"
#: pcbnew/toolbars_update_user_interface.cpp:252
#: pcbnew/toolbars_update_user_interface.cpp:253
msgid "Show tracks sketch mode"
msgstr "Afficher pistes en mode contour"
#: pcbnew/toolbars_update_user_interface.cpp:253
#: pcbnew/toolbars_update_user_interface.cpp:254
msgid "Show tracks filled mode"
msgstr "Afficher pistes en mode plein"
#: pcbnew/toolbars_update_user_interface.cpp:259
#: pcbnew/toolbars_update_user_interface.cpp:260
msgid "Normal contrast mode display"
msgstr "Mode d'affichage contraste normal"
#: pcbnew/toolbars_update_user_interface.cpp:260
#: pcbnew/toolbars_update_user_interface.cpp:261
msgid "High contrast mode display"
msgstr "Mode d'affichage haut contraste"
#: pcbnew/toolbars_update_user_interface.cpp:265
#: pcbnew/toolbars_update_user_interface.cpp:266
msgid "Show invisible text"
msgstr "Montrer textes invisibles"
#: pcbnew/toolbars_update_user_interface.cpp:266
#: pcbnew/toolbars_update_user_interface.cpp:267
msgid "Hide invisible text"
msgstr "Cacher textes invisibles"
......@@ -5433,7 +5444,7 @@ msgstr "Y pos"
msgid "Track Width: %s Vias Size : %s"
msgstr "Larg. piste: %s Diam Vias : %s"
#: pcbnew/editrack-part2.cpp:133
#: pcbnew/editrack-part2.cpp:132
msgid "Drc error, cancelled"
msgstr "Erreur DRC, annulation"
......@@ -6031,168 +6042,6 @@ msgstr "Afficher autres éléments"
msgid "Show page limits"
msgstr " Afficher limites de page"
#: eeschema/libedit.cpp:30
msgid "Component Library Editor: "
msgstr "Editeur de Composants"
#: eeschema/libedit.cpp:35
msgid "no library selected"
msgstr "Pas de librairie sélectionnée"
#: eeschema/libedit.cpp:71
msgid ""
"Current part not saved.\n"
"\n"
"Discard current changes?"
msgstr ""
"Composant courant non sauvé.\n"
"\n"
"Perdre les changements en cours ?"
#: eeschema/libedit.cpp:101
#, c-format
msgid "Component or alias name \"%s\" not found in library \"%s\"."
msgstr "Composant ou alias \"%s\" non trouvé en librairie \"%s\"."
#: eeschema/libedit.cpp:170
#, c-format
msgid "Could not create copy of part <%s> in library <%s>."
msgstr "Ne peut créer une copie de l'élément <%s> en librairie <%s>."
#: eeschema/libedit.cpp:251
msgid "Include last component changes?"
msgstr "Inclure les dernières modifications du composant"
#: eeschema/libedit.cpp:263
msgid "Modify library file \""
msgstr "Modifier le fichier Librairie \""
#: eeschema/libedit.cpp:263
msgid "\"?"
msgstr "\"?"
#: eeschema/libedit.cpp:274
msgid "Error while saving library file \""
msgstr "Erreur en sauvant le fichier librairie \""
#: eeschema/libedit.cpp:275
msgid "\"."
msgstr "\"."
#: eeschema/libedit.cpp:281
msgid "Library file \""
msgstr "Fichier librairie \""
#: eeschema/libedit.cpp:283
msgid "Document file \""
msgstr "Fichier de doc \""
#: eeschema/libedit.cpp:306
msgid "Part"
msgstr "Part"
#: eeschema/libedit.cpp:318
msgid "Alias"
msgstr "Alias"
#: eeschema/libedit.cpp:323
msgid "Unit"
msgstr "Unité"
#: eeschema/libedit.cpp:326
msgid "Convert"
msgstr "Convert"
#: eeschema/libedit.cpp:330
msgid "Body"
msgstr "Body"
#: eeschema/libedit.cpp:333
msgid "Power Symbol"
msgstr "Symbole d'Alimentation"
#: eeschema/libedit.cpp:335
msgid "Component"
msgstr "Composant"
#: eeschema/libedit.cpp:344
msgid "Description"
msgstr "Description"
#: eeschema/libedit.cpp:351
msgid "Key words"
msgstr "Mots clé"
#: eeschema/libedit.cpp:385
msgid "Please select a component library."
msgstr "SVP sélectionner une librairie de composants."
#: eeschema/libedit.cpp:394
#, c-format
msgid "Component library <%s> is empty."
msgstr "Fichier librairie de composants <%s> vide"
#: eeschema/libedit.cpp:396
msgid "Delete Entry Error"
msgstr "Erreur en suppression d'élément"
#: eeschema/libedit.cpp:401
#, c-format
msgid ""
"Select 1 of %d components to delete\n"
"from library <%s>."
msgstr ""
"Selection 1 de %d composants a supprimer\n"
"de la librairie <%s>."
#: eeschema/libedit.cpp:405
msgid "Delete Component"
msgstr "Suppression Composant"
#: eeschema/libedit.cpp:414
#, c-format
msgid "Entry <%s> not found in library <%s>."
msgstr "Element <%s> non trouvé en librairie <%s>."
#: eeschema/libedit.cpp:421
#, c-format
msgid "Delete component \"%s\" from library \"%s\"?"
msgstr "Supprimer composant \"%s\" de la librairie \"%s\"?"
#: eeschema/libedit.cpp:441
msgid "The component being deleted has been modified. All changes will be lost. Discard changes?"
msgstr ""
#: eeschema/libedit.cpp:498
msgid ""
"All changes to the current component will be lost!\n"
"\n"
"Clear the current component from the screen?"
msgstr ""
#: eeschema/libedit.cpp:522
#, c-format
msgid "Component \"%s\" already exists in library \"%s\"."
msgstr "Composant \"%s\" déjà existant en librairie \"%s\"."
#: eeschema/libedit.cpp:571
msgid "No component to save."
msgstr "Pas de composant à sauver."
#: eeschema/libedit.cpp:580
msgid "No library specified."
msgstr "Pas de librairie spécifiée."
#: eeschema/libedit.cpp:590
#, c-format
msgid "Component \"%s\" exists. Change it?"
msgstr "Le composant \" %s\" existe, Le changer ?"
#: eeschema/libedit.cpp:608
#, c-format
msgid "Component %s saved in library %s"
msgstr "Composant %s sauvé en librairie %s"
#: eeschema/plotdxf.cpp:155
msgid "Plot Options:"
msgstr "Options de Tracé:"
......@@ -6278,6 +6127,28 @@ msgstr "Pin de Feuille de Hiérarchie"
msgid "No New Hierarchal Label found"
msgstr "Pas de nouveau Label Hiérarchique trouvé"
#: eeschema/netlist.cpp:92
msgid "List"
msgstr "Liste"
#: eeschema/netlist.cpp:110
msgid "NbItems"
msgstr "NbItems"
#: eeschema/netlist.cpp:218
#: eeschema/netlist.cpp:262
#: eeschema/netlist.cpp:283
msgid "Done"
msgstr "Fini"
#: eeschema/netlist.cpp:224
msgid "Labels"
msgstr "Labels"
#: eeschema/netlist.cpp:266
msgid "Hierar."
msgstr "Hiérar."
#: eeschema/backanno.cpp:137
msgid "Load Stuff File"
msgstr "Charger Fichier d'échange"
......@@ -6441,6 +6312,19 @@ msgstr "Erreur. Vous devez entrer une ligne de commande"
msgid "Error. You must provide a Title"
msgstr "Erreur. Vous devez entrer un titre"
#: eeschema/getpart.cpp:98
#, c-format
msgid "component selection (%d items loaded):"
msgstr "Sélection Composant (%d items chargés):"
#: eeschema/getpart.cpp:169
msgid "Failed to find part "
msgstr "Impossible de trouver le composant "
#: eeschema/getpart.cpp:169
msgid " in library"
msgstr " en librairie"
#: eeschema/menubar.cpp:42
msgid "&New"
msgstr "&Nouveau"
......@@ -6777,27 +6661,6 @@ msgstr "Format de la feuille:"
msgid "Default Line Width"
msgstr "Epaiss. ligne par défaut"
#: eeschema/viewlibs.cpp:108
msgid "Library browser"
msgstr "Visualisateur des librairies"
#: eeschema/viewlibs.cpp:115
msgid "none selected"
msgstr "Pas de sélection"
#: eeschema/getpart.cpp:99
#, c-format
msgid "component selection (%d items loaded):"
msgstr "Sélection Composant (%d items chargés):"
#: eeschema/getpart.cpp:170
msgid "Failed to find part "
msgstr "Impossible de trouver le composant "
#: eeschema/getpart.cpp:170
msgid " in library"
msgstr " en librairie"
#: eeschema/schedit.cpp:187
msgid "Push/Pop Hierarchy"
msgstr "Naviger dans Hiérarchie"
......@@ -6807,6 +6670,7 @@ msgid "Add NoConnect Flag"
msgstr "Ajoutde symboles de non connexion"
#: eeschema/schedit.cpp:195
#: eeschema/hotkeys.cpp:324
msgid "Add Wire"
msgstr "Ajouter Fils"
......@@ -6851,6 +6715,7 @@ msgid "Import PinSheet"
msgstr "Importer Connecteur de hiérarchie"
#: eeschema/schedit.cpp:247
#: eeschema/hotkeys.cpp:299
msgid "Add Component"
msgstr "Ajout Composant"
......@@ -6863,81 +6728,10 @@ msgstr "Ajouter Alims"
msgid "An error occurrred attempting to save component library <%s>."
msgstr "Une erreur s'est produite lors de la sauvegarde de la librairie de composants <%s>."
#: eeschema/libframe.cpp:230
msgid ""
"Component was modified!\n"
"Discard changes?"
msgstr ""
"Le composant a été modifié\n"
"Perdre les changements"
#: eeschema/libframe.cpp:244
#, c-format
msgid ""
"Library \"%s\" was modified!\n"
"Discard changes?"
msgstr ""
"Librairie \"%s\" modifiée!\n"
"Perdre les changements ?"
#: eeschema/libframe.cpp:354
#, c-format
msgid "Part %c"
msgstr "Composant %c"
#: eeschema/libframe.cpp:617
msgid "Add pin"
msgstr "Addition de \"pins\""
#: eeschema/libframe.cpp:621
msgid "Set pin options"
msgstr "Choix options de pin"
#: eeschema/libframe.cpp:643
msgid "Add rectangle"
msgstr "Ajout de rectangle"
#: eeschema/libframe.cpp:647
msgid "Add circle"
msgstr "Ajout de cercle"
#: eeschema/libframe.cpp:651
msgid "Add arc"
msgstr "Ajout d'arc"
#: eeschema/libframe.cpp:655
msgid "Add line"
msgstr "Addition de lignes"
#: eeschema/libframe.cpp:659
msgid "Set anchor position"
msgstr "Ajuster Position Ancre"
#: eeschema/libframe.cpp:669
msgid "Export"
msgstr "Exporter"
#: eeschema/libfield.cpp:161
msgid "Edit field"
msgstr "Editer Champ"
#: eeschema/libfield.cpp:176
#, c-format
msgid ""
"The field name <%s> is an existing alias of the component <%s>.\n"
"Please choose another name that does not conflict with any names in the alias list."
msgstr ""
#: eeschema/libfield.cpp:190
#, c-format
msgid ""
"The field name <%s> conflicts with an existing entry in the component library <%s>.\n"
"Please choose another name that does not conflict with any library entries."
msgstr ""
#: eeschema/libfield.cpp:212
msgid "No new text: no change"
msgstr "Pas de nouveau texte: pas de changements"
#: eeschema/netform.cpp:65
#: eeschema/netform.cpp:273
msgid "Failed to create file "
msgstr "Impossible de créer le fichier "
#: eeschema/erc.cpp:199
msgid "Duplicate Sheet name"
......@@ -7019,30 +6813,6 @@ msgstr ""
"\n"
" >> Erreurs ERC: %d\n"
#: eeschema/class_sch_component.cpp:135
msgid "U"
msgstr "U"
#: eeschema/class_sch_component.cpp:1032
msgid "Ref"
msgstr "Ref"
#: eeschema/class_sch_component.cpp:1037
msgid "Pwr Symb"
msgstr "Symb Alim"
#: eeschema/class_sch_component.cpp:1039
msgid "Val"
msgstr "Val"
#: eeschema/class_sch_component.cpp:1043
msgid "RefLib"
msgstr "RefLib"
#: eeschema/class_sch_component.cpp:1047
msgid "Lib"
msgstr "Lib"
#: eeschema/eelayer.cpp:218
msgid "White"
msgstr "Blanc"
......@@ -7055,16 +6825,109 @@ msgstr "Noir"
msgid "Background Color:"
msgstr "Couleur du Fond:"
#: eeschema/symbdraw.cpp:683
#: eeschema/eeschema.cpp:117
msgid "Eeschema is already running, Continue?"
msgstr "Eeschema est en cours d'exécution. Continuer ?"
#: eeschema/libfield.cpp:160
msgid "Edit field"
msgstr "Editer Champ"
#: eeschema/libfield.cpp:175
#, c-format
msgid "Arc %.1f deg"
msgstr "Arc %.1f deg"
msgid ""
"The field name <%s> is an existing alias of the component <%s>.\n"
"Please choose another name that does not conflict with any names in the alias list."
msgstr ""
#: eeschema/libfield.cpp:189
#, c-format
msgid ""
"The field name <%s> conflicts with an existing entry in the component library <%s>.\n"
"Please choose another name that does not conflict with any library entries."
msgstr ""
#: eeschema/libfield.cpp:211
msgid "No new text: no change"
msgstr "Pas de nouveau texte: pas de changements"
#: eeschema/pinedit.cpp:25
#: eeschema/pinedit-dialog.cpp:240
msgid "line"
msgstr "Ligne"
#: eeschema/pinedit.cpp:25
#: eeschema/pinedit-dialog.cpp:241
msgid "invert"
msgstr "invert"
#: eeschema/pinedit.cpp:25
#: eeschema/pinedit-dialog.cpp:242
msgid "clock"
msgstr "clock"
#: eeschema/pinedit.cpp:25
#: eeschema/pinedit-dialog.cpp:243
msgid "clock inv"
msgstr "clock inv"
#: eeschema/pinedit.cpp:26
#: eeschema/pinedit-dialog.cpp:244
msgid "low in"
msgstr "low in"
#: eeschema/pinedit.cpp:26
#: eeschema/pinedit-dialog.cpp:245
msgid "low clock"
msgstr "low clock"
#: eeschema/pinedit.cpp:26
#: eeschema/pinedit-dialog.cpp:246
msgid "low out"
msgstr "low out"
#: eeschema/pinedit.cpp:209
msgid "This position is already occupied by another pin. Continue?"
msgstr "Position occupée par une autre pin. Continuer ?"
#: eeschema/pinedit.cpp:344
#: eeschema/pinedit.cpp:599
#, c-format
msgid "Initial pin position (%d, %d)"
msgstr ""
#: eeschema/pinedit.cpp:969
#, c-format
msgid "Duplicate pin %s at location (%d, %d) conflicts with pin %s at location (%d, %d)"
msgstr "Pin dupliquée %s en position (%d, %d) en conflit avec pin %s en position (%d, %d)"
#: eeschema/pinedit.cpp:979
#, c-format
msgid " in part %c"
msgstr " en composant %c"
#: eeschema/pinedit.cpp:986
msgid " of converted"
msgstr " de converti"
#: eeschema/pinedit.cpp:988
msgid " of normal"
msgstr " de normal"
#: eeschema/pinedit.cpp:999
msgid "No duplicate pins were found."
msgstr "Pas de pins doublées trouvéées"
#: eeschema/delsheet.cpp:44
#, c-format
msgid "Sheet %s (file %s) modified. Save it?"
msgstr "Feuille %s (fichier %s) modifiée. La sauver?"
#: eeschema/symbdraw.cpp:677
#, c-format
msgid "Arc %.1f deg"
msgstr "Arc %.1f deg"
#: eeschema/pinedit-dialog.cpp:153
msgid "Pin Name :"
msgstr "Nom de la pin :"
......@@ -7113,34 +6976,6 @@ msgstr "Bas"
msgid "Pin Orient:"
msgstr "Pin Orient:"
#: eeschema/pinedit-dialog.cpp:240
msgid "line"
msgstr "Ligne"
#: eeschema/pinedit-dialog.cpp:241
msgid "invert"
msgstr "invert"
#: eeschema/pinedit-dialog.cpp:242
msgid "clock"
msgstr "clock"
#: eeschema/pinedit-dialog.cpp:243
msgid "clock inv"
msgstr "clock inv"
#: eeschema/pinedit-dialog.cpp:244
msgid "low in"
msgstr "low in"
#: eeschema/pinedit-dialog.cpp:245
msgid "low clock"
msgstr "low clock"
#: eeschema/pinedit-dialog.cpp:246
msgid "low out"
msgstr "low out"
#: eeschema/pinedit-dialog.cpp:247
msgid "Pin Shape:"
msgstr "Forme Pin:"
......@@ -7173,32 +7008,54 @@ msgstr "Emetteur ouv."
msgid "Electrical Type:"
msgstr "Type électrique:"
#: eeschema/netform.cpp:63
#: eeschema/netform.cpp:271
msgid "Failed to create file "
msgstr "Impossible de créer le fichier "
#: eeschema/symbedit.cpp:48
msgid "Import Symbol Drawings"
msgstr "Importer Symbole de Dessin"
#: eeschema/netlist.cpp:92
msgid "List"
msgstr "Liste"
#: eeschema/symbedit.cpp:67
#, c-format
msgid "Failed to open Symbol File <%s>"
msgstr "Ne peut pas ouvrir fichier <%s>"
#: eeschema/netlist.cpp:110
msgid "NbItems"
msgstr "NbItems"
#: eeschema/symbedit.cpp:77
#, c-format
msgid "Error <%s> occurred loading symbol library <%s>."
msgstr "Erreur <%s> en chargeant la librairie symbole <%s>."
#: eeschema/netlist.cpp:218
#: eeschema/netlist.cpp:262
#: eeschema/netlist.cpp:283
msgid "Done"
msgstr "Fini"
#: eeschema/symbedit.cpp:89
#, c-format
msgid "No components found in symbol library <%s>."
msgstr "Pas deomposant trouvé en librairie de symboles <%s>."
#: eeschema/netlist.cpp:224
msgid "Labels"
msgstr "Labels"
#: eeschema/symbedit.cpp:96
msgid "Warning: more than 1 part in Symbol File"
msgstr "Attention: plus de 1élément dans le fichier symbole"
#: eeschema/netlist.cpp:266
msgid "Hierar."
msgstr "Hiérar."
#: eeschema/symbedit.cpp:149
msgid "Export Symbol Drawings"
msgstr "Exporter Symbole de Dessin"
#: eeschema/symbedit.cpp:175
#, c-format
msgid "Save Symbol in [%s]"
msgstr "Symbole sauvé en [%s]"
#: eeschema/selpart.cpp:26
msgid "No component libraries are loaded."
msgstr "Pas de librairies de composants chargées."
#: eeschema/selpart.cpp:32
#, c-format
msgid " Select 1 of %d libraries."
msgstr "Selection 1 parmi %d librairies."
#: eeschema/selpart.cpp:34
msgid "Select Library"
msgstr "Sélection Librairie"
#: eeschema/selpart.cpp:75
msgid "Select Component"
msgstr "Sélection Composant"
#: eeschema/eelibs_read_libraryfiles.cpp:60
msgid "\n"
......@@ -7227,10 +7084,30 @@ msgstr "Les librairies suivantes n'ont pas pu être trouvées:"
msgid "Deselect current tool"
msgstr "Désélection outil courant"
#: eeschema/tool_lib.cpp:43
#: eeschema/libframe.cpp:623
msgid "Add pin"
msgstr "Addition de \"pins\""
#: eeschema/tool_lib.cpp:47
msgid "Add graphic text"
msgstr "Addition de textes graphiques (commentaires)"
#: eeschema/tool_lib.cpp:51
#: eeschema/libframe.cpp:649
msgid "Add rectangle"
msgstr "Ajout de rectangle"
#: eeschema/tool_lib.cpp:55
#: eeschema/libframe.cpp:653
msgid "Add circle"
msgstr "Ajout de cercle"
#: eeschema/tool_lib.cpp:59
#: eeschema/libframe.cpp:657
msgid "Add arc"
msgstr "Ajout d'arc"
#: eeschema/tool_lib.cpp:63
msgid "Add lines and polygons"
msgstr "Addition de lignes ou polygones graphiques"
......@@ -7315,37 +7192,43 @@ msgstr "Editer fichier documentation"
msgid "Edit pins part per part ( Use carefully!)"
msgstr "Editer pins unité par unité (Utiliser en connaissance de cause)"
#: eeschema/symbedit.cpp:48
msgid "Import Symbol Drawings"
msgstr "Importer Symbole de Dessin"
#: eeschema/libframe.cpp:236
msgid ""
"Component was modified!\n"
"Discard changes?"
msgstr ""
"Le composant a été modifié\n"
"Perdre les changements"
#: eeschema/symbedit.cpp:67
#: eeschema/libframe.cpp:250
#, c-format
msgid "Failed to open Symbol File <%s>"
msgstr "Ne peut pas ouvrir fichier <%s>"
msgid ""
"Library \"%s\" was modified!\n"
"Discard changes?"
msgstr ""
"Librairie \"%s\" modifiée!\n"
"Perdre les changements ?"
#: eeschema/symbedit.cpp:77
#: eeschema/libframe.cpp:360
#, c-format
msgid "Error <%s> occurred loading symbol library <%s>."
msgstr "Erreur <%s> en chargeant la librairie symbole <%s>."
msgid "Part %c"
msgstr "Composant %c"
#: eeschema/symbedit.cpp:89
#, c-format
msgid "No components found in symbol library <%s>."
msgstr "Pas deomposant trouvé en librairie de symboles <%s>."
#: eeschema/libframe.cpp:627
msgid "Set pin options"
msgstr "Choix options de pin"
#: eeschema/symbedit.cpp:96
msgid "Warning: more than 1 part in Symbol File"
msgstr "Attention: plus de 1élément dans le fichier symbole"
#: eeschema/libframe.cpp:661
msgid "Add line"
msgstr "Addition de lignes"
#: eeschema/symbedit.cpp:160
msgid "Export Symbol Drawings"
msgstr "Exporter Symbole de Dessin"
#: eeschema/libframe.cpp:665
msgid "Set anchor position"
msgstr "Ajuster Position Ancre"
#: eeschema/symbedit.cpp:186
#, c-format
msgid "Save Symbol in [%s]"
msgstr "Symbole sauvé en [%s]"
#: eeschema/libframe.cpp:675
msgid "Export"
msgstr "Exporter"
#: eeschema/hierarch.cpp:119
msgid "Navigator"
......@@ -7389,11 +7272,6 @@ msgstr " Trouvé en "
msgid " Not Found"
msgstr " Non trouvé"
#: eeschema/find.cpp:650
#: eeschema/selpart.cpp:26
msgid "No component libraries are loaded."
msgstr "Pas de librairies de composants chargées."
#: eeschema/find.cpp:673
#: eeschema/find.cpp:738
#: eeschema/find.cpp:754
......@@ -7465,40 +7343,34 @@ msgstr "et "
msgid "key search criteria <"
msgstr "critère de recherche par clé <"
#: eeschema/database.cpp:68
#: eeschema/selpart.cpp:75
msgid "Select Component"
msgstr "Sélection Composant"
#: eeschema/eeschema.cpp:123
msgid "Eeschema is already running, Continue?"
msgstr "Eeschema est en cours d'exécution. Continuer ?"
#: eeschema/pinedit.cpp:216
msgid "Occupied by other pin. Continue?"
msgstr "Occupé par une autre pin, Continuer ?"
#: eeschema/viewlibs.cpp:108
msgid "Library Browser"
msgstr "Visualisateur de Librairies"
#: eeschema/pinedit.cpp:1011
#, c-format
msgid "Duplicate pin %s at location (%d, %d) conflicts with pin %s at location (%d, %d)"
msgstr "Pin dupliquée %s en position (%d, %d) en conflit avec pin %s en position (%d, %d)"
#: eeschema/viewlibs.cpp:115
#: eeschema/libedit.cpp:35
msgid "no library selected"
msgstr "Pas de librairie sélectionnée"
#: eeschema/pinedit.cpp:1021
#, c-format
msgid " in part %c"
msgstr " en composant %c"
#: eeschema/viewlibs.cpp:314
#: eeschema/libedit.cpp:306
msgid "Part"
msgstr "Part"
#: eeschema/pinedit.cpp:1028
msgid " of converted"
msgstr " de converti"
#: eeschema/viewlibs.cpp:315
#: eeschema/libedit.cpp:318
msgid "Alias"
msgstr "Alias"
#: eeschema/pinedit.cpp:1030
msgid " of normal"
msgstr " de normal"
#: eeschema/viewlibs.cpp:316
#: eeschema/libedit.cpp:344
msgid "Description"
msgstr "Description"
#: eeschema/pinedit.cpp:1041
msgid "No duplicate pins were found."
msgstr "Pas de pins doublées trouvéées"
#: eeschema/viewlibs.cpp:317
#: eeschema/libedit.cpp:351
msgid "Key words"
msgstr "Mots clé"
#: eeschema/files-io.cpp:71
msgid "Clear Schematic Hierarchy (modified!)?"
......@@ -7521,6 +7393,11 @@ msgstr ""
msgid "File <%s> not found."
msgstr "Fichier <%s> non trouvé"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:26
#: eeschema/libedit.cpp:323
msgid "Unit"
msgstr "Unité"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "3"
msgstr "3"
......@@ -7621,6 +7498,11 @@ msgstr "Nom en librairie"
msgid "The name of the symbol in the library from which this component came"
msgstr "Le nom du symbole dans la librairie d'où vient le composant."
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:73
#: eeschema/libedit.cpp:326
msgid "Convert"
msgstr "Convert"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:75
msgid ""
"Use the alternate shape of this component.\n"
......@@ -7845,15 +7727,6 @@ msgstr "Champ 8"
msgid "All existing users fields"
msgstr "Tous les champs existants"
#: eeschema/selpart.cpp:32
#, c-format
msgid " Select 1 of %d libraries."
msgstr "Selection 1 parmi %d librairies."
#: eeschema/selpart.cpp:34
msgid "Select Library"
msgstr "Sélection Librairie"
#: eeschema/dialog_options.cpp:139
#: eeschema/dialog_options.cpp:286
msgid "Delta Step X"
......@@ -7932,6 +7805,140 @@ msgstr "Incrément Label:"
msgid "Default Label Size"
msgstr "Taille Label par défaut"
#: eeschema/libedit.cpp:30
msgid "Component Library Editor: "
msgstr "Editeur de Composants"
#: eeschema/libedit.cpp:71
msgid ""
"Current part not saved.\n"
"\n"
"Discard current changes?"
msgstr ""
"Composant courant non sauvé.\n"
"\n"
"Perdre les changements en cours ?"
#: eeschema/libedit.cpp:101
#, c-format
msgid "Component or alias name \"%s\" not found in library \"%s\"."
msgstr "Composant ou alias \"%s\" non trouvé en librairie \"%s\"."
#: eeschema/libedit.cpp:170
#, c-format
msgid "Could not create copy of part <%s> in library <%s>."
msgstr "Ne peut créer une copie de l'élément <%s> en librairie <%s>."
#: eeschema/libedit.cpp:251
msgid "Include last component changes?"
msgstr "Inclure les dernières modifications du composant"
#: eeschema/libedit.cpp:263
msgid "Modify library file \""
msgstr "Modifier le fichier Librairie \""
#: eeschema/libedit.cpp:263
msgid "\"?"
msgstr "\"?"
#: eeschema/libedit.cpp:274
msgid "Error while saving library file \""
msgstr "Erreur en sauvant le fichier librairie \""
#: eeschema/libedit.cpp:275
msgid "\"."
msgstr "\"."
#: eeschema/libedit.cpp:281
msgid "Library file \""
msgstr "Fichier librairie \""
#: eeschema/libedit.cpp:283
msgid "Document file \""
msgstr "Fichier de doc \""
#: eeschema/libedit.cpp:330
msgid "Body"
msgstr "Body"
#: eeschema/libedit.cpp:333
msgid "Power Symbol"
msgstr "Symbole d'Alimentation"
#: eeschema/libedit.cpp:335
msgid "Component"
msgstr "Composant"
#: eeschema/libedit.cpp:385
msgid "Please select a component library."
msgstr "SVP sélectionner une librairie de composants."
#: eeschema/libedit.cpp:394
#, c-format
msgid "Component library <%s> is empty."
msgstr "Fichier librairie de composants <%s> vide"
#: eeschema/libedit.cpp:396
msgid "Delete Entry Error"
msgstr "Erreur en suppression d'élément"
#: eeschema/libedit.cpp:401
#, c-format
msgid ""
"Select 1 of %d components to delete\n"
"from library <%s>."
msgstr ""
"Selection 1 de %d composants a supprimer\n"
"de la librairie <%s>."
#: eeschema/libedit.cpp:405
msgid "Delete Component"
msgstr "Suppression Composant"
#: eeschema/libedit.cpp:414
#, c-format
msgid "Entry <%s> not found in library <%s>."
msgstr "Element <%s> non trouvé en librairie <%s>."
#: eeschema/libedit.cpp:421
#, c-format
msgid "Delete component \"%s\" from library \"%s\"?"
msgstr "Supprimer composant \"%s\" de la librairie \"%s\"?"
#: eeschema/libedit.cpp:441
msgid "The component being deleted has been modified. All changes will be lost. Discard changes?"
msgstr ""
#: eeschema/libedit.cpp:498
msgid ""
"All changes to the current component will be lost!\n"
"\n"
"Clear the current component from the screen?"
msgstr ""
#: eeschema/libedit.cpp:522
#, c-format
msgid "Component \"%s\" already exists in library \"%s\"."
msgstr "Composant \"%s\" déjà existant en librairie \"%s\"."
#: eeschema/libedit.cpp:571
msgid "No component to save."
msgstr "Pas de composant à sauver."
#: eeschema/libedit.cpp:580
msgid "No library specified."
msgstr "Pas de librairie spécifiée."
#: eeschema/libedit.cpp:590
#, c-format
msgid "Component \"%s\" exists. Change it?"
msgstr "Le composant \" %s\" existe, Le changer ?"
#: eeschema/libedit.cpp:608
#, c-format
msgid "Component %s saved in library %s"
msgstr "Composant %s sauvé en librairie %s"
#: eeschema/tool_sch.cpp:37
msgid "Open schematic project"
msgstr "Ouvrir un Projet schématique"
......@@ -7948,6 +7955,11 @@ msgstr "Ajustage opt Page"
msgid "Library editor"
msgstr "Editeur de librairies"
#: eeschema/tool_sch.cpp:51
#: eeschema/viewlib_frame.cpp:81
msgid "Library browser"
msgstr "Visualisateur des librairies"
#: eeschema/tool_sch.cpp:55
msgid "Schematic hierarchy navigator"
msgstr "Navigation dans la hiérarchie"
......@@ -8044,30 +8056,6 @@ msgstr "Force affichage des pins invisibles"
msgid "HV orientation for Wires and Bus"
msgstr "Force direction H, V et X pour les fils et bus"
#: eeschema/class_pin.cpp:48
msgid "Pin"
msgstr "Pin"
#: eeschema/class_pin.cpp:1128
msgid "PinName"
msgstr "Nom Pin"
#: eeschema/class_pin.cpp:1137
msgid "PinNum"
msgstr "Num Pin"
#: eeschema/class_pin.cpp:1141
msgid "PinType"
msgstr "Type Pin"
#: eeschema/class_pin.cpp:1147
msgid "no"
msgstr "non"
#: eeschema/class_pin.cpp:1149
msgid "yes"
msgstr "oui"
#: eeschema/edit_label.cpp:47
msgid "Empty Text!"
msgstr "Texte vide"
......@@ -8085,18 +8073,6 @@ msgstr "Direction"
msgid "Glabel Shape"
msgstr "Forme GLabel"
#: eeschema/class_libentry.cpp:196
msgid "none"
msgstr "rien"
#: eeschema/class_libentry.cpp:784
msgid "file ended prematurely loading component draw element"
msgstr ""
#: eeschema/class_libentry.cpp:840
msgid "file ended prematurely while attempting to flush to end of drawing section."
msgstr ""
#: eeschema/build_BOM.cpp:51
msgid "Bill of Materials file (*.lst)|*.lst"
msgstr "Fichier Liste du Materiel (*.lst)|*.lst"
......@@ -8287,30 +8263,6 @@ msgstr "Fichier document de composants <%s> vide"
msgid "File <%s> is not a valid component library document file."
msgstr "<%s> n'est pas un fichier documentation de composant valide."
#: eeschema/tool_viewlib.cpp:35
msgid "Select library to browse"
msgstr "Sélection de la librairie à examiner"
#: eeschema/tool_viewlib.cpp:39
msgid "Select part to browse"
msgstr "Sélectionner composant à visualiser"
#: eeschema/tool_viewlib.cpp:44
msgid "Display previous part"
msgstr "Afficher composant précédent"
#: eeschema/tool_viewlib.cpp:48
msgid "Display next part"
msgstr "Afficher composant suivant"
#: eeschema/tool_viewlib.cpp:88
msgid "View component documents"
msgstr "Voir documents des composants"
#: eeschema/tool_viewlib.cpp:97
msgid "Insert component in schematic"
msgstr "Placer composant en schématique"
#: eeschema/plothpgl.cpp:200
msgid "Sheet Size"
msgstr "Dim. feuille"
......@@ -8375,74 +8327,44 @@ msgstr "Offset de tracé Y"
msgid "&Accept Offset"
msgstr "&Accepter Offset"
#: eeschema/edit_component_in_lib.cpp:139
#, c-format
msgid "Alias <%s> not found for component <%s> in library <%s>."
msgstr "Alias <%s> non trouvé pour le component <%s> en librairie <%s>."
#: eeschema/edit_component_in_lib.cpp:144
msgid "Component Library Error"
msgstr "Erreur en Librairie de Composanr"
#: eeschema/edit_component_in_lib.cpp:264
#: eeschema/edit_component_in_lib.cpp:334
#, c-format
msgid "Alias <%s> cannot be removed while it is being edited!"
msgstr "L'alias <%s> ne peut être supprimé tant qu'il est en cours d'édition!"
#: eeschema/edit_component_in_lib.cpp:273
msgid "Remove all aliases from list?"
msgstr "Supprimer tous les alias de la liste?"
#: eeschema/edit_component_in_lib.cpp:298
msgid "New alias:"
msgstr "Noveau alias"
#: eeschema/edit_component_in_lib.cpp:299
msgid "Component Alias"
msgstr "Alias de Composant"
#: eeschema/edit_component_in_lib.cpp:309
#, c-format
msgid "Alias or component name <%s> already exists in library <%s>."
msgstr "Alias ou nom de composant <%s> déjà existant en librairie <%s>."
#: eeschema/edit_component_in_lib.cpp:388
msgid "Delete units"
msgstr "Supprimer unité"
#: eeschema/edit_component_in_lib.cpp:459
msgid "Create pins for Convert items"
msgstr "Créér les pins des unitées converties"
#: eeschema/edit_component_in_lib.cpp:463
msgid "Part as \"De Morgan\" anymore"
msgstr "Le composant a une représentation convertie"
#: eeschema/class_pin.cpp:48
msgid "Pin"
msgstr "Pin"
#: eeschema/edit_component_in_lib.cpp:489
msgid "Delete Convert items"
msgstr "Suppression des éléments convertis"
#: eeschema/class_pin.cpp:1164
msgid "PinName"
msgstr "Nom Pin"
#: eeschema/edit_component_in_lib.cpp:520
msgid "Doc Files"
msgstr "Fichiers de Doc"
#: eeschema/class_pin.cpp:1173
msgid "PinNum"
msgstr "Num Pin"
#: eeschema/edit_component_in_lib.cpp:551
msgid "Ok to Delete FootprintFilter LIST"
msgstr "Ok pour effacer la LISTE des filtres de modules"
#: eeschema/class_pin.cpp:1177
msgid "PinType"
msgstr "Type Pin"
#: eeschema/edit_component_in_lib.cpp:574
msgid "Add Footprint Filter"
msgstr "Ajouter Filtre Modules"
#: eeschema/class_pin.cpp:1183
msgid "no"
msgstr "non"
#: eeschema/edit_component_in_lib.cpp:574
msgid "Footprint Filter"
msgstr "Filtrage Modules"
#: eeschema/class_pin.cpp:1185
msgid "yes"
msgstr "oui"
#: eeschema/edit_component_in_lib.cpp:587
#: eeschema/class_BodyItem_Text.cpp:84
#, c-format
msgid "Foot print filter <%s> is already defined."
msgstr ""
msgid "text only had %d parameters of the required 8"
msgstr "le texte a seulement %d paramètres sur les 8 requis"
#: eeschema/class_BodyItem_Text.cpp:312
#: eeschema/classes_body_items.cpp:506
#: eeschema/classes_body_items.cpp:750
#: eeschema/classes_body_items.cpp:955
#: eeschema/classes_body_items.cpp:1189
#: eeschema/classes_body_items.cpp:1570
#: eeschema/classes_body_items.cpp:1910
msgid "Line width"
msgstr "Epaisseur ligne"
#: eeschema/dialog_eeschema_config_fbp.cpp:20
msgid "Component library files"
......@@ -8532,6 +8454,75 @@ msgstr "Alignement au sommet"
msgid "Vert. Justify"
msgstr "Vert. Justifié"
#: eeschema/edit_component_in_lib.cpp:139
#, c-format
msgid "Alias <%s> not found for component <%s> in library <%s>."
msgstr "Alias <%s> non trouvé pour le component <%s> en librairie <%s>."
#: eeschema/edit_component_in_lib.cpp:144
msgid "Component Library Error"
msgstr "Erreur en Librairie de Composanr"
#: eeschema/edit_component_in_lib.cpp:264
#: eeschema/edit_component_in_lib.cpp:334
#, c-format
msgid "Alias <%s> cannot be removed while it is being edited!"
msgstr "L'alias <%s> ne peut être supprimé tant qu'il est en cours d'édition!"
#: eeschema/edit_component_in_lib.cpp:273
msgid "Remove all aliases from list?"
msgstr "Supprimer tous les alias de la liste?"
#: eeschema/edit_component_in_lib.cpp:298
msgid "New alias:"
msgstr "Noveau alias"
#: eeschema/edit_component_in_lib.cpp:299
msgid "Component Alias"
msgstr "Alias de Composant"
#: eeschema/edit_component_in_lib.cpp:309
#, c-format
msgid "Alias or component name <%s> already exists in library <%s>."
msgstr "Alias ou nom de composant <%s> déjà existant en librairie <%s>."
#: eeschema/edit_component_in_lib.cpp:388
msgid "Delete units"
msgstr "Supprimer unité"
#: eeschema/edit_component_in_lib.cpp:460
msgid "Create pins for convert items."
msgstr "Créér les pins des unitées converties."
#: eeschema/edit_component_in_lib.cpp:464
msgid "Part as \"De Morgan\" anymore"
msgstr "Le composant a une représentation convertie"
#: eeschema/edit_component_in_lib.cpp:490
msgid "Delete Convert items"
msgstr "Suppression des éléments convertis"
#: eeschema/edit_component_in_lib.cpp:521
msgid "Doc Files"
msgstr "Fichiers de Doc"
#: eeschema/edit_component_in_lib.cpp:552
msgid "Ok to Delete FootprintFilter LIST"
msgstr "Ok pour effacer la LISTE des filtres de modules"
#: eeschema/edit_component_in_lib.cpp:575
msgid "Add Footprint Filter"
msgstr "Ajouter Filtre Modules"
#: eeschema/edit_component_in_lib.cpp:575
msgid "Footprint Filter"
msgstr "Filtrage Modules"
#: eeschema/edit_component_in_lib.cpp:588
#, c-format
msgid "Foot print filter <%s> is already defined."
msgstr ""
#: eeschema/dialog_edit_libentry_fields_in_lib_base.cpp:145
msgid "The vertical height of the currently selected field's text in the schematic"
msgstr "La taille du texte du champ actuellement sélectionné"
......@@ -8556,6 +8547,18 @@ msgstr "Propriétés du label"
msgid "Text Properties"
msgstr "Propriétés du Texte"
#: eeschema/class_libentry.cpp:196
msgid "none"
msgstr "rien"
#: eeschema/class_libentry.cpp:843
msgid "file ended prematurely loading component draw element"
msgstr ""
#: eeschema/class_libentry.cpp:899
msgid "file ended prematurely while attempting to flush to end of drawing section."
msgstr ""
#: eeschema/annotate_dialog.cpp:150
msgid "Scope"
msgstr "Sélection"
......@@ -8648,46 +8651,132 @@ msgstr ""
"\n"
"Cette opération supprimera l'annotation existante et ne peut être annulée."
#: eeschema/class_libentry_fields.cpp:132
#: eeschema/classes_body_items.cpp:34
msgid "Undefined"
msgstr "Non Défini"
#: eeschema/classes_body_items.cpp:66
#: eeschema/classes_body_items.cpp:72
msgid "All"
msgstr "Tout"
#: eeschema/classes_body_items.cpp:179
#, c-format
msgid "arc only had %d parameters of the required 8"
msgstr "l'arc a seulement %d paramètres sur les 8 requis"
#: eeschema/classes_body_items.cpp:511
#: eeschema/classes_body_items.cpp:759
#: eeschema/classes_body_items.cpp:1194
#: eeschema/classes_body_items.cpp:1575
#: eeschema/classes_body_items.cpp:1915
msgid "Bounding box"
msgstr "Rectange dencadrement"
#: eeschema/classes_body_items.cpp:556
#, c-format
msgid "circle only had %d parameters of the required 6"
msgstr "le cercle a seulement %d paramètres sur les 6 requis"
#: eeschema/classes_body_items.cpp:754
msgid "Radius"
msgstr "Rayon"
#: eeschema/classes_body_items.cpp:772
msgid "Rectangle"
msgstr "Rectangle"
#: eeschema/classes_body_items.cpp:807
#, c-format
msgid "rectangle only had %d parameters of the required 7"
msgstr "le rectangle a seulement %d paramètres sur les 7 requis"
#: eeschema/classes_body_items.cpp:1241
msgid "PolyLine"
msgstr "PolyLigne"
#: eeschema/classes_body_items.cpp:1287
#, c-format
msgid "polyline only had %d parameters of the required 4"
msgstr "la polyligne a seulement %d paramètres sur les 4 requis"
#: eeschema/classes_body_items.cpp:1292
#, c-format
msgid "polyline count parameter %d is invalid"
msgstr "le nombre de paramètes (%d) de la polyligne est mauvais"
#: eeschema/classes_body_items.cpp:1308
#, c-format
msgid "polyline point %d X position not defined"
msgstr "la position X du point %d de la polyligne n'est pas définie"
#: eeschema/classes_body_items.cpp:1315
#, c-format
msgid "polyline point %d Y position not defined"
msgstr "la position Y du point %d de la polyligne n'est pas définie"
#: eeschema/classes_body_items.cpp:1586
msgid "Bezier"
msgstr "Bezier"
#: eeschema/classes_body_items.cpp:1633
#, c-format
msgid "Bezier only had %d parameters of the required 4"
msgstr "La courbe de Bezier a seulement %d paramètres sur les 4 requis"
#: eeschema/classes_body_items.cpp:1639
#, c-format
msgid "Bezier count parameter %d is invalid"
msgstr "le nombre de paramètes (%d) de la courbe de Bezier est mauvais"
#: eeschema/classes_body_items.cpp:1655
#, c-format
msgid "Bezier point %d X position not defined"
msgstr "la position X du point %d de la courbe de Bezier n'est pas définie"
#: eeschema/classes_body_items.cpp:1661
#, c-format
msgid "Bezier point %d Y position not defined"
msgstr "la position Y du point %d de la courbe de Bezier n'est pas définie"
#: eeschema/class_libentry_fields.cpp:134
msgid "invalid field number defined"
msgstr ""
#: eeschema/class_libentry_fields.cpp:171
#: eeschema/class_libentry_fields.cpp:173
#, c-format
msgid "field %d does not have the correct number of parameters"
msgstr ""
#: eeschema/class_libentry_fields.cpp:186
#: eeschema/class_libentry_fields.cpp:188
#, c-format
msgid "field %d text orientation parameter <%c> is not valid"
msgstr "champ %d parametre d'orientation de texte<%c> non valide"
#: eeschema/class_libentry_fields.cpp:198
#: eeschema/class_libentry_fields.cpp:200
#, c-format
msgid "field %d text visible parameter <%c> is not valid"
msgstr "champ %d parametre de visibilité de texte<%c> non valide"
#: eeschema/class_libentry_fields.cpp:217
#: eeschema/class_libentry_fields.cpp:219
#, c-format
msgid "field %d text horizontal justification parameter <%c> is not valid"
msgstr ""
#: eeschema/class_libentry_fields.cpp:231
#: eeschema/class_libentry_fields.cpp:233
#, c-format
msgid "field %d text vertical justification parameter <%c> is not valid"
msgstr ""
#: eeschema/class_libentry_fields.cpp:487
#: eeschema/class_libentry_fields.cpp:546
msgid "Datasheet"
msgstr "Documentation"
#: eeschema/dialog_SVG_print_base.cpp:25
#: eeschema/dialog_print_using_printer_base.cpp:25
msgid "Default Pen Size"
msgstr "Dimension Plume par Défaut"
#: eeschema/dialog_SVG_print_base.cpp:30
#: eeschema/dialog_print_using_printer_base.cpp:30
msgid "Selection of the default pen thickness used to draw items, when their thickness is set to 0."
msgstr "Valeur de la dimension de la plume utilisée par défaut pour tracer les éléments, lorsque leur épaisseur est à 0."
......@@ -8703,10 +8792,6 @@ msgstr "Imprimer Tout"
msgid "Current"
msgstr "Courant"
#: eeschema/dialog_print_using_printer_base.cpp:52
msgid "All"
msgstr "Tout"
#: eeschema/edit_component_in_schematic.cpp:37
msgid "No Field to move"
msgstr "Pas de champ à déplacer"
......@@ -8747,14 +8832,29 @@ msgstr "Valeur Composant"
msgid "Component footprint"
msgstr "Module du Composant"
#: eeschema/class_BodyItem_Text.cpp:86
#, c-format
msgid "text only had %d parameters of the required 8"
msgstr "le texte a seulement %d paramètres sur les 8 requis"
#: eeschema/class_sch_component.cpp:135
msgid "U"
msgstr "U"
#: eeschema/class_BodyItem_Text.cpp:287
msgid "Line width"
msgstr "Epaisseur ligne"
#: eeschema/class_sch_component.cpp:1032
msgid "Ref"
msgstr "Ref"
#: eeschema/class_sch_component.cpp:1037
msgid "Pwr Symb"
msgstr "Symb Alim"
#: eeschema/class_sch_component.cpp:1039
msgid "Val"
msgstr "Val"
#: eeschema/class_sch_component.cpp:1043
msgid "RefLib"
msgstr "RefLib"
#: eeschema/class_sch_component.cpp:1047
msgid "Lib"
msgstr "Lib"
#: eeschema/save_schemas.cpp:68
msgid "Schematic Files"
......@@ -9229,88 +9329,29 @@ msgstr "Tout Supprimer"
msgid "Footprints"
msgstr "Modules"
#: eeschema/classes_body_items.cpp:34
msgid "Undefined"
msgstr "Non Défini"
#: eeschema/classes_body_items.cpp:158
#, c-format
msgid "arc only had %d parameters of the required 8"
msgstr "l'arc a seulement %d paramètres sur les 8 requis"
#: eeschema/classes_body_items.cpp:464
#: eeschema/classes_body_items.cpp:687
#: eeschema/classes_body_items.cpp:1058
#: eeschema/classes_body_items.cpp:1414
#: eeschema/classes_body_items.cpp:1723
msgid "Bounding box"
msgstr "Rectange dencadrement"
#: eeschema/classes_body_items.cpp:509
#, c-format
msgid "circle only had %d parameters of the required 6"
msgstr "le cercle a seulement %d paramètres sur les 6 requis"
#: eeschema/classes_body_items.cpp:682
msgid "Radius"
msgstr "Rayon"
#: eeschema/classes_body_items.cpp:700
msgid "Rectangle"
msgstr "Rectangle"
#: eeschema/classes_body_items.cpp:735
#, c-format
msgid "rectangle only had %d parameters of the required 7"
msgstr "le rectangle a seulement %d paramètres sur les 7 requis"
#: eeschema/classes_body_items.cpp:1105
msgid "PolyLine"
msgstr "PolyLigne"
#: eeschema/classes_body_items.cpp:1151
#, c-format
msgid "polyline only had %d parameters of the required 4"
msgstr "la polyligne a seulement %d paramètres sur les 4 requis"
#: eeschema/classes_body_items.cpp:1156
#, c-format
msgid "polyline count parameter %d is invalid"
msgstr "le nombre de paramètes (%d) de la polyligne est mauvais"
#: eeschema/classes_body_items.cpp:1172
#, c-format
msgid "polyline point %d X position not defined"
msgstr "la position X du point %d de la polyligne n'est pas définie"
#: eeschema/classes_body_items.cpp:1179
#, c-format
msgid "polyline point %d Y position not defined"
msgstr "la position Y du point %d de la polyligne n'est pas définie"
#: eeschema/tool_viewlib.cpp:35
msgid "Select library to browse"
msgstr "Sélection de la librairie à examiner"
#: eeschema/classes_body_items.cpp:1425
msgid "Bezier"
msgstr "Bezier"
#: eeschema/tool_viewlib.cpp:39
msgid "Select part to browse"
msgstr "Sélectionner composant à visualiser"
#: eeschema/classes_body_items.cpp:1472
#, c-format
msgid "Bezier only had %d parameters of the required 4"
msgstr "La courbe de Bezier a seulement %d paramètres sur les 4 requis"
#: eeschema/tool_viewlib.cpp:44
msgid "Display previous part"
msgstr "Afficher composant précédent"
#: eeschema/classes_body_items.cpp:1478
#, c-format
msgid "Bezier count parameter %d is invalid"
msgstr "le nombre de paramètes (%d) de la courbe de Bezier est mauvais"
#: eeschema/tool_viewlib.cpp:48
msgid "Display next part"
msgstr "Afficher composant suivant"
#: eeschema/classes_body_items.cpp:1494
#, c-format
msgid "Bezier point %d X position not defined"
msgstr "la position X du point %d de la courbe de Bezier n'est pas définie"
#: eeschema/tool_viewlib.cpp:88
msgid "View component documents"
msgstr "Voir documents des composants"
#: eeschema/classes_body_items.cpp:1500
#, c-format
msgid "Bezier point %d Y position not defined"
msgstr "la position Y du point %d de la courbe de Bezier n'est pas définie"
#: eeschema/tool_viewlib.cpp:97
msgid "Insert component in schematic"
msgstr "Placer composant en schématique"
#: eeschema/dialog_edit_component_in_schematic.cpp:170
msgid "No Component Name!"
......@@ -11853,7 +11894,7 @@ msgstr "Réglage des Couches Cuivre"
msgid "Graphic shape properties"
msgstr "Propriétés du dessin"
#: eeschema/pinedit-dialog.h:67
#: eeschema/pinedit-dialog.h:66
msgid "Pin properties"
msgstr "Propriétés des Pins"
......@@ -12145,6 +12186,8 @@ msgstr "DCodes id."
msgid "Page Settings"
msgstr "Ajustage opt Page"
#~ msgid "none selected"
#~ msgstr "Pas de sélection"
#~ msgid "TextPCB properties"
#~ msgstr "Propriétés des textes PCB"
#~ msgid " Convert"
......
pcbnew/CMakeLists.txt
View file @ 24ce9409
......@@ -79,6 +79,7 @@ set(PCBNEW_SRCS
edit_pcb_text.cpp
edit_track_width.cpp
edtxtmod.cpp
event_handlers_tracks_vias_sizes.cpp
export_gencad.cpp
files.cpp
find.cpp
......
pcbnew/class_board.cpp
View file @ 24ce9409
......@@ -81,10 +81,13 @@ BOARD::~BOARD()
* Must be called after a netclass selection (or after a netclass parameter change
* Initialise vias and tracks values displayed in comb boxs of the auxiliary toolbar
* and some others parametres (netclass name ....)
* @param aNetClassName = the new netclass name
* @return true if lists of tracks and vias sizes are modified
*/
void BOARD::SetCurrentNetClass( const wxString & aNetClassName)
bool BOARD::SetCurrentNetClass( const wxString & aNetClassName)
{
NETCLASS * netClass = m_NetClasses.Find(aNetClassName);
bool lists_sizes_modified = false;
// if not found (should not happen) use the default
if ( netClass == NULL )
......@@ -94,12 +97,34 @@ BOARD::~BOARD()
// Initialize others values:
if( m_ViaSizeHistory.size() == 0 )
{
lists_sizes_modified = true;
m_ViaSizeHistory.push_back(0);
}
if( m_TrackWidthHistory.size() == 0 )
{
lists_sizes_modified = true;
m_TrackWidthHistory.push_back(0);
}
if( m_ViaSizeHistory[0] != netClass->GetViaDiameter() )
lists_sizes_modified = true;
m_ViaSizeHistory[0] = netClass->GetViaDiameter();
if( m_TrackWidthHistory[0] != netClass->GetTrackWidth() )
lists_sizes_modified = true;
m_TrackWidthHistory[0] = netClass->GetTrackWidth();
if( m_ViaSizeSelector >= m_ViaSizeHistory.size() )
m_ViaSizeSelector = m_ViaSizeHistory.size();
if( m_TrackWidthSelector >= m_TrackWidthHistory.size() )
m_TrackWidthSelector = m_TrackWidthHistory.size();
//Initialize track and via current size:
g_DesignSettings.m_CurrentViaSize = m_ViaSizeHistory[m_ViaSizeSelector];
g_DesignSettings.m_CurrentTrackWidth = m_TrackWidthHistory[m_TrackWidthSelector];
return lists_sizes_modified;
}
wxString BOARD::GetLayerName( int aLayerIndex ) const
......
pcbnew/class_board.h
View file @ 24ce9409
......@@ -110,9 +110,9 @@ public:
// The others values are extra values
std::vector <int> m_ViaSizeHistory; // Last used via sizes (max count = HISTORY_MAX_COUNT)
std::vector <int> m_TrackWidthHistory; // Last used track widths (max count = HISTORY_MAX_COUNT)
int m_ViaSizeSelector; // index for m_ViaSizeHistory to select the value
unsigned m_ViaSizeSelector; // index for m_ViaSizeHistory to select the value
// O is the selection of the default value Netclass
int m_TrackWidthSelector; // index for m_TrackWidthHistory to select the value
unsigned m_TrackWidthSelector; // index for m_TrackWidthHistory to select the value
/**********************************/
public:
......@@ -369,8 +369,10 @@ public:
* Must be called after a netclass selection (or after a netclass parameter change
* Initialise vias and tracks values displayed in comb boxs of the auxiliary toolbar
* and some others parametres (netclass name ....)
* @param aNetClassName = the new netclass name
* @return true if lists of tracks and vias sizes are modified
*/
void SetCurrentNetClass( const wxString & aNetClassName);
bool SetCurrentNetClass( const wxString & aNetClassName);
/**
* Function Save
......
pcbnew/dialog_track_options.cpp
View file @ 24ce9409
......@@ -114,8 +114,6 @@ void DIALOG_TRACKS_OPTIONS::OnButtonOkClick( wxCommandEvent& event )
g_DesignSettings.m_MaskMargin =
ReturnValueFromTextCtrl( *m_OptMaskMargin, m_Parent->m_InternalUnits );
m_Parent->DisplayTrackSettings();
m_Parent->AddHistory( g_DesignSettings.m_CurrentViaSize, TYPE_VIA );
m_Parent->AddHistory( g_DesignSettings.m_CurrentTrackWidth, TYPE_TRACK );
EndModal( 1 );
......
pcbnew/edit.cpp
View file @ 24ce9409
......@@ -36,8 +36,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
wxClientDC dc( DrawPanel );
BOARD_ITEM* DrawStruct = GetCurItem();
int toggle = 0;
DrawPanel->CursorOff( &dc );
DrawPanel->PrepareGraphicContext( &dc );
......@@ -49,8 +47,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
{
case wxID_CUT:
case wxID_COPY:
case ID_AUX_TOOLBAR_PCB_TRACK_WIDTH:
case ID_AUX_TOOLBAR_PCB_VIA_SIZE:
case ID_ON_GRID_SELECT:
case ID_ON_ZOOM_SELECT:
case ID_PCB_USER_GRID_SETUP:
......@@ -93,17 +89,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_POPUP_PCB_SELECT_CU_LAYER:
case ID_POPUP_PCB_SELECT_LAYER_PAIR:
case ID_POPUP_PCB_SELECT_NO_CU_LAYER:
case ID_POPUP_PCB_SELECT_WIDTH:
case ID_POPUP_PCB_SELECT_AUTO_WIDTH:
case ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH:
case ID_POPUP_PCB_SELECT_WIDTH1:
case ID_POPUP_PCB_SELECT_WIDTH2:
case ID_POPUP_PCB_SELECT_WIDTH3:
case ID_POPUP_PCB_SELECT_WIDTH4:
case ID_POPUP_PCB_SELECT_WIDTH5:
case ID_POPUP_PCB_SELECT_WIDTH6:
case ID_POPUP_PCB_SELECT_WIDTH7:
case ID_POPUP_PCB_SELECT_WIDTH8:
case ID_POPUP_PCB_MOVE_TRACK_NODE:
case ID_POPUP_PCB_DRAG_TRACK_SEGMENT_KEEP_SLOPE:
case ID_POPUP_PCB_DRAG_TRACK_SEGMENT:
......@@ -149,9 +134,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
SetCursor( DrawPanel->m_PanelCursor = DrawPanel->m_PanelDefaultCursor );
break;
case ID_TOGGLE_PRESENT_COMMAND:
break;
default: // Finish (abort ) the command
if( DrawPanel->ManageCurseur && DrawPanel->ForceCloseManageCurseur )
DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
......@@ -174,77 +156,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
Close( true );
break;
case ID_TOGGLE_PRESENT_COMMAND:
switch( m_ID_current_state )
{
case 0:
toggle = 1;
break;
case ID_TRACK_BUTT:
if( DrawStruct && (DrawStruct->m_Flags & IS_NEW) )
{
End_Route( (TRACK*) DrawStruct, &dc );
DrawPanel->m_AutoPAN_Request = false;
}
else
toggle = 1;
break;
case ID_PCB_ZONES_BUTT:
if( End_Zone( &dc ) )
{
DrawPanel->m_AutoPAN_Request = false;
SetCurItem( NULL );
}
else
toggle = 1;
break;
case ID_PCB_ADD_LINE_BUTT:
case ID_PCB_ARC_BUTT:
case ID_PCB_CIRCLE_BUTT:
if( DrawStruct == NULL )
{
}
else if( DrawStruct->Type() != TYPE_DRAWSEGMENT )
{
DisplayError( this, wxT( "DrawStruct Type error" ) );
DrawPanel->m_AutoPAN_Request = false;
}
else if( (DrawStruct->m_Flags & IS_NEW) )
{
End_Edge( (DRAWSEGMENT*) DrawStruct, &dc );
DrawPanel->m_AutoPAN_Request = false;
SetCurItem( NULL );
}
else
toggle = 1;
break;
default:
toggle = 1;
break;
}
if( toggle )
{
int swap = m_ID_last_state;
m_ID_last_state = m_ID_current_state;
SetToolID( 0, wxCURSOR_ARROW, wxEmptyString );
m_ID_current_state = swap;
}
//SetCursor( DrawPanel->m_PanelCursor = DrawPanel->m_PanelDefaultCursor );
event.SetId( m_ID_current_state );
Process_Special_Functions( event );
break;
case ID_OPEN_MODULE_EDITOR:
if( m_ModuleEditFrame == NULL )
{
......@@ -321,7 +232,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
case ID_TRACK_BUTT:
SetToolID( id, wxCURSOR_PENCIL, _( "Add Tracks" ) );
DisplayTrackSettings();
if( (GetBoard()->m_Status_Pcb & LISTE_RATSNEST_ITEM_OK) == 0 )
{
Compile_Ratsnest( &dc, true );
......@@ -989,54 +899,6 @@ void WinEDA_PcbFrame::Process_Special_Functions( wxCommandEvent& event )
}
break;
case ID_POPUP_PCB_SELECT_WIDTH:
break;
case ID_AUX_TOOLBAR_PCB_TRACK_WIDTH:
{
int ii = m_SelTrackWidthBox->GetChoice();
g_DesignSettings.m_CurrentTrackWidth = GetBoard()->m_TrackWidthHistory[ii];
DisplayTrackSettings();
m_TrackAndViasSizesList_Changed = false;
g_DesignSettings.m_UseConnectedTrackWidth = false;
}
break;
case ID_POPUP_PCB_SELECT_WIDTH1:
case ID_POPUP_PCB_SELECT_WIDTH2:
case ID_POPUP_PCB_SELECT_WIDTH3:
case ID_POPUP_PCB_SELECT_WIDTH4:
case ID_POPUP_PCB_SELECT_WIDTH5:
case ID_POPUP_PCB_SELECT_WIDTH6:
case ID_POPUP_PCB_SELECT_WIDTH7:
case ID_POPUP_PCB_SELECT_WIDTH8:
DrawPanel->MouseToCursorSchema();
g_DesignSettings.m_UseConnectedTrackWidth = false;
{
int ii = id - ID_POPUP_PCB_SELECT_WIDTH1;
g_DesignSettings.m_CurrentTrackWidth = GetBoard()->m_TrackWidthHistory[ii];
DisplayTrackSettings();
}
break;
case ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH:
g_DesignSettings.m_UseConnectedTrackWidth =
not g_DesignSettings.m_UseConnectedTrackWidth;
break;
case ID_POPUP_PCB_SELECT_AUTO_WIDTH:
DrawPanel->MouseToCursorSchema();
g_DesignSettings.m_UseConnectedTrackWidth = true;
break;
case ID_AUX_TOOLBAR_PCB_VIA_SIZE:
{
int ii = m_SelViaSizeBox->GetChoice();
g_DesignSettings.m_CurrentViaSize = GetBoard()->m_ViaSizeHistory[ii];
DisplayTrackSettings();
m_TrackAndViasSizesList_Changed = false;
}
break;
case ID_POPUP_PCB_MOVE_TRACK_SEGMENT:
DrawPanel->MouseToCursorSchema();
......
pcbnew/editrack-part2.cpp
View file @ 24ce9409
......@@ -14,29 +14,6 @@
#include "protos.h"
/* Routines Locales */
/* variables locales */
/***********************************************/
void WinEDA_PcbFrame::DisplayTrackSettings()
/***********************************************/
/* Display the current track width and via diameter
*/
{
wxString msg;
wxString buftrc, bufvia;
valeur_param( g_DesignSettings.m_CurrentTrackWidth, buftrc );
valeur_param( g_DesignSettings.m_CurrentViaSize, bufvia );
msg.Printf( _( "Track Width: %s Vias Size : %s" ),
buftrc.GetData(), bufvia.GetData() );
Affiche_Message( msg );
m_TrackAndViasSizesList_Changed = TRUE;
}
/***********************************************/
void WinEDA_PcbFrame::Ratsnest_On_Off( wxDC* DC )
/***********************************************/
......
pcbnew/editrack.cpp
View file @ 24ce9409
......@@ -92,9 +92,6 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
BOARD_ITEM* LockPoint;
wxPoint pos = GetScreen()->m_Curseur;
static int InitialTrackWidthValue; /* first track segment width.
* used when we are in the auto tack width mode */
DrawPanel->ManageCurseur = ShowNewTrackWhenMovingCursor;
DrawPanel->ForceCloseManageCurseur = Exit_Editrack;
......@@ -110,8 +107,6 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
if( g_HightLigt_Status )
Hight_Light( DC );
InitialTrackWidthValue = -1; // Set to "no value"
g_CurrentTrackList.PushBack( new TRACK( GetBoard() ) );
g_CurrentTrackSegment->m_Flags = IS_NEW;
......@@ -153,26 +148,22 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
Hight_Light( DC );
// Display info about track Net class, and init track and vias sizes:
g_CurrentTrackSegment->SetNet( g_HightLigth_NetCode );
GetBoard()->SetCurrentNetClass( g_CurrentTrackSegment->GetNetClassName() );
m_TrackAndViasSizesList_Changed = true;
AuxiliaryToolBar_Update_UI();
g_CurrentTrackSegment->SetLayer( GetScreen()->m_Active_Layer );
g_CurrentTrackSegment->m_Width = g_DesignSettings.m_CurrentTrackWidth;
if( g_DesignSettings.m_UseConnectedTrackWidth )
{
if( TrackOnStartPoint && TrackOnStartPoint->Type() == TYPE_TRACK )
{
InitialTrackWidthValue = TrackOnStartPoint->m_Width;
g_CurrentTrackSegment->m_Width = InitialTrackWidthValue;
}
g_CurrentTrackSegment->m_Width = TrackOnStartPoint->m_Width;
}
g_CurrentTrackSegment->m_Start = pos;
g_CurrentTrackSegment->m_End = pos;
g_CurrentTrackSegment->SetNet( g_HightLigth_NetCode );
// Display info about track Net class:
GetBoard()->SetCurrentNetClass( g_CurrentTrackSegment->GetNetClassName() );
m_TrackAndViasSizesList_Changed = true;
AuxiliaryToolBar_DesignRules_Update_UI();
if( pt_pad )
{
......@@ -271,7 +262,6 @@ TRACK* WinEDA_PcbFrame::Begin_Route( TRACK* aTrack, wxDC* DC )
newTrack->m_Start = newTrack->m_End;
newTrack->SetLayer( ( (PCB_SCREEN*) GetScreen() )->m_Active_Layer );
if( !g_DesignSettings.m_UseConnectedTrackWidth )
{
newTrack->m_Width = g_DesignSettings.m_CurrentTrackWidth;
......@@ -674,10 +664,7 @@ static void PushTrack( WinEDA_DrawPanel* panel )
void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, wxDC* DC, bool erase )
/****************************************************************************/
/* redessin du contour de la piste lors des deplacements de la souris
* Cette routine est utilisee comme .ManageCurseur()
* si ShowIsolDuringCreateTrack_Item.State == RUN la marge d'isolation
* est aussi affichee
/* Redraw the current track beiing created when the mouse cursor is moved
*/
{
D( g_CurrentTrackList.VerifyListIntegrity(); );
......@@ -693,7 +680,7 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, wxDC* DC, bool erase
if( showTrackClearanceMode != DO_NOT_SHOW_CLEARANCE )
DisplayOpt.ShowTrackClearanceMode = SHOW_CLEARANCE_ALWAYS;
/* efface ancienne position si elle a ete deja dessinee */
/* Erase old track */
if( erase )
{
Trace_Une_Piste( panel, DC, g_FirstTrackSegment, g_CurrentTrackList.GetCount(), GR_XOR );
......@@ -715,10 +702,9 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, wxDC* DC, bool erase
if( g_CurrentTrackList.GetCount() == 0 )
return;
/* dessin de la nouvelle piste : mise a jour du point d'arrivee */
// Set track parameters, that can be modified while creating the track
g_CurrentTrackSegment->SetLayer( screen->m_Active_Layer );
if( !g_DesignSettings.m_UseConnectedTrackWidth )
g_CurrentTrackSegment->m_Width = netclass->GetTrackWidth();
g_CurrentTrackSegment->m_Width = g_DesignSettings.m_CurrentTrackWidth;
if( g_TwoSegmentTrackBuild )
{
......@@ -728,7 +714,7 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, wxDC* DC, bool erase
previous_track->SetLayer( screen->m_Active_Layer );
if( !g_DesignSettings.m_UseConnectedTrackWidth )
previous_track->m_Width = netclass->GetTrackWidth();
previous_track->m_Width = g_DesignSettings.m_CurrentTrackWidth;
}
}
......@@ -760,6 +746,7 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel, wxDC* DC, bool erase
g_CurrentTrackSegment->m_End = screen->m_Curseur;
}
/* Redraw the new track */
D( g_CurrentTrackList.VerifyListIntegrity(); );
Trace_Une_Piste( panel, DC, g_FirstTrackSegment, g_CurrentTrackList.GetCount(), GR_XOR );
......
pcbnew/edtxtmod.rc deleted 100644 → 0
View file @ 9b4d215b
#include "wx/msw/wx.rc"
pcbnew/event_handlers_tracks_vias_sizes.cpp 0 → 100644
View file @ 24ce9409
/* event_handlers_tracks_vias_sizes.cpp
*
* Handlers for popup and toolbars events relative
* to the tracks and vias sizes
*/
#include "fctsys.h"
//#include "appl_wxstruct.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "pcbnew_id.h"
#include "pcbnew.h"
#include "wxPcbStruct.h"
/** Function Tracks_and_Vias_Size_Event
* Event handler for tracks and vias size selection (and some options)
* relative to toolbars and popup events
*/
void WinEDA_PcbFrame::Tracks_and_Vias_Size_Event( wxCommandEvent& event )
{
int ii;
int id = event.GetId();
/* Note: none of these events require aborting the current command (if any)
* (like move, edit or block command)
* so we do not test for a current command in progress and call
* DrawPanel->ForceCloseManageCurseur( DrawPanel, &dc );
*/
switch( id )
{
case ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH:
g_DesignSettings.m_UseConnectedTrackWidth = not g_DesignSettings.m_UseConnectedTrackWidth;
g_DesignSettings.m_CurrentTrackWidth = GetBoard()->m_TrackWidthHistory[m_SelTrackWidthBox->GetChoice()];
g_DesignSettings.m_CurrentViaSize = GetBoard()->m_ViaSizeHistory[m_SelViaSizeBox->GetChoice()];
AuxiliaryToolBar_Update_UI( );
break;
case ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES:
GetBoard()->m_TrackWidthSelector = 0;
g_DesignSettings.m_CurrentTrackWidth = GetBoard()->m_TrackWidthHistory[0];
GetBoard()->m_ViaSizeSelector = 0;
g_DesignSettings.m_CurrentViaSize = GetBoard()->m_ViaSizeHistory[0];
AuxiliaryToolBar_Update_UI( );
break;
case ID_POPUP_PCB_SELECT_AUTO_WIDTH:
DrawPanel->MouseToCursorSchema();
g_DesignSettings.m_UseConnectedTrackWidth = true;
AuxiliaryToolBar_Update_UI( );
break;
case ID_POPUP_PCB_SELECT_WIDTH1:
case ID_POPUP_PCB_SELECT_WIDTH2:
case ID_POPUP_PCB_SELECT_WIDTH3:
case ID_POPUP_PCB_SELECT_WIDTH4:
case ID_POPUP_PCB_SELECT_WIDTH5:
case ID_POPUP_PCB_SELECT_WIDTH6:
case ID_POPUP_PCB_SELECT_WIDTH7:
case ID_POPUP_PCB_SELECT_WIDTH8:
DrawPanel->MouseToCursorSchema();
g_DesignSettings.m_UseConnectedTrackWidth = false;
ii = id - ID_POPUP_PCB_SELECT_WIDTH1;
GetBoard()->m_TrackWidthSelector = ii;
g_DesignSettings.m_CurrentTrackWidth = GetBoard()->m_TrackWidthHistory[ii];
AuxiliaryToolBar_Update_UI( );
break;
case ID_POPUP_PCB_SELECT_VIASIZE1:
case ID_POPUP_PCB_SELECT_VIASIZE2:
case ID_POPUP_PCB_SELECT_VIASIZE3:
case ID_POPUP_PCB_SELECT_VIASIZE4:
case ID_POPUP_PCB_SELECT_VIASIZE5:
case ID_POPUP_PCB_SELECT_VIASIZE6:
case ID_POPUP_PCB_SELECT_VIASIZE7:
case ID_POPUP_PCB_SELECT_VIASIZE8: // selec the new current value for via size (via diameter)
DrawPanel->MouseToCursorSchema();
ii = id - ID_POPUP_PCB_SELECT_VIASIZE1;
GetBoard()->m_ViaSizeSelector = ii;
g_DesignSettings.m_CurrentViaSize = GetBoard()->m_ViaSizeHistory[ii];
AuxiliaryToolBar_Update_UI( );
break;
case ID_AUX_TOOLBAR_PCB_TRACK_WIDTH:
ii = m_SelTrackWidthBox->GetChoice();
g_DesignSettings.m_CurrentTrackWidth = GetBoard()->m_TrackWidthHistory[ii];
GetBoard()->m_TrackWidthSelector = ii;
break;
case ID_AUX_TOOLBAR_PCB_VIA_SIZE:
ii = m_SelViaSizeBox->GetChoice();
g_DesignSettings.m_CurrentViaSize = GetBoard()->m_ViaSizeHistory[ii];
GetBoard()->m_ViaSizeSelector = ii;
break;
default:
wxMessageBox( wxT( "WinEDA_PcbFrame::Tracks_and_Vias_Size_Event() error") );
break;
}
}
pcbnew/hotkeys.cpp
View file @ 24ce9409
......@@ -95,7 +95,6 @@ static Ki_HotkeyInfo HkTrackDisplayMode(wxT("Track Display Mode"),
HK_SWITCH_TRACK_DISPLAY_MODE, 'K');
static Ki_HotkeyInfo HkAddModule(wxT("Add Module"), HK_ADD_MODULE, 'O');
static Ki_HotkeyInfo HkAddTrack(wxT("Add Track or Via"), HK_ADD_TRACK, 'J');
static Ki_HotkeyInfo HkToggle(wxT("Toggle Present Command"), HK_TOGGLE, 'E');
// List of common hotkey descriptors
Ki_HotkeyInfo
......@@ -112,7 +111,7 @@ Ki_HotkeyInfo* s_board_edit_Hotkey_List[] = { &HkTrackDisplayMode, &HkDelete,
&HkSwitch2InnerLayer2, &HkSwitch2InnerLayer3, &HkSwitch2InnerLayer4,
&HkSwitch2InnerLayer5, &HkSwitch2InnerLayer6, &HkSwitch2ComponentLayer,
&HkSwitch2NextCopperLayer, &HkSwitch2PreviousCopperLayer, &HkAddModule,
&HkAddTrack, &HkToggle, NULL };
&HkAddTrack, NULL };
// List of hotkey descriptors for the module editor
Ki_HotkeyInfo* s_module_edit_Hotkey_List[] = { NULL };
......@@ -276,10 +275,6 @@ void WinEDA_PcbFrame::OnHotKey(wxDC* DC, int hotkey, EDA_BaseStruct* DrawStruct)
cmd.SetId(ID_TRACK_BUTT);
GetEventHandler()->ProcessEvent(cmd);
break;
case HK_TOGGLE:
cmd.SetId(ID_TOGGLE_PRESENT_COMMAND);
GetEventHandler()->ProcessEvent(cmd);
break;
case HK_ZOOM_AUTO:
cmd.SetId(ID_ZOOM_PAGE);
......
pcbnew/hotkeys.h
View file @ 24ce9409
......@@ -50,7 +50,6 @@ enum hotkey_id_commnand {
HK_SWITCH_LAYER_TO_INNER14,
HK_ADD_MODULE,
HK_ADD_TRACK,
HK_TOGGLE,
HK_MOVE_TRACK,
HK_SLIDE_TRACK
};
......
pcbnew/onrightclick.cpp
View file @ 24ce9409
......@@ -207,7 +207,7 @@ bool WinEDA_PcbFrame::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
case TYPE_TRACK:
case TYPE_VIA:
locate_track = TRUE;
locate_track = true;
createPopupMenuForTracks( (TRACK*) item, aPopMenu );
break;
......@@ -545,13 +545,13 @@ void WinEDA_PcbFrame::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
ADD_MENUITEM_WITH_SUBMENU( PopMenu, track_mnu,
ID_POPUP_PCB_SETFLAGS_TRACK_MNU, _( "Set Flags" ), flag_xpm );
track_mnu->Append( ID_POPUP_PCB_LOCK_ON_TRACKSEG, _( "Locked: Yes" ), wxEmptyString, TRUE );
track_mnu->Append( ID_POPUP_PCB_LOCK_OFF_TRACKSEG, _( "Locked: No" ), wxEmptyString, TRUE );
track_mnu->Append( ID_POPUP_PCB_LOCK_ON_TRACKSEG, _( "Locked: Yes" ), wxEmptyString, true );
track_mnu->Append( ID_POPUP_PCB_LOCK_OFF_TRACKSEG, _( "Locked: No" ), wxEmptyString, true );
if( Track->GetState( SEGM_FIXE ) )
track_mnu->Check( ID_POPUP_PCB_LOCK_ON_TRACKSEG, TRUE );
track_mnu->Check( ID_POPUP_PCB_LOCK_ON_TRACKSEG, true );
else
track_mnu->Check( ID_POPUP_PCB_LOCK_OFF_TRACKSEG, TRUE );
track_mnu->Check( ID_POPUP_PCB_LOCK_OFF_TRACKSEG, true );
if( !flags )
{
......@@ -830,7 +830,8 @@ void WinEDA_PcbFrame::createPopUpMenuForMarkers( MARKER_PCB* aMarker, wxMenu* aP
static wxMenu* Append_Track_Width_List( BOARD * aBoard )
/*******************************************************/
/* create a wxMenu * which shows the last used track widths and via diameters
/** function Append_Track_Width_List
* creates a wxMenu * which shows the last used track widths and via diameters
* @return a pointeur to the menu
*/
{
......@@ -847,10 +848,16 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
_( "Auto Width" ),
_(
"Use the track width when starting on a track, otherwise the current track width" ),
TRUE );
true );
if( g_DesignSettings.m_UseConnectedTrackWidth )
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_AUTO_WIDTH, TRUE );
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_AUTO_WIDTH, true );
if( aBoard->m_ViaSizeSelector != 0 || aBoard->m_TrackWidthSelector != 0 )
trackwidth_menu->Append( ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES,
_( "Use Netclass Values" ),
_( "Use track and via sizes from their Netclass values" ),
true );
for( unsigned ii = 0; ii < aBoard->m_TrackWidthHistory.size(); ii++ )
{
......@@ -862,11 +869,18 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
else
msg.Printf( _( "Track %.3f" ), value );
trackwidth_menu->Append( ID_POPUP_PCB_SELECT_WIDTH1 + ii, msg, wxEmptyString, TRUE );
if ( ii == 0 )
msg << _(" (Use NetClass)" );
trackwidth_menu->Append( ID_POPUP_PCB_SELECT_WIDTH1 + ii, msg, wxEmptyString, true );
if( (aBoard->m_TrackWidthHistory[ii] == g_DesignSettings.m_CurrentTrackWidth)
&& !g_DesignSettings.m_UseConnectedTrackWidth )
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_WIDTH1 + ii, TRUE );
}
if( g_DesignSettings.m_UseConnectedTrackWidth )
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_AUTO_WIDTH, true );
else
{
if( aBoard->m_TrackWidthSelector < (int)aBoard->m_TrackWidthHistory.size() )
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_WIDTH1 + aBoard->m_TrackWidthSelector, true );
}
trackwidth_menu->AppendSeparator();
......@@ -879,10 +893,12 @@ static wxMenu* Append_Track_Width_List( BOARD * aBoard )
msg.Printf( _( "Via %.1f" ), value * 1000 );
else
msg.Printf( _( "Via %.3f" ), value );
trackwidth_menu->Append( ID_POPUP_PCB_SELECT_VIASIZE1 + ii, msg, wxEmptyString, TRUE );
if( aBoard->m_ViaSizeHistory[ii] == g_DesignSettings.m_CurrentViaSize )
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_VIASIZE1 + ii, TRUE );
if ( ii == 0 )
msg << _(" (Use NetClass)" );
trackwidth_menu->Append( ID_POPUP_PCB_SELECT_VIASIZE1 + ii, msg, wxEmptyString, true );
}
if( aBoard->m_ViaSizeSelector < (int)aBoard->m_ViaSizeHistory.size() )
trackwidth_menu->Check( ID_POPUP_PCB_SELECT_VIASIZE1 + aBoard->m_ViaSizeSelector, true );
return trackwidth_menu;
}
pcbnew/pcbframe.cpp
View file @ 24ce9409
......@@ -31,174 +31,177 @@
/*******************************/
BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer )
EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_PcbFrame::OnSockRequest )
EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer )
EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_PcbFrame::OnSockRequest )
EVT_KICAD_CHOICEBOX( ID_ON_ZOOM_SELECT, WinEDA_PcbFrame::OnSelectZoom )
EVT_KICAD_CHOICEBOX( ID_ON_GRID_SELECT, WinEDA_PcbFrame::OnSelectGrid )
EVT_KICAD_CHOICEBOX( ID_ON_ZOOM_SELECT, WinEDA_PcbFrame::OnSelectZoom )
EVT_KICAD_CHOICEBOX( ID_ON_GRID_SELECT, WinEDA_PcbFrame::OnSelectGrid )
EVT_CLOSE( WinEDA_PcbFrame::OnCloseWindow )
EVT_SIZE( WinEDA_PcbFrame::OnSize )
EVT_CLOSE( WinEDA_PcbFrame::OnCloseWindow )
EVT_SIZE( WinEDA_PcbFrame::OnSize )
EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_PcbFrame::OnZoom )
EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_PcbFrame::OnZoom )
EVT_TOOL( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_MENU_READ_LAST_SAVED_VERSION_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_MENU_RECOVER_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_NEW_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_OPEN_MODULE_EDITOR, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_MENU_READ_LAST_SAVED_VERSION_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_MENU_RECOVER_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_NEW_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
EVT_TOOL( ID_OPEN_MODULE_EDITOR, WinEDA_PcbFrame::Process_Special_Functions )
// Menu Files:
EVT_MENU( ID_MAIN_MENUBAR, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_MAIN_MENUBAR, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_NEW_BOARD, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_APPEND_FILE, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_SAVE_BOARD_AS, WinEDA_PcbFrame::Files_io )
EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, WinEDA_PcbFrame::OnFileHistory )
EVT_MENU( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_NEW_BOARD, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_SAVE_BOARD, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_APPEND_FILE, WinEDA_PcbFrame::Files_io )
EVT_MENU( ID_SAVE_BOARD_AS, WinEDA_PcbFrame::Files_io )
EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, WinEDA_PcbFrame::OnFileHistory )
EVT_MENU( ID_GEN_PLOT, WinEDA_PcbFrame::ToPlotter )
EVT_MENU( ID_GEN_PLOT, WinEDA_PcbFrame::ToPlotter )
EVT_MENU( ID_GEN_EXPORT_SPECCTRA, WinEDA_PcbFrame::ExportToSpecctra )
EVT_MENU( ID_GEN_EXPORT_FILE_GENCADFORMAT, WinEDA_PcbFrame::ExportToGenCAD )
EVT_MENU( ID_GEN_EXPORT_FILE_MODULE_REPORT,
EVT_MENU( ID_GEN_EXPORT_SPECCTRA, WinEDA_PcbFrame::ExportToSpecctra )
EVT_MENU( ID_GEN_EXPORT_FILE_GENCADFORMAT, WinEDA_PcbFrame::ExportToGenCAD )
EVT_MENU( ID_GEN_EXPORT_FILE_MODULE_REPORT,
WinEDA_PcbFrame::GenModuleReport )
EVT_MENU( ID_GEN_IMPORT_SPECCTRA_SESSION,
EVT_MENU( ID_GEN_IMPORT_SPECCTRA_SESSION,
WinEDA_PcbFrame::ImportSpecctraSession )
EVT_MENU( ID_GEN_IMPORT_SPECCTRA_DESIGN,
EVT_MENU( ID_GEN_IMPORT_SPECCTRA_DESIGN,
WinEDA_PcbFrame::ImportSpecctraDesign )
EVT_MENU( ID_MENU_ARCHIVE_NEW_MODULES,
EVT_MENU( ID_MENU_ARCHIVE_NEW_MODULES,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_MENU_ARCHIVE_ALL_MODULES,
EVT_MENU( ID_MENU_ARCHIVE_ALL_MODULES,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_EXIT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_EXIT, WinEDA_PcbFrame::Process_Special_Functions )
// menu Config
EVT_MENU_RANGE( ID_CONFIG_AND_PREFERENCES_START,
EVT_MENU_RANGE( ID_CONFIG_AND_PREFERENCES_START,
ID_CONFIG_AND_PREFERENCES_END,
WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_COLORS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_OPTIONS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_COPPER_LAYERS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_TRACK_SIZE_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_DRAWINGS_WIDTHS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_PAD_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_CONFIG_SAVE, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_CONFIG_READ, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_DISPLAY_OPTIONS_SETUP, WinEDA_PcbFrame::InstallDisplayOptionsDialog )
EVT_MENU( ID_COLORS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_OPTIONS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_COPPER_LAYERS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_TRACK_SIZE_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_DRAWINGS_WIDTHS_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_PAD_SETUP, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_CONFIG_SAVE, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_CONFIG_READ, WinEDA_PcbFrame::Process_Config )
EVT_MENU( ID_PCB_DISPLAY_OPTIONS_SETUP, WinEDA_PcbFrame::InstallDisplayOptionsDialog )
EVT_MENU( ID_PCB_USER_GRID_SETUP,
EVT_MENU( ID_PCB_USER_GRID_SETUP,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,
EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END,
WinEDA_DrawFrame::SetLanguage )
// menu Postprocess
EVT_MENU( ID_PCB_GEN_POS_MODULES_FILE, WinEDA_PcbFrame::GenModulesPosition )
EVT_MENU( ID_PCB_GEN_DRILL_FILE, WinEDA_PcbFrame::InstallDrillFrame )
EVT_MENU( ID_PCB_GEN_CMP_FILE, WinEDA_PcbFrame::RecreateCmpFileFromBoard )
EVT_MENU( ID_PCB_GEN_BOM_FILE_FROM_BOARD, WinEDA_PcbFrame::RecreateBOMFileFromBoard )
EVT_MENU( ID_PCB_GEN_POS_MODULES_FILE, WinEDA_PcbFrame::GenModulesPosition )
EVT_MENU( ID_PCB_GEN_DRILL_FILE, WinEDA_PcbFrame::InstallDrillFrame )
EVT_MENU( ID_PCB_GEN_CMP_FILE, WinEDA_PcbFrame::RecreateCmpFileFromBoard )
EVT_MENU( ID_PCB_GEN_BOM_FILE_FROM_BOARD, WinEDA_PcbFrame::RecreateBOMFileFromBoard )
// menu Miscellaneous
EVT_MENU( ID_MENU_LIST_NETS, WinEDA_PcbFrame::ListNetsAndSelect )
EVT_MENU( ID_PCB_GLOBAL_DELETE, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_MENU_PCB_CLEAN, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_MENU_PCB_SWAP_LAYERS,
EVT_MENU( ID_MENU_LIST_NETS, WinEDA_PcbFrame::ListNetsAndSelect )
EVT_MENU( ID_PCB_GLOBAL_DELETE, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_MENU_PCB_CLEAN, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU( ID_MENU_PCB_SWAP_LAYERS,
WinEDA_PcbFrame::Process_Special_Functions )
// Menu Help
EVT_MENU( ID_GENERAL_HELP, WinEDA_DrawFrame::GetKicadHelp )
EVT_MENU( ID_KICAD_ABOUT, WinEDA_BasicFrame::GetKicadAbout )
EVT_MENU( ID_GENERAL_HELP, WinEDA_DrawFrame::GetKicadHelp )
EVT_MENU( ID_KICAD_ABOUT, WinEDA_BasicFrame::GetKicadAbout )
// Menu 3D Frame
EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, WinEDA_PcbFrame::Show3D_Frame )
EVT_MENU( ID_MENU_PCB_SHOW_3D_FRAME, WinEDA_PcbFrame::Show3D_Frame )
// Menu Get Design Rules Editor
EVT_MENU( ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, WinEDA_PcbFrame::ShowDesignRulesEditor )
EVT_MENU( ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, WinEDA_PcbFrame::ShowDesignRulesEditor )
// Horizontal toolbar
EVT_TOOL( ID_TO_LIBRARY, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_SHEET_SET, WinEDA_DrawFrame::Process_PageSettings )
EVT_TOOL( wxID_CUT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( wxID_COPY, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_UNDO_BUTT, WinEDA_PcbFrame::GetBoardFromUndoList )
EVT_TOOL( ID_REDO_BUTT, WinEDA_PcbFrame::GetBoardFromRedoList )
EVT_TOOL( ID_GEN_PRINT, WinEDA_DrawFrame::ToPrinter )
EVT_TOOL( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print )
EVT_TOOL( ID_GEN_PLOT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_GET_NETLIST, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_DRC_CONTROL, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,
EVT_TOOL( ID_TO_LIBRARY, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_SHEET_SET, WinEDA_DrawFrame::Process_PageSettings )
EVT_TOOL( wxID_CUT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( wxID_COPY, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_UNDO_BUTT, WinEDA_PcbFrame::GetBoardFromUndoList )
EVT_TOOL( ID_REDO_BUTT, WinEDA_PcbFrame::GetBoardFromRedoList )
EVT_TOOL( ID_GEN_PRINT, WinEDA_DrawFrame::ToPrinter )
EVT_TOOL( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print )
EVT_TOOL( ID_GEN_PLOT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_GET_NETLIST, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_DRC_CONTROL, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
EVT_TOOL( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
WinEDA_PcbFrame::Tracks_and_Vias_Size_Event )
EVT_KICAD_CHOICEBOX( ID_TOOLBARH_PCB_SELECT_LAYER,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_KICAD_CHOICEBOX( ID_TOOLBARH_PCB_SELECT_LAYER,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_VIA_SIZE,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_TOOLBARH_PCB_AUTOPLACE, WinEDA_PcbFrame::AutoPlace )
EVT_TOOL( ID_TOOLBARH_PCB_AUTOROUTE, WinEDA_PcbFrame::AutoPlace )
EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
WinEDA_PcbFrame::Tracks_and_Vias_Size_Event )
EVT_KICAD_CHOICEBOX( ID_AUX_TOOLBAR_PCB_VIA_SIZE,
WinEDA_PcbFrame::Tracks_and_Vias_Size_Event )
EVT_TOOL( ID_TOOLBARH_PCB_AUTOPLACE, WinEDA_PcbFrame::AutoPlace )
EVT_TOOL( ID_TOOLBARH_PCB_AUTOROUTE, WinEDA_PcbFrame::AutoPlace )
EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
WinEDA_PcbFrame::Access_to_External_Tool )
// Option toolbar
EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
WinEDA_PcbFrame::OnSelectOptionToolbar )
// Vertical toolbar:
EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_HIGHLIGHT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_COMPONENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_TRACK_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_TOGGLE_PRESENT_COMMAND, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ZONES_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_MIRE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ADD_TEXT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ADD_LINE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_DELETE_ITEM_BUTT,
EVT_TOOL( ID_NO_SELECT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_HIGHLIGHT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_COMPONENT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_TRACK_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ZONES_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_MIRE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ADD_TEXT_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_ADD_LINE_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_DELETE_ITEM_BUTT,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_SHOW_1_RATSNEST_BUTT,
EVT_TOOL( ID_PCB_SHOW_1_RATSNEST_BUTT,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_PCB_PLACE_OFFSET_COORD_BUTT,
EVT_TOOL( ID_PCB_PLACE_OFFSET_COORD_BUTT,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL_RANGE( ID_PCB_MUWAVE_START_CMD, ID_PCB_MUWAVE_END_CMD,
EVT_TOOL_RANGE( ID_PCB_MUWAVE_START_CMD, ID_PCB_MUWAVE_END_CMD,
WinEDA_PcbFrame::ProcessMuWaveFunctions )
EVT_TOOL_RCLICKED( ID_TRACK_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_ADD_TEXT_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_ADD_LINE_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_TRACK_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_CIRCLE_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_ARC_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_ADD_TEXT_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_ADD_LINE_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_TOOL_RCLICKED( ID_PCB_COTATION_BUTT, WinEDA_PcbFrame::ToolOnRightClick )
EVT_MENU_RANGE( ID_POPUP_PCB_AUTOPLACE_START_RANGE,
EVT_MENU_RANGE( ID_POPUP_PCB_AUTOPLACE_START_RANGE,
ID_POPUP_PCB_AUTOPLACE_END_RANGE,
WinEDA_PcbFrame::AutoPlace )
EVT_MENU_RANGE( ID_POPUP_PCB_START_RANGE, ID_POPUP_PCB_END_RANGE,
EVT_MENU_RANGE( ID_POPUP_PCB_START_RANGE, ID_POPUP_PCB_END_RANGE,
WinEDA_PcbFrame::Process_Special_Functions )
// popup menus
EVT_MENU( ID_POPUP_PCB_DELETE_TRACKSEG, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
// Tracks and vias sizes general options
EVT_MENU_RANGE( ID_POPUP_PCB_SELECT_WIDTH_START_RANGE, ID_POPUP_PCB_SELECT_WIDTH_END_RANGE,
WinEDA_PcbFrame::Tracks_and_Vias_Size_Event )
// popup menus
EVT_MENU( ID_POPUP_PCB_DELETE_TRACKSEG, WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,
WinEDA_PcbFrame::Process_Special_Functions )
EVT_MENU_RANGE( ID_POPUP_VIA_EDIT_START_RANGE, ID_POPUP_VIA_EDIT_END_RANGE,
EVT_MENU_RANGE( ID_POPUP_VIA_EDIT_START_RANGE, ID_POPUP_VIA_EDIT_END_RANGE,
WinEDA_PcbFrame::Via_Edit_Control )
// PopUp Menus pour Zooms traites dans drawpanel.cpp
......@@ -271,7 +274,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + gridselection );
long display_microwave_tools = 0;
config->Read( SHOW_MICROWAVE_TOOLS, &display_microwave_tools );
if ( display_microwave_tools )
if( display_microwave_tools )
ReCreateAuxVToolbar();
}
ReCreateOptToolbar();
......@@ -283,6 +286,7 @@ WinEDA_PcbFrame::~WinEDA_PcbFrame()
/************************************/
{
extern PARAM_CFG_BASE* ParamCfgList[];
wxGetApp().SaveCurrentSetupValues( ParamCfgList );
delete m_drc;
}
......@@ -292,7 +296,7 @@ WinEDA_PcbFrame::~WinEDA_PcbFrame()
void WinEDA_PcbFrame::OnCloseWindow( wxCloseEvent& Event )
/********************************************************/
{
wxConfig * config = wxGetApp().m_EDA_Config;
wxConfig* config = wxGetApp().m_EDA_Config;
DrawPanel->m_AbortRequest = true;
......@@ -335,7 +339,7 @@ void WinEDA_PcbFrame::OnCloseWindow( wxCloseEvent& Event )
}
// do not show the window because ScreenPcb will be deleted and we do not want any paint event
Show(false);
Show( false );
ActiveScreen = ScreenPcb;
Destroy();
}
......@@ -356,17 +360,18 @@ void WinEDA_PcbFrame::Show3D_Frame( wxCommandEvent& event )
m_Draw3DFrame->Show( true );
}
/**
* Display the Design Rules Editor.
*/
void WinEDA_PcbFrame::ShowDesignRulesEditor( wxCommandEvent& event )
{
DIALOG_DESIGN_RULES dR_editor( this );
int returncode = dR_editor.ShowModal( );
if ( returncode == wxID_OK ) // New rules, or others changes.
int returncode = dR_editor.ShowModal();
if( returncode == wxID_OK ) // New rules, or others changes.
{
ReCreateLayerBox( NULL );
GetScreen()->SetModify();
}
}
pcbnew/pcbnew_id.h
View file @ 24ce9409
......@@ -105,16 +105,6 @@ enum pcbnew_ids
ID_POPUP_PCB_IMPORT_PAD_SETTINGS,
ID_POPUP_PCB_EXPORT_PAD_SETTINGS,
ID_POPUP_PCB_SELECT_WIDTH,
ID_POPUP_PCB_SELECT_AUTO_WIDTH,
ID_POPUP_PCB_SELECT_WIDTH1,
ID_POPUP_PCB_SELECT_WIDTH2,
ID_POPUP_PCB_SELECT_WIDTH3,
ID_POPUP_PCB_SELECT_WIDTH4,
ID_POPUP_PCB_SELECT_WIDTH5,
ID_POPUP_PCB_SELECT_WIDTH6,
ID_POPUP_PCB_SELECT_WIDTH7,
ID_POPUP_PCB_SELECT_WIDTH8,
ID_POPUP_PCB_EDIT_TRACKSEG,
ID_POPUP_PCB_EDIT_TRACK_MNU,
ID_POPUP_PCB_EDIT_NET,
......@@ -157,8 +147,22 @@ enum pcbnew_ids
ID_POPUP_PCB_GETINFO_MARKER,
ID_POPUP_PCB_END_RANGE,
// Via edition
ID_POPUP_VIA_EDIT_START_RANGE,
// Tracks and vias sizes general options
ID_AUX_TOOLBAR_PCB_VIA_SIZE,
ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
ID_POPUP_PCB_SELECT_WIDTH_START_RANGE,
ID_POPUP_PCB_SELECT_WIDTH,
ID_POPUP_PCB_SELECT_AUTO_WIDTH,
ID_POPUP_PCB_SELECT_USE_NETCLASS_VALUES,
ID_POPUP_PCB_SELECT_WIDTH1,
ID_POPUP_PCB_SELECT_WIDTH2,
ID_POPUP_PCB_SELECT_WIDTH3,
ID_POPUP_PCB_SELECT_WIDTH4,
ID_POPUP_PCB_SELECT_WIDTH5,
ID_POPUP_PCB_SELECT_WIDTH6,
ID_POPUP_PCB_SELECT_WIDTH7,
ID_POPUP_PCB_SELECT_WIDTH8,
ID_POPUP_PCB_SELECT_VIASIZE,
ID_POPUP_PCB_SELECT_VIASIZE1,
ID_POPUP_PCB_SELECT_VIASIZE2,
......@@ -168,6 +172,10 @@ enum pcbnew_ids
ID_POPUP_PCB_SELECT_VIASIZE6,
ID_POPUP_PCB_SELECT_VIASIZE7,
ID_POPUP_PCB_SELECT_VIASIZE8,
ID_POPUP_PCB_SELECT_WIDTH_END_RANGE,
// Via edition
ID_POPUP_VIA_EDIT_START_RANGE,
ID_POPUP_PCB_VIA_EDITING,
ID_POPUP_PCB_VIA_HOLE_TO_DEFAULT,
ID_POPUP_PCB_VIA_HOLE_TO_VALUE,
......@@ -225,16 +233,7 @@ enum pcbnew_ids
ID_TOOLBARH_PCB_AUTOROUTE,
ID_TOOLBARH_PCB_FREEROUTE_ACCESS,
ID_AUX_TOOLBAR_PCB_VIA_SIZE,
ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
ID_AUX_TOOLBAR_PCB_UNUSED2,
ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR,
ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
ID_AUX_TOOLBAR_PCB_UNUSED3,
ID_AUX_TOOLBAR_PCB_UNUSED4,
ID_AUX_TOOLBAR_PCB_UNUSED5,
ID_AUX_TOOLBAR_PCB_UNUSED6,
ID_AUX_TOOLBAR_PCB_UNUSED7,
ID_PCB_GEN_POS_MODULES_FILE,
ID_PCB_GEN_DRILL_FILE,
......@@ -281,9 +280,7 @@ enum pcbnew_ids
ID_PCB_MUWAVE_TOOL_STUB_CMD,
ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD,
ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD,
ID_PCB_MUWAVE_END_CMD,
ID_TOGGLE_PRESENT_COMMAND,
ID_PCB_MUWAVE_END_CMD
};
#endif /* __PCBNEW_IDS_H__ */
pcbnew/tool_pcb.cpp
View file @ 24ce9409
......@@ -538,11 +538,12 @@ void WinEDA_PcbFrame::ReCreateAuxVToolbar()
void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
/****************************************************/
/* Create auxiliary horizontal toolbar
/* Creates auxiliary horizontal toolbar
* displays:
* existing track width choice
* selection for auto track width
* existing via size choice
* Current strategy (to choose the track and via sizes)
* grid size choice
* zoom level choice
*/
......@@ -555,14 +556,25 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
m_AuxiliaryToolBar = new WinEDA_Toolbar( TOOLBAR_AUX, this,
ID_AUX_TOOLBAR, true );
// Set up toolbar
m_AuxiliaryToolBar->AddSeparator();
m_TrackAndViasSizesList_Changed = true;
/* Set up toolbar items */
// Creates box to display and choose tracks widths:
m_SelTrackWidthBox = new WinEDAChoiceBox( m_AuxiliaryToolBar,
ID_AUX_TOOLBAR_PCB_TRACK_WIDTH,
wxPoint( -1, -1 ),
wxSize( LISTBOX_WIDTH + 20, -1 ) );
wxSize( LISTBOX_WIDTH + 10, -1 ) );
m_AuxiliaryToolBar->AddControl( m_SelTrackWidthBox );
m_TrackAndViasSizesList_Changed = true;
// Creates box to display and choose vias diameters:
m_SelViaSizeBox = new WinEDAChoiceBox( m_AuxiliaryToolBar,
ID_AUX_TOOLBAR_PCB_VIA_SIZE,
wxPoint( -1, -1 ),
wxSize( LISTBOX_WIDTH + 10, -1 ) );
m_AuxiliaryToolBar->AddControl( m_SelViaSizeBox );
// Creates box to display tracks and vias clearance:
m_ClearanceBox = new wxTextCtrl( m_AuxiliaryToolBar,
-1,
wxEmptyString,
......@@ -572,19 +584,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
m_AuxiliaryToolBar->AddControl( m_ClearanceBox );
m_ClearanceBox->SetToolTip(_("Current NetClass clearance value") );
m_AuxiliaryToolBar->AddTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
wxEmptyString,
wxBitmap( auto_track_width_xpm ),
_( "Auto track width: when starting on an existing track use its width\notherwise, use current width setting" ),
wxITEM_CHECK );
m_AuxiliaryToolBar->AddSeparator();
m_SelViaSizeBox = new WinEDAChoiceBox( m_AuxiliaryToolBar,
ID_AUX_TOOLBAR_PCB_VIA_SIZE,
wxPoint( -1, -1 ),
wxSize( LISTBOX_WIDTH, -1 ) );
m_AuxiliaryToolBar->AddControl( m_SelViaSizeBox );
// Creates box to display the current NetClass:
m_NetClassSelectedBox = new wxTextCtrl( m_AuxiliaryToolBar,
-1,
wxEmptyString,
......@@ -594,7 +594,14 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
m_AuxiliaryToolBar->AddControl( m_NetClassSelectedBox );
m_NetClassSelectedBox->SetToolTip(_("Name of the current NetClass") );
// Boite de selection du pas de grille
// Creates box to display and choose strategy to handle tracks an vias sizes:
m_AuxiliaryToolBar->AddTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
wxEmptyString,
wxBitmap( auto_track_width_xpm ),
_( "Auto track width: when starting on an existing track use its width\notherwise, use current width setting" ),
wxITEM_CHECK );
// Add the box to display and select the current grid size:
m_AuxiliaryToolBar->AddSeparator();
m_SelGridBox = new WinEDAChoiceBox( m_AuxiliaryToolBar,
ID_ON_GRID_SELECT,
......@@ -602,7 +609,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
wxSize( LISTBOX_WIDTH, -1 ) );
m_AuxiliaryToolBar->AddControl( m_SelGridBox );
// Boite de selection du Zoom
// Add the box to display and select the current Zoom
m_AuxiliaryToolBar->AddSeparator();
m_SelZoomBox = new WinEDAChoiceBox( m_AuxiliaryToolBar,
ID_ON_ZOOM_SELECT,
......@@ -630,7 +637,7 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar()
m_AuxiliaryToolBar->Realize();
}
// mise a jour des affichages
// Update displayed values
m_SelGridBox->Clear();
wxString format = _( "Grid");
if( g_UnitMetric == INCHES )
......
pcbnew/toolbars_update_user_interface.cpp
View file @ 24ce9409
......@@ -74,8 +74,6 @@ void WinEDA_PcbFrame::AuxiliaryToolBar_DesignRules_Update_UI( )
void WinEDA_PcbFrame::AuxiliaryToolBar_Update_UI( )
{
wxString msg;
m_AuxiliaryToolBar->ToggleTool( ID_AUX_TOOLBAR_PCB_SELECT_AUTO_WIDTH,
g_DesignSettings.m_UseConnectedTrackWidth );
AuxiliaryToolBar_DesignRules_Update_UI( );
......@@ -85,12 +83,14 @@ void WinEDA_PcbFrame::AuxiliaryToolBar_Update_UI( )
for( unsigned ii = 0; ii < GetBoard()->m_TrackWidthHistory.size(); ii++ )
{
msg = _( "Track" ) + ReturnStringValue(GetBoard()->m_TrackWidthHistory[ii]);
if (ii == 0 )
msg << _(" *");
m_SelTrackWidthBox->Append( msg );
}
if( GetBoard()->m_TrackWidthSelector >= (int)GetBoard()->m_TrackWidthHistory.size() )
}
if( GetBoard()->m_TrackWidthSelector >= GetBoard()->m_TrackWidthHistory.size() )
GetBoard()->m_TrackWidthSelector = 0;
m_SelTrackWidthBox->SetSelection( GetBoard()->m_TrackWidthSelector );
}
if( m_SelViaSizeBox && m_TrackAndViasSizesList_Changed )
{
......@@ -98,12 +98,14 @@ void WinEDA_PcbFrame::AuxiliaryToolBar_Update_UI( )
for( unsigned ii = 0; ii < GetBoard()->m_ViaSizeHistory.size(); ii++ )
{
msg = _( "Via" ) + ReturnStringValue(GetBoard()->m_ViaSizeHistory[ii]);
if (ii == 0 )
msg << _(" *");
m_SelViaSizeBox->Append( msg );
}
if( GetBoard()->m_ViaSizeSelector >= (int)GetBoard()->m_ViaSizeHistory.size() )
}
if( GetBoard()->m_ViaSizeSelector >= GetBoard()->m_ViaSizeHistory.size() )
GetBoard()->m_ViaSizeSelector = 0;
m_SelViaSizeBox->SetSelection( GetBoard()->m_ViaSizeSelector );
}
if( m_SelZoomBox )
{
......
pcbnew/via_edit.cpp
View file @ 24ce9409
......@@ -19,7 +19,6 @@ void WinEDA_PcbFrame::Via_Edit_Control( wxCommandEvent& event )
* Execute edit commands relative to vias
*/
{
int ii;
TRACK* via_struct;
SEGVIA* via = (SEGVIA*) GetCurItem();
wxClientDC dc( DrawPanel );
......@@ -33,20 +32,6 @@ void WinEDA_PcbFrame::Via_Edit_Control( wxCommandEvent& event )
switch( event.GetId() )
{
case ID_POPUP_PCB_SELECT_VIASIZE1:
case ID_POPUP_PCB_SELECT_VIASIZE2:
case ID_POPUP_PCB_SELECT_VIASIZE3:
case ID_POPUP_PCB_SELECT_VIASIZE4:
case ID_POPUP_PCB_SELECT_VIASIZE5:
case ID_POPUP_PCB_SELECT_VIASIZE6:
case ID_POPUP_PCB_SELECT_VIASIZE7:
case ID_POPUP_PCB_SELECT_VIASIZE8: // selec the new current value for via size (via diameter)
DrawPanel->MouseToCursorSchema();
ii = event.GetId() - ID_POPUP_PCB_SELECT_VIASIZE1;
g_DesignSettings.m_CurrentViaSize = GetBoard()->m_ViaSizeHistory[ii];
DisplayTrackSettings();
break;
case ID_POPUP_PCB_VIA_HOLE_ENTER_VALUE: // Enter a new alternate value for drill via
InstallPcbOptionsFrame( wxDefaultPosition, &dc, ID_PCB_TRACK_SIZE_SETUP );
DrawPanel->MouseToCursorSchema();
......@@ -124,7 +109,7 @@ void WinEDA_PcbFrame::Via_Edit_Control( wxCommandEvent& event )
break;
default:
wxMessageBox( wxT( "WinEDA_PcbFrame::Via_Edition() error: unknown command" ) );
wxMessageBox( wxT( "WinEDA_PcbFrame::Via_Edit_Control() error: unknown command" ) );
break;
}
......
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