Update and use annotate_dialog.pjd to create and maintain annotate dialog

change_log.txt

@@ -10,6 +10,7 @@ email address.
 +eeschema
     In complex hierarchies, multiples parts per packages now should work,
     without restrictions
+    Update and use annotate_dialog.pjd to create annotate dialog
 
 
 2008-Apr-15 UPDATE  Jean-Pierre Charras <jean-pierre.charras@inpg.fr>

eeschema/annotate.cpp

@@ -440,9 +440,6 @@ void BreakReference( CmpListStruct* BaseListeCmp, int NbOfCmp )
             }
         }
 
-        wxLogDebug( wxT( "BreakReference(): %s number found: %d\n" ),
-            BaseListeCmp[ii].m_TextRef,
-            BaseListeCmp[ii].m_NumRef );
     }
 }
 
@@ -667,7 +664,6 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly )
 
     if( NbOfCmp == 0 )
     {
-        wxBell();
         return 0;
     }
 
@@ -675,7 +671,6 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly )
     /* Second pass : create the list of components */
     ListeCmp = AllocateCmpListStrct( NbOfCmp );
 
-    printf( "CheckAnnotate() listing all components:\n" );
     if( !oneSheetOnly )
     {
         ii = 0;
@@ -687,8 +682,6 @@ int CheckAnnotate( WinEDA_SchematicFrame* frame, bool oneSheetOnly )
     else
         ListeComposants( ListeCmp, frame->GetSheet() );
 
-    printf( "CheckAnnotate() done:\n" );
-
     qsort( ListeCmp, NbOfCmp, sizeof(CmpListStruct), AnnotateByValue );
 
     /* Break full components reference in name (prefix) and number: example:

eeschema/annotate_dialog.h

 /////////////////////////////////////////////////////////////////////////////
-
 // Name:        annotate_dialog.h
 // Purpose:
 // Author:      jean-pierre Charras
 // Modified by:
-// Created:     05/02/2006 12:31:28
+// Created:     16/04/2008 17:50:59
 // RCS-ID:
 // Copyright:   License GNU
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
+// Generated by DialogBlocks (unregistered), 16/04/2008 17:50:59
 
 #ifndef _ANNOTATE_DIALOG_H_
 #define _ANNOTATE_DIALOG_H_
 
-#if defined (__GNUG__) && !defined (NO_GCC_PRAGMA)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "annotate_dialog.h"
 #endif
 
@@ -22,99 +22,107 @@
  * Includes
  */
 
-#include "fctsys.h"
-
-#include "common.h"
-#include "program.h"
-#include "libcmp.h"
-#include "general.h"
-
+////@begin includes
+////@end includes
 
 /*!
- * Control identifiers
+ * Forward declarations
  */
 
-#define ID_DIALOG                10000
-#define ID_ENTIRE_SCHEMATIC      10001
-#define ID_CURRENT_PAGE          10002
-#define ID_RESET_ANNOTATION      10003
-#define ID_SORT_BY_POSITION      10004
-#define ID_SORT_BY_VALUE         10005
-#define ID_CLEAR_ANNOTATION 	 10006
-
-
-#define ANNOTATE_DIALOG_STYLE    wxDEFAULT_DIALOG_STYLE | MAYBE_RESIZE_BORDER
-#define ANNOTATE_DIALOG_TITLE    _( "Annotate" )
-
+////@begin forward declarations
+class wxBoxSizer;
+////@end forward declarations
 
 /*!
- * Compatibility
+ * Control identifiers
  */
 
-#ifndef wxCLOSE_BOX
-#define wxCLOSE_BOX 0x1000
-#endif
+////@begin control identifiers
+#define ID_DIALOG 10000
+#define ID_ENTIRE_SCHEMATIC 10002
+#define ID_CURRENT_PAGE 10003
+#define ID_RESET_ANNOTATION 10009
+#define ID_SORT_BY_POSITION 10010
+#define ID_SORT_BY_VALUE 10011
+#define ID_CLEAR_ANNOTATION_CMP 10004
+#define SYMBOL_WINEDA_ANNOTATEFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER
+#define SYMBOL_WINEDA_ANNOTATEFRAME_TITLE _("EESchema Annotation")
+#define SYMBOL_WINEDA_ANNOTATEFRAME_IDNAME ID_DIALOG
+#define SYMBOL_WINEDA_ANNOTATEFRAME_SIZE wxSize(400, 300)
+#define SYMBOL_WINEDA_ANNOTATEFRAME_POSITION wxDefaultPosition
+////@end control identifiers
+
 
 /*!
  * WinEDA_AnnotateFrame class declaration
  */
 
-class WinEDA_AnnotateFrame : public wxDialog
+class WinEDA_AnnotateFrame: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS( WinEDA_AnnotateFrame )
+    DECLARE_EVENT_TABLE()
 
 public:
-
     /// Constructors
     WinEDA_AnnotateFrame();
-    WinEDA_AnnotateFrame( WinEDA_SchematicFrame* parent,
-                          wxWindowID id = wxID_ANY,
-                          const wxString& caption = ANNOTATE_DIALOG_TITLE,
-                          const wxPoint& pos = wxDefaultPosition,
-                          const wxSize& size = wxDefaultSize,
-                          long style = ANNOTATE_DIALOG_STYLE );
+    WinEDA_AnnotateFrame( WinEDA_SchematicFrame* parent, wxWindowID id = SYMBOL_WINEDA_ANNOTATEFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_ANNOTATEFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_ANNOTATEFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_ANNOTATEFRAME_SIZE, long style = SYMBOL_WINEDA_ANNOTATEFRAME_STYLE );
 
     /// Creation
-    bool Create( wxWindow* parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxString& caption = ANNOTATE_DIALOG_TITLE,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = ANNOTATE_DIALOG_STYLE );
+    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WINEDA_ANNOTATEFRAME_IDNAME, const wxString& caption = SYMBOL_WINEDA_ANNOTATEFRAME_TITLE, const wxPoint& pos = SYMBOL_WINEDA_ANNOTATEFRAME_POSITION, const wxSize& size = SYMBOL_WINEDA_ANNOTATEFRAME_SIZE, long style = SYMBOL_WINEDA_ANNOTATEFRAME_STYLE );
+
+    /// Destructor
+    ~WinEDA_AnnotateFrame();
+
+    /// Initialises member variables
+    void Init();
 
     /// Creates the controls and sizers
