From 958e663d64722e3474fe14d24a29a71a14c61203 Mon Sep 17 00:00:00 2001 From: charras Date: Wed, 19 Aug 2009 14:19:35 +0000 Subject: [PATCH] pcbnew: bugs 2840153, 2840154 fixed (bug 2840150 already fixed) --- internat/fr/kicad.mo | Bin 190587 -> 191080 bytes internat/fr/kicad.po | 438 +++++++++++++----------- pcbnew/dialog_edit_module_text.cpp | 20 +- pcbnew/dialog_edit_module_text_base.cpp | 2 - pcbnew/dialog_edit_module_text_base.fbp | 2 +- pcbnew/dialog_edit_module_text_base.h | 1 - pcbnew/netlist.cpp | 24 +- 7 files changed, 256 insertions(+), 231 deletions(-) diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index b43276d2e3bc2780254b4d8d26156974081bcdf0..4d5938afe6ea6ae72d2dfd200d71345fa143a4a9 100644 GIT binary patch delta 59915 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 WNK|lAe0ZoVYrfFLd^?kMcKaVU#P;w2 delta 59421 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±@58gs|#m;aKvXt4( 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\n" "MIME-Version: 1.0\n" @@ -2165,7 +2165,7 @@ msgstr "Pas en Netliste:" msgid "File <%s> not found, use Netlist for lib module selection" msgstr "Fichier <%s> non trouvé, Netliste utilisée pour sélection des modules en lib." -#: pcbnew/netlist.cpp:1007 +#: pcbnew/netlist.cpp:1003 #, c-format msgid "Component [%s]: footprint <%s> not found" msgstr "Composant [%s]: Module <%s> non trouvé en librairie" @@ -3960,7 +3960,7 @@ msgstr "" "Modèle en mode avancé, pour filtrer les noms de net en liste\n" "Les noms de net correspondant à ce modèle ne sont pas listés" -#: pcbnew/dialog_copper_zones_base.cpp:194 +#: pcbnew/dialog_copper_zones_base.cpp:197 msgid "Net:" msgstr "Net:" @@ -4452,6 +4452,97 @@ msgstr "Visible" msgid "Invisible" msgstr "Invisible" +#: pcbnew/class_board_item.cpp:27 +msgid "Bezier Curve" +msgstr "Courbe de Bezier" + +#: pcbnew/class_board_item.cpp:58 +msgid "Footprint" +msgstr "Module" + +#: pcbnew/class_board_item.cpp:64 +msgid "Pad" +msgstr "Pad" + +#: pcbnew/class_board_item.cpp:67 +msgid "all copper layers" +msgstr "Toutes Couches Cuivre" + +#: pcbnew/class_board_item.cpp:72 +msgid "???" +msgstr "???" + +#: pcbnew/class_board_item.cpp:73 +msgid ") of " +msgstr ") de " + +#: pcbnew/class_board_item.cpp:77 +msgid "Pcb Graphic" +msgstr "Pcb Graphic" + +#: pcbnew/class_board_item.cpp:79 +#: pcbnew/class_board_item.cpp:131 +msgid "Length:" +msgstr "Long.:" + +#: pcbnew/class_board_item.cpp:80 +#: pcbnew/class_board_item.cpp:89 +#: pcbnew/class_board_item.cpp:129 +#: pcbnew/class_board_item.cpp:165 +#: pcbnew/class_board_item.cpp:181 +#: pcbnew/class_board_item.cpp:209 +#: pcbnew/class_board_item.cpp:226 +msgid " on " +msgstr " sur " + +#: pcbnew/class_board_item.cpp:84 +msgid "Pcb Text" +msgstr "Texte Pcb" + +#: pcbnew/class_board_item.cpp:96 +#: pcbnew/dialog_netlist_fbp.cpp:25 +msgid "Reference" +msgstr "Référence" + +#: pcbnew/class_board_item.cpp:100 +#: pcbnew/class_board_item.cpp:106 +#: pcbnew/class_board_item.cpp:116 +msgid " of " +msgstr " de " + +#: pcbnew/class_board_item.cpp:113 +msgid "Graphic" +msgstr "Graphique" + +#: pcbnew/class_board_item.cpp:150 +msgid "Not on copper layer" +msgstr "Pas sur Couches Cuivre" + +#: pcbnew/class_board_item.cpp:169 +#: pcbnew/class_track.cpp:904 +msgid "Zone" +msgstr "Zone" + +#: pcbnew/class_board_item.cpp:191 +msgid "Blind/Buried" +msgstr "Borgne/Aveugle" + +#: pcbnew/class_board_item.cpp:193 +msgid "Micro Via" +msgstr "Micro Via" + +#: pcbnew/class_board_item.cpp:221 +msgid "Dimension" +msgstr "Dimension" + +#: pcbnew/class_board_item.cpp:226 +msgid "Target" +msgstr "Mire" + +#: pcbnew/class_board_item.cpp:227 +msgid "size" +msgstr "dimension" + #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 msgid "No Display" msgstr "Pas d'affichage" @@ -4711,97 +4802,6 @@ msgstr "Texte PCB" msgid "Netlist Selection:" msgstr "Sélection de la netliste" -#: pcbnew/class_board_item.cpp:27 -msgid "Bezier Curve" -msgstr "Courbe de Bezier" - -#: pcbnew/class_board_item.cpp:58 -msgid "Footprint" -msgstr "Module" - -#: pcbnew/class_board_item.cpp:64 -msgid "Pad" -msgstr "Pad" - -#: pcbnew/class_board_item.cpp:67 -msgid "all copper layers" -msgstr "Toutes Couches Cuivre" - -#: pcbnew/class_board_item.cpp:72 -msgid "???" -msgstr "???" - -#: pcbnew/class_board_item.cpp:73 -msgid ") of " -msgstr ") de " - -#: pcbnew/class_board_item.cpp:77 -msgid "Pcb Graphic" -msgstr "Pcb Graphic" - -#: pcbnew/class_board_item.cpp:79 -#: pcbnew/class_board_item.cpp:131 -msgid "Length:" -msgstr "Long.:" - -#: pcbnew/class_board_item.cpp:80 -#: pcbnew/class_board_item.cpp:89 -#: pcbnew/class_board_item.cpp:129 -#: pcbnew/class_board_item.cpp:165 -#: pcbnew/class_board_item.cpp:181 -#: pcbnew/class_board_item.cpp:209 -#: pcbnew/class_board_item.cpp:226 -msgid " on " -msgstr " sur " - -#: pcbnew/class_board_item.cpp:84 -msgid "Pcb Text" -msgstr "Texte Pcb" - -#: pcbnew/class_board_item.cpp:96 -#: pcbnew/dialog_netlist_fbp.cpp:25 -msgid "Reference" -msgstr "Référence" - -#: pcbnew/class_board_item.cpp:100 -#: pcbnew/class_board_item.cpp:106 -#: pcbnew/class_board_item.cpp:116 -msgid " of " -msgstr " de " - -#: pcbnew/class_board_item.cpp:113 -msgid "Graphic" -msgstr "Graphique" - -#: pcbnew/class_board_item.cpp:150 -msgid "Not on copper layer" -msgstr "Pas sur Couches Cuivre" - -#: pcbnew/class_board_item.cpp:169 -#: pcbnew/class_track.cpp:904 -msgid "Zone" -msgstr "Zone" - -#: pcbnew/class_board_item.cpp:191 -msgid "Blind/Buried" -msgstr "Borgne/Aveugle" - -#: pcbnew/class_board_item.cpp:193 -msgid "Micro Via" -msgstr "Micro Via" - -#: pcbnew/class_board_item.cpp:221 -msgid "Dimension" -msgstr "Dimension" - -#: pcbnew/class_board_item.cpp:226 -msgid "Target" -msgstr "Mire" - -#: pcbnew/class_board_item.cpp:227 -msgid "size" -msgstr "dimension" - #: pcbnew/dialog_print_using_printer_base.cpp:35 msgid "Exclude Edges_Pcb Layer" msgstr "Exclure Couche Contours PCB" @@ -5215,23 +5215,23 @@ msgstr "Change Perçage" msgid "Change Orientation" msgstr "Change Orientation" -#: pcbnew/class_board.cpp:535 +#: pcbnew/class_board.cpp:536 msgid "Nodes" msgstr "Nodes" -#: pcbnew/class_board.cpp:538 +#: pcbnew/class_board.cpp:539 msgid "Nets" msgstr "Nets" -#: pcbnew/class_board.cpp:546 +#: pcbnew/class_board.cpp:547 msgid "Links" msgstr "Liens" -#: pcbnew/class_board.cpp:549 +#: pcbnew/class_board.cpp:550 msgid "Connect" msgstr "Connect" -#: pcbnew/class_board.cpp:552 +#: pcbnew/class_board.cpp:553 msgid "NoConn" msgstr "Non Conn" @@ -5259,7 +5259,7 @@ msgstr "Chemin déjà en usage" msgid "Footprint document file:" msgstr "Documentation des Modules:" -#: pcbnew/dialog_edit_module_text.cpp:97 +#: pcbnew/dialog_edit_module_text.cpp:99 msgid "Value:" msgstr "Valeur:" @@ -5727,9 +5727,8 @@ msgstr "Déplacement et Placement Automatique" #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:85 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:117 -#, fuzzy msgid "Auto Move and Place" -msgstr "Move et Place Globaux" +msgstr "Move et Place Automatiques" #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:87 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:119 @@ -5776,13 +5775,13 @@ msgstr "Suppr. Forme 3D:" msgid "3D settings" msgstr "3D Caract" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:81 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:203 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:83 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:205 msgid "Use this attribute for most non smd components" msgstr "Utiliser cet attribut pour la plupart des composants" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:84 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:206 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:86 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:208 msgid "" "Use this attribute for smd components.\n" "Only components with this option are put in the footprint position list file" @@ -5790,38 +5789,38 @@ msgstr "" "Uiliser cet attribut pour les composants CMS.\n" "Seuls les composants avec cette option sont mis dans le fichier de position des composants" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:87 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:209 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:89 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:211 msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)" msgstr "Uiliser cet attribut pour les composants \"virtuels\" directement dessinés sur le PCB (tel que les vieux connecteurs ISA de PC)" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:113 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:235 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:115 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:237 msgid "Enable hotkey move commands and Auto Placement" msgstr "Autoriser les commandes clavier de déplacement et l'auto placement" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:114 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:236 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:116 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:238 msgid "Disable hotkey move commands and Auto Placement" msgstr "Interdire les commandes clavier de déplacement et l'auto placement" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:123 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:245 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:125 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:247 msgid "Shape Scale:" msgstr "Echelle de la forme:" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:127 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:249 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:129 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:251 msgid "Shape Offset:" msgstr "Offset forme:" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:131 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:253 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:133 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:255 msgid "Shape Rotation:" msgstr "Rot de la forme" -#: pcbnew/dialog_edit_module_for_Modedit.cpp:235 -#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:357 +#: pcbnew/dialog_edit_module_for_Modedit.cpp:237 +#: pcbnew/dialog_edit_module_for_BoardEditor.cpp:359 msgid "3D Shape:" msgstr "Forme 3D:" @@ -8426,93 +8425,63 @@ msgstr "Fond Plein" msgid "Fill:" msgstr "Remplissage:" -#: eeschema/edit_component_in_lib.cpp:68 -msgid "Lib Component Properties" -msgstr "Propriétés du composant librairie" - -#: eeschema/edit_component_in_lib.cpp:72 -msgid "Properties for " -msgstr "Propriétés pour " - -#: eeschema/edit_component_in_lib.cpp:77 -msgid "(alias of " -msgstr "(alias de " - -#: eeschema/edit_component_in_lib.cpp:105 -msgid "Alias" -msgstr "Alias" - -#: eeschema/edit_component_in_lib.cpp:131 -#: eeschema/edit_component_in_lib.cpp:208 -msgid "Delete All" -msgstr "Tout Supprimer" - -#: eeschema/edit_component_in_lib.cpp:166 -#: eeschema/edit_component_in_lib.cpp:800 -msgid "Footprint Filter" -msgstr "Filtrage Modules" - -#: eeschema/edit_component_in_lib.cpp:176 -msgid "Footprints" -msgstr "Modules" - -#: eeschema/edit_component_in_lib.cpp:284 -msgid "Show Pin Num" -msgstr "Montre Numéro de Pin" - -#: eeschema/edit_component_in_lib.cpp:494 +#: eeschema/edit_component_in_lib.cpp:302 msgid "Ok to Delete Alias LIST" msgstr "Ok pour effacer la LISTE des Alias" -#: eeschema/edit_component_in_lib.cpp:519 +#: eeschema/edit_component_in_lib.cpp:327 msgid "New alias:" msgstr "Noveau alias" -#: eeschema/edit_component_in_lib.cpp:519 +#: eeschema/edit_component_in_lib.cpp:327 msgid "Component Alias" msgstr "Alias de Composant" -#: eeschema/edit_component_in_lib.cpp:527 +#: eeschema/edit_component_in_lib.cpp:335 msgid "This is the Root Part" msgstr "Ceci est le composant racine" -#: eeschema/edit_component_in_lib.cpp:536 -#: eeschema/edit_component_in_lib.cpp:811 +#: eeschema/edit_component_in_lib.cpp:344 +#: eeschema/edit_component_in_lib.cpp:619 msgid "Already in use" msgstr "Déjà en usage" -#: eeschema/edit_component_in_lib.cpp:561 +#: eeschema/edit_component_in_lib.cpp:369 msgid " is Current Selected Alias!" msgstr " est l' Alias actuellement sélectionné!" -#: eeschema/edit_component_in_lib.cpp:614 +#: eeschema/edit_component_in_lib.cpp:422 msgid "Delete units" msgstr "Supprimer unité" -#: eeschema/edit_component_in_lib.cpp:684 +#: eeschema/edit_component_in_lib.cpp:492 msgid "Create pins for Convert items" msgstr "Créér les pins des unitées converties" -#: eeschema/edit_component_in_lib.cpp:688 +#: eeschema/edit_component_in_lib.cpp:496 msgid "Part as \"De Morgan\" anymore" msgstr "Le composant a une représentation convertie" -#: eeschema/edit_component_in_lib.cpp:713 +#: eeschema/edit_component_in_lib.cpp:521 msgid "Delete Convert items" msgstr "Suppression des éléments convertis" -#: eeschema/edit_component_in_lib.cpp:747 +#: eeschema/edit_component_in_lib.cpp:555 msgid "Doc Files" msgstr "Fichiers de Doc" -#: eeschema/edit_component_in_lib.cpp:778 +#: eeschema/edit_component_in_lib.cpp:586 msgid "Ok to Delete FootprintFilter LIST" msgstr "Ok pour effacer la LISTE des filtres de modules" -#: eeschema/edit_component_in_lib.cpp:800 +#: eeschema/edit_component_in_lib.cpp:608 msgid "New FootprintFilter:" msgstr "Nouveau Filtre de Modules:" +#: eeschema/edit_component_in_lib.cpp:608 +msgid "Footprint Filter" +msgstr "Filtrage Modules" + #: eeschema/dialog_eeschema_config_fbp.cpp:20 msgid "Component library files" msgstr "Fichiers librairies de composants" @@ -8947,37 +8916,17 @@ msgstr "Courant" msgid "All" msgstr "Tout" -#: eeschema/dialog_edit_component_in_lib.cpp:134 -msgid "General :" -msgstr "Général :" +#: eeschema/dialog_edit_component_in_lib.cpp:49 +msgid "Lib Component Properties" +msgstr "Propriétés du composant librairie" -#: eeschema/dialog_edit_component_in_lib.cpp:142 -msgid "Number of Units:" -msgstr "Nombre de Parts:" +#: eeschema/dialog_edit_component_in_lib.cpp:53 +msgid "Properties for " +msgstr "Propriétés pour " -#: eeschema/dialog_edit_component_in_lib.cpp:170 -msgid "Description:" -msgstr "Description:" - -#: eeschema/dialog_edit_component_in_lib.cpp:176 -msgid "Keywords:" -msgstr "Mots Clés:" - -#: eeschema/dialog_edit_component_in_lib.cpp:182 -msgid "DocFileName:" -msgstr "Fichier de Doc:" - -#: eeschema/dialog_edit_component_in_lib.cpp:190 -msgid "Copy Doc" -msgstr "Copie Doc" - -#: eeschema/dialog_edit_component_in_lib.cpp:193 -msgid "Browse DocFiles" -msgstr "Examen Fichiers de Doc" - -#: eeschema/dialog_edit_component_in_lib.cpp:196 -msgid "Description" -msgstr "Description" +#: eeschema/dialog_edit_component_in_lib.cpp:58 +msgid "(alias of " +msgstr "(alias de " #: eeschema/dialog_edit_label.cpp:68 msgid "Global Label Properties" @@ -9078,8 +9027,6 @@ msgstr "Un symbole de non connexion est connecté à plus de une pin" #: eeschema/dialog_edit_component_in_schematic.cpp:94 #: eeschema/dialog_edit_component_in_schematic.cpp:99 -#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:159 -#: eeschema/dialog_edit_libentry_fields_in_lib.cpp:164 msgid "Pos " msgstr "Pos " @@ -9092,6 +9039,93 @@ msgstr "Pas de nom de composant!" msgid "Component [%s] not found!" msgstr "Composant [%s] non trouvé!" +#: eeschema/dialog_edit_component_in_lib_base.cpp:25 +msgid "General :" +msgstr "Général :" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:29 +msgid "" +"Check this option for components that have a De Morgan representation.\n" +"This is usual for gates." +msgstr "" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:33 +msgid "Show Pin Num" +msgstr "Montre Numéro de Pin" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:35 +msgid "Show or hide pin numbers" +msgstr "Affichage ou non des numéroes de pins" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:41 +msgid "Show or hide pin names" +msgstr "Affichage ou non des noms des pins" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:47 +msgid "" +"Check this option to have pin names inside the body and pin number outside.\n" +"If not checked pins names and pins numbers are outside." +msgstr "" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:62 +msgid "Number of Units:" +msgstr "Nombre de Parts:" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:90 +msgid "" +"Check this option for power symbols.\n" +"Power symbols have specific properties" +msgstr "" +"Activer cete option pour les symboles d'alimentation.\n" +"Les symboles d'alimentation ont des propriétés spécifiques" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:96 +msgid "" +"Check this option if Eeschema cannot change parts selections inside a given package\n" +"This happens when parts are differents in this package." +msgstr "" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:108 +msgid "Description:" +msgstr "Description:" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:115 +msgid "Keywords:" +msgstr "Mots Clés:" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:122 +msgid "DocFileName:" +msgstr "Fichier de Doc:" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:132 +msgid "Copy Doc" +msgstr "Copie Doc" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:135 +msgid "Browse DocFiles" +msgstr "Examen Fichiers de Doc" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:143 +msgid "Description" +msgstr "Description" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:151 +msgid "Alias List:" +msgstr "Liste des Alias:" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:169 +#: eeschema/dialog_edit_component_in_lib_base.cpp:203 +msgid "Delete All" +msgstr "Tout Supprimer" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:177 +msgid "Alias" +msgstr "Alias" + +#: eeschema/dialog_edit_component_in_lib_base.cpp:185 +msgid "Footprints" +msgstr "Modules" + #: eeschema/load_one_schematic_file.cpp:70 msgid "Failed to open " msgstr "Erreur ouverture " @@ -11492,9 +11526,9 @@ msgstr "Afficher Modules Cmp" msgid "Show Modules Cu" msgstr "Afficher Modules Cu" -#: pcbnew/dialog_edit_module_text_base.h:64 +#: pcbnew/dialog_edit_module_text_base.h:63 msgid "Footprint text properties" -msgstr "Propriétés du texts sur module" +msgstr "Propriétés du texte du module" #: pcbnew/dialog_exchange_modules_base.h:57 msgid "Exchange Modules" diff --git a/pcbnew/dialog_edit_module_text.cpp b/pcbnew/dialog_edit_module_text.cpp index fd7b8298c4..6c3633881f 100644 --- a/pcbnew/dialog_edit_module_text.cpp +++ b/pcbnew/dialog_edit_module_text.cpp @@ -33,7 +33,7 @@ public: ~DialogEditModuleText() {}; private: - void OnInitDialog( wxInitDialogEvent& event ); + void Init( ); void OnOkClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event ); }; @@ -58,20 +58,22 @@ DialogEditModuleText::DialogEditModuleText( WinEDA_BasePcbFrame* parent, TEXTE_ m_Module = NULL; m_CurrentTextMod = TextMod; if( m_CurrentTextMod ) - { m_Module = (MODULE*) m_CurrentTextMod->GetParent(); - } + Init( ); + + GetSizer()->Fit( this ); + GetSizer()->SetSizeHints( this ); } void DialogEditModuleText::OnCancelClick( wxCommandEvent& event ) { - event.Skip(); + EndModal(0); } /********************************************************/ -void DialogEditModuleText::OnInitDialog( wxInitDialogEvent& event ) +void DialogEditModuleText::Init( ) /********************************************************/ { SetFocus(); @@ -84,7 +86,7 @@ void DialogEditModuleText::OnInitDialog( wxInitDialogEvent& event ) msg.Printf( format, m_Module->m_Reference->m_Text.GetData(), m_Module->m_Value->m_Text.GetData(), - (float) (m_Module->m_Orient / 10) ); + (float) m_Module->m_Orient / 10 ); } else @@ -132,8 +134,6 @@ void DialogEditModuleText::OnInitDialog( wxInitDialogEvent& event ) if( m_CurrentTextMod->m_NoShow ) m_Show->SetSelection( 1 );; - GetSizer()->Fit( this ); - GetSizer()->SetSizeHints( this ); } @@ -184,7 +184,7 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event ) int maxthickness = Clamp_Text_PenSize(width, m_CurrentTextMod->m_Size ); if( width > maxthickness ) { - DisplayError(this, _("The text thickness is too large for the text size. It will be clamped")); + DisplayError(NULL, _("The text thickness is too large for the text size. It will be clamped")); width = maxthickness; } m_CurrentTextMod->SetWidth( width ); @@ -203,5 +203,5 @@ void DialogEditModuleText::OnOkClick( wxCommandEvent& event ) if( m_Module ) m_Module->m_LastEdit_Time = time( NULL ); - Close( TRUE ); + EndModal(1); } diff --git a/pcbnew/dialog_edit_module_text_base.cpp b/pcbnew/dialog_edit_module_text_base.cpp index d21e9c6597..4cc4eed638 100644 --- a/pcbnew/dialog_edit_module_text_base.cpp +++ b/pcbnew/dialog_edit_module_text_base.cpp @@ -117,7 +117,6 @@ DialogEditModuleText_base::DialogEditModuleText_base( wxWindow* parent, wxWindow this->Layout(); // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogEditModuleText_base::OnInitDialog ) ); m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnCancelClick ), NULL, this ); } @@ -125,7 +124,6 @@ DialogEditModuleText_base::DialogEditModuleText_base( wxWindow* parent, wxWindow DialogEditModuleText_base::~DialogEditModuleText_base() { // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DialogEditModuleText_base::OnInitDialog ) ); m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnOkClick ), NULL, this ); m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DialogEditModuleText_base::OnCancelClick ), NULL, this ); } diff --git a/pcbnew/dialog_edit_module_text_base.fbp b/pcbnew/dialog_edit_module_text_base.fbp index beb49f8436..b7f74e9e30 100644 --- a/pcbnew/dialog_edit_module_text_base.fbp +++ b/pcbnew/dialog_edit_module_text_base.fbp @@ -49,7 +49,7 @@ - OnInitDialog + diff --git a/pcbnew/dialog_edit_module_text_base.h b/pcbnew/dialog_edit_module_text_base.h index 7ff590f1d8..d5a375e1ac 100644 --- a/pcbnew/dialog_edit_module_text_base.h +++ b/pcbnew/dialog_edit_module_text_base.h @@ -55,7 +55,6 @@ class DialogEditModuleText_base : public wxDialog wxButton* m_buttonCANCEL; // Virtual event handlers, overide them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ){ event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } diff --git a/pcbnew/netlist.cpp b/pcbnew/netlist.cpp index 07a02d9325..03842d89a9 100644 --- a/pcbnew/netlist.cpp +++ b/pcbnew/netlist.cpp @@ -90,7 +90,7 @@ static MODULE* ReadNetModule( WinEDA_PcbFrame* aFrame, int TstOnly, bool Select_By_Timestamp, bool aChangeFootprint ); -static void LoadListeModules( WinEDA_PcbFrame* aPcbFrame, wxDC* DC ); +static void LoadListeModules( WinEDA_PcbFrame* aPcbFrame ); /* Variables locales */ @@ -230,7 +230,7 @@ void ReadPcbNetlist( WinEDA_PcbFrame* aFrame, /* Load new footprints */ if( s_NbNewModules ) { - LoadListeModules( aFrame, NULL ); + LoadListeModules( aFrame ); // Free module list: MODULEtoLOAD* item, * next_item; @@ -340,7 +340,7 @@ void ReadPcbNetlist( WinEDA_PcbFrame* aFrame, if( !IsOK( NULL, _( "Ok to delete footprints not in netlist ?" ) ) ) break; } - aFrame->Delete_Module( Module, NULL, false ); + Module->DeleteStructure(); } } } @@ -961,7 +961,7 @@ void AddToList( const wxString& NameLibCmp, const wxString& CmpName, const wxStr /***************************************************************/ -void LoadListeModules( WinEDA_PcbFrame* aPcbFrame, wxDC* DC ) +void LoadListeModules( WinEDA_PcbFrame* aPcbFrame ) /***************************************************************/ /* Routine de chargement des nouveaux modules en une seule lecture des @@ -973,7 +973,7 @@ void LoadListeModules( WinEDA_PcbFrame* aPcbFrame, wxDC* DC ) MODULEtoLOAD* ref, * cmp; int ii; MODULE* Module = NULL; - wxPoint OldPos = aPcbFrame->GetScreen()->m_Curseur; + wxPoint ModuleBestPosition; if( s_NbNewModules == 0 ) return; @@ -984,15 +984,11 @@ void LoadListeModules( WinEDA_PcbFrame* aPcbFrame, wxDC* DC ) // Calculate the footprint "best" position: if( aPcbFrame->SetBoardBoundaryBoxFromEdgesOnly() ) { - aPcbFrame->GetScreen()->m_Curseur.x = aPcbFrame->GetBoard()->m_BoundaryBox.GetRight() + - 5000; - aPcbFrame->GetScreen()->m_Curseur.y = aPcbFrame->GetBoard()->m_BoundaryBox.GetBottom() + - 10000; + ModuleBestPosition.x = aPcbFrame->GetBoard()->m_BoundaryBox.GetRight() + 5000; + ModuleBestPosition.y = aPcbFrame->GetBoard()->m_BoundaryBox.GetBottom() + 10000; } else - { - aPcbFrame->GetScreen()->m_Curseur = wxPoint( 0, 0 ); - } + ModuleBestPosition = wxPoint( 0, 0 ); for( ii = 0; ii < s_NbNewModules; ii++, cmp = cmp->Next() ) { @@ -1009,7 +1005,7 @@ void LoadListeModules( WinEDA_PcbFrame* aPcbFrame, wxDC* DC ) DisplayError( NULL, msg ); continue; } - aPcbFrame->Place_Module( Module, DC ); + Module->SetPosition( ModuleBestPosition ); /* Update schematic links : reference "Time Stamp" and schematic hierarchical path */ Module->m_Reference->m_Text = cmp->m_CmpName; @@ -1034,8 +1030,6 @@ void LoadListeModules( WinEDA_PcbFrame* aPcbFrame, wxDC* DC ) Module->m_Path = cmp->m_TimeStampPath; } } - - aPcbFrame->GetScreen()->m_Curseur = OldPos; }