-    void    CreateControls();
+    void CreateControls();
+
+////@begin WinEDA_AnnotateFrame event handler declarations
+
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
+    void OnCancelClick( wxCommandEvent& event );
+
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_CLEAR_ANNOTATION_CMP
+    void OnClearAnnotationCmpClick( wxCommandEvent& event );
+
+    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY
+    void OnApplyClick( wxCommandEvent& event );
+
+////@end WinEDA_AnnotateFrame event handler declarations
+
+////@begin WinEDA_AnnotateFrame member function declarations
 
     /// Retrieves bitmap resources
-    wxBitmap    GetBitmapResource( const wxString& name );
+    wxBitmap GetBitmapResource( const wxString& name );
 
     /// Retrieves icon resources
-    wxIcon      GetIconResource( const wxString& name );
-
-    bool GetLevel( void );
-    bool GetResetItems( void );
-    bool GetSortOrder( void );
+    wxIcon GetIconResource( const wxString& name );
+////@end WinEDA_AnnotateFrame member function declarations
 
     /// Should we show tooltips?
     static bool ShowToolTips();
 
-    WinEDA_SchematicFrame* m_Parent;
-
-private:
-    void CloseDialog( void );
-
-    void OnClearAnnotation( wxCommandEvent& event );
-    void OnApply( wxCommandEvent& event );
-    void OnCancel( wxCommandEvent& event );
+    // User functions:
+    bool GetLevel( void );
+    bool GetResetItems( void );
+    bool GetSortOrder( void );
 
+////@begin WinEDA_AnnotateFrame member variables
     wxRadioButton* m_rbEntireSchematic;
-    wxRadioButton* m_rbSortByPosition;
     wxCheckBox* m_cbResetAnnotation;
+    wxRadioButton* m_rbSortByPosition;
+    wxRadioButton* rbSortByValue;
+    wxBoxSizer* sizerDialogButtons;
+    wxButton* m_btnClose;
     wxButton* m_btnClear;
+    wxButton* m_btnApply;
+////@end WinEDA_AnnotateFrame member variables
+
+    WinEDA_SchematicFrame * m_Parent;
 
-    DECLARE_EVENT_TABLE()
 };
 
 #endif
-
-// _ANNOTATE_DIALOG_H_
+    // _ANNOTATE_DIALOG_H_

internat/fr/kicad.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kicad\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-16 11:26+0100\n"
-"PO-Revision-Date: 2008-04-16 11:31+0100\n"
+"POT-Creation-Date: 2008-04-16 20:16+0100\n"
+"PO-Revision-Date: 2008-04-16 20:16+0100\n"
 "Last-Translator: \n"
 "Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
 "MIME-Version: 1.0\n"
@@ -5865,39 +5865,39 @@ msgstr "Tri"
 msgid "Bad Bus Label: "
 msgstr "Mauvais label de Bus: "
 
-#: eeschema/annotate.cpp:713
+#: eeschema/annotate.cpp:706
 #, c-format
 msgid "item not annotated: %s%s"
 msgstr "item non numéroté: %s%s"
 
-#: eeschema/annotate.cpp:718
+#: eeschema/annotate.cpp:711
 #, c-format
 msgid "( unit %d)"
 msgstr "( Unité %d)"
 
-#: eeschema/annotate.cpp:735
+#: eeschema/annotate.cpp:728
 #, c-format
 msgid "Error item %s%s"
 msgstr "Erreur item %s%s"
 
-#: eeschema/annotate.cpp:738
+#: eeschema/annotate.cpp:731
 #, c-format
 msgid " unit %d and no more than %d parts"
 msgstr " unité %d et plus que %d parts"
 
-#: eeschema/annotate.cpp:772
-#: eeschema/annotate.cpp:795
+#: eeschema/annotate.cpp:765
+#: eeschema/annotate.cpp:788
 #, c-format
 msgid "Multiple item %s%s"
 msgstr "Multipleélément %s%s"
 
-#: eeschema/annotate.cpp:777
-#: eeschema/annotate.cpp:800
+#: eeschema/annotate.cpp:770
+#: eeschema/annotate.cpp:793
 #, c-format
 msgid " (unit %d)"
 msgstr " ( Unité %d)"
 
-#: eeschema/annotate.cpp:817
+#: eeschema/annotate.cpp:810
 #, c-format
 msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)"
 msgstr "Valeurs différentes pour %s%d%c (%s) et %s%d%c (%s)"
@@ -6877,6 +6877,90 @@ msgstr "Exporter le symbole"
 msgid "Save Symbol in [%s]"
 msgstr "Symbole sauvé en  [%s]"
 
+#: eeschema/annotate_dialog.cpp:158
+msgid "Scope"
+msgstr "Sélection"
+
+#: eeschema/annotate_dialog.cpp:166
+msgid "Annotate the &entire schematic"
+msgstr "Annot&er la schématique complète"
+
+#: eeschema/annotate_dialog.cpp:170
+msgid "Annotate the current &page only"
+msgstr "Annoter la &feuille active uniquement"
+
+#: eeschema/annotate_dialog.cpp:174
+msgid "&Reset existing annotation"
+msgstr "&Supprimer l'annotation existante"
+
+#: eeschema/annotate_dialog.cpp:179
+msgid "Order"
+msgstr "Ordre"
+
+#: eeschema/annotate_dialog.cpp:187
+msgid "Sort Components by &Y Position"
+msgstr "Trier les Composants par &Y Position"
+
+#: eeschema/annotate_dialog.cpp:191
+msgid "Sort Components by &Value"
+msgstr "Trier les Composants par &Valeur"
+
+#: eeschema/annotate_dialog.cpp:202
+msgid "Clear Annotation"
+msgstr "Suppression Annotation"
+
+#: eeschema/annotate_dialog.cpp:206
+msgid "Annotation"
+msgstr "Annotation"
+
+#: eeschema/annotate_dialog.cpp:225
+msgid "Clear and annotate all of the components "
+msgstr "Reinitialisation et réannotation de tous les composants "
+
+#: eeschema/annotate_dialog.cpp:227
+msgid "Annotate only the unannotated components "
+msgstr "Annoter seulement les composants non déjà annotés "
+
+#: eeschema/annotate_dialog.cpp:229
+msgid "on the entire schematic?"
+msgstr "pour la schematique complète?"
+
+#: eeschema/annotate_dialog.cpp:231
+msgid "on the current sheet?"
+msgstr "pourr la feuille courante?"
+
+#: eeschema/annotate_dialog.cpp:233
+msgid ""
+"\n"
+"\n"
+"This operation will change the current annotation and cannot be undone."
+msgstr ""
+"\n"
+"\n"
+"Cette opération changera l'annotation actuelle et ne pourra être annulée."
+
+#: eeschema/annotate_dialog.cpp:253
+msgid "Clear the existing annotation for "
+msgstr "Supprimer l'annotation existante pour "
+
+#: eeschema/annotate_dialog.cpp:255
+msgid "the entire schematic?"
+msgstr "la schématique entière?"
+
+#: eeschema/annotate_dialog.cpp:257
+msgid "the current sheet?"
+msgstr "La feuille courante?"
+
+#: eeschema/annotate_dialog.cpp:259
+msgid ""
+"\n"
+"\n"
+"This operation will clear the existing annotation and cannot be undone."
+msgstr ""
+"\n"
+"\n"
+"Cette opération supprimera l'annotation existante et ne peut être annulée."
+
 #: eeschema/files-io.cpp:112
 msgid "Clear Schematic Hierarchy (modified!)?"
 msgstr "Effacer la hiérarchie schématique (modifiée!)?"
@@ -7019,90 +7103,6 @@ msgstr "Emetteur ouv."
 msgid "Electrical Type:"
 msgstr "Type électrique:"
 
-#: eeschema/annotate_dialog.cpp:157
-msgid "Scope"
-msgstr "Sélection"
-
-#: eeschema/annotate_dialog.cpp:163
-msgid "Annotate the &entire schematic"
-msgstr "Annot&er la schématique complète"
-
-#: eeschema/annotate_dialog.cpp:167
-msgid "Annotate the current &page only"
-msgstr "Annoter la &feuille active uniquement"
-
-#: eeschema/annotate_dialog.cpp:170
-msgid "&Reset existing annotation"
-msgstr "&Supprimer l'annotation existante"
-
-#: eeschema/annotate_dialog.cpp:188
-msgid "Order"
-msgstr "Ordre"
-
-#: eeschema/annotate_dialog.cpp:194
-msgid "Sort components by p&osition"
-msgstr "Trier les composants par p&osition"
-
-#: eeschema/annotate_dialog.cpp:200
-msgid "Sort components by &value"
-msgstr "Trier les Composants par &valeur"
-
-#: eeschema/annotate_dialog.cpp:215
-msgid "Clear Annotation"
-msgstr "Suppression Annotation"
-
-#: eeschema/annotate_dialog.cpp:216
-msgid "Annotation"
-msgstr "Annotation"
-
-#: eeschema/annotate_dialog.cpp:264
-msgid "Clear the existing annotation for "
-msgstr "Supprimer l'annotation existante pour "
-
-#: eeschema/annotate_dialog.cpp:266
-msgid "the entire schematic?"
-msgstr "la schématique entière?"
-
-#: eeschema/annotate_dialog.cpp:268
-msgid "the current sheet?"
-msgstr "La feuille courante?"
-
-#: eeschema/annotate_dialog.cpp:270
-msgid ""
-"\n"
-"\n"
-"This operation will clear the existing annotation and cannot be undone."
-msgstr ""
-"\n"
-"\n"
-"Cette opération supprimera l'annotation existante et ne peut être annulée."
-
-#: eeschema/annotate_dialog.cpp:286
-msgid "Clear and annotate all of the components "
-msgstr "Reinitialisation et réannotation de tous les composants "
-
-#: eeschema/annotate_dialog.cpp:288
-msgid "Annotate only the unannotated components "
-msgstr "Annoter seulement les composants non déjà annotés "
-
-#: eeschema/annotate_dialog.cpp:290
-msgid "on the entire schematic?"
-msgstr "pour la schematique complète?"
-
-#: eeschema/annotate_dialog.cpp:292
-msgid "on the current sheet?"
-msgstr "pourr la feuille courante?"
-
-#: eeschema/annotate_dialog.cpp:294
-msgid ""
-"\n"
-"\n"
-"This operation will change the current annotation and cannot be undone."
-msgstr ""
-"\n"
-"\n"
-"Cette opération changera l'annotation actuelle et ne pourra être annulée."
-
 #: eeschema/dialog_build_BOM.cpp:248
 msgid "List items:"
 msgstr " Liste éléments: "
@@ -9999,9 +9999,9 @@ msgstr "Liste du Matériel"
 msgid "Component properties"
 msgstr "Propriétés du composant"
 
-#: eeschema/annotate_dialog.h:47
-msgid "Annotate"
-msgstr "Annotation"
+#: eeschema/annotate_dialog.h:49
+msgid "EESchema Annotation"
+msgstr "Annotation des composants"
 
 #: eeschema/sheet.h:47
 msgid "Sheet properties"
@@ -10175,6 +10175,8 @@ msgstr "Créer Fichier SVG"
 msgid "Print"
 msgstr "Imprimer"
 
+#~ msgid "Annotate"
+#~ msgstr "Annotation"
 #~ msgid "Zoom Block (Midd butt drag)"
 #~ msgstr "Zoom Bloc (drag+bouton milieu)"
 #~ msgid "Win. Zoom (Midd butt drag mouse)"