diff --git a/change_log.txt b/change_log.txt index 4436e33e06..91380eef4f 100644 --- a/change_log.txt +++ b/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 diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp index 76b4cbd6f0..1ddfd51819 100644 --- a/eeschema/annotate.cpp +++ b/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: diff --git a/eeschema/annotate_dialog.cpp b/eeschema/annotate_dialog.cpp index 8e6e3ceac1..b5fc1430b0 100644 --- a/eeschema/annotate_dialog.cpp +++ b/eeschema/annotate_dialog.cpp @@ -1,19 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// - // Name: annotate_dialog.cpp // Purpose: // Author: jean-pierre Charras -// Modified by: Wayne Stambaugh -// -// Created: 05/02/2006 12:31:28 -// Modified 02/21/2008 13:47:10 +// Modified by: +// Created: 16/04/2008 17:50:59 // RCS-ID: // Copyright: License GNU // Licence: ///////////////////////////////////////////////////////////////////////////// +// Generated by DialogBlocks (unregistered), 16/04/2008 17:50:59 -#if defined (__GNUG__) && !defined (NO_GCC_PRAGMA) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "annotate_dialog.h" #endif @@ -28,6 +26,9 @@ #include "wx/wx.h" #endif +////@begin includes +////@end includes + #include "fctsys.h" #include "common.h" #include "program.h" @@ -40,6 +41,9 @@ extern void AnnotateComponents( WinEDA_SchematicFrame* parent, bool sortByPosition, bool resetAnnotation ); +////@begin XPM images +////@end XPM images + /*! * WinEDA_AnnotateFrame type definition @@ -47,38 +51,39 @@ extern void AnnotateComponents( WinEDA_SchematicFrame* parent, IMPLEMENT_DYNAMIC_CLASS( WinEDA_AnnotateFrame, wxDialog ) + /*! * WinEDA_AnnotateFrame event table definition */ BEGIN_EVENT_TABLE( WinEDA_AnnotateFrame, wxDialog ) - EVT_BUTTON( ID_CLEAR_ANNOTATION, WinEDA_AnnotateFrame::OnClearAnnotation ) - EVT_BUTTON( wxID_APPLY, WinEDA_AnnotateFrame::OnApply ) - EVT_BUTTON( wxID_CANCEL, WinEDA_AnnotateFrame::OnCancel ) + +////@begin WinEDA_AnnotateFrame event table entries + EVT_BUTTON( wxID_CANCEL, WinEDA_AnnotateFrame::OnCancelClick ) + + EVT_BUTTON( ID_CLEAR_ANNOTATION_CMP, WinEDA_AnnotateFrame::OnClearAnnotationCmpClick ) + + EVT_BUTTON( wxID_APPLY, WinEDA_AnnotateFrame::OnApplyClick ) + +////@end WinEDA_AnnotateFrame event table entries + END_EVENT_TABLE() + /*! * WinEDA_AnnotateFrame constructors */ WinEDA_AnnotateFrame::WinEDA_AnnotateFrame() { - m_rbEntireSchematic = NULL; - m_cbResetAnnotation = NULL; - m_rbSortByPosition = NULL; - m_btnClear = NULL; + Init(); } - -WinEDA_AnnotateFrame::WinEDA_AnnotateFrame( WinEDA_SchematicFrame* parent, - wxWindowID id, - const wxString& caption, - const wxPoint& pos, - const wxSize& size, - long style ) +WinEDA_AnnotateFrame::WinEDA_AnnotateFrame( WinEDA_SchematicFrame* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { m_Parent = parent; - Create( parent, id, caption, pos, size, style ); + Init(); + Create(parent, id, caption, pos, size, style); } @@ -86,198 +91,132 @@ WinEDA_AnnotateFrame::WinEDA_AnnotateFrame( WinEDA_SchematicFrame* parent, * WinEDA_AnnotateFrame creator */ -bool WinEDA_AnnotateFrame::Create( wxWindow* parent, - wxWindowID id, - const wxString& caption, - const wxPoint& pos, - const wxSize& size, - long style ) +bool WinEDA_AnnotateFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { - SetExtraStyle( wxWS_EX_BLOCK_EVENTS ); +////@begin WinEDA_AnnotateFrame creation + SetExtraStyle(wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); CreateControls(); - if( GetSizer() ) + if (GetSizer()) { - GetSizer()->SetSizeHints( this ); + GetSizer()->SetSizeHints(this); } Centre(); - +////@end WinEDA_AnnotateFrame creation return true; } +/*! + * WinEDA_AnnotateFrame destructor + */ + +WinEDA_AnnotateFrame::~WinEDA_AnnotateFrame() +{ +////@begin WinEDA_AnnotateFrame destruction +////@end WinEDA_AnnotateFrame destruction +} + + +/*! + * Member initialisation + */ + +void WinEDA_AnnotateFrame::Init() +{ +////@begin WinEDA_AnnotateFrame member initialisation + m_rbEntireSchematic = NULL; + m_cbResetAnnotation = NULL; + m_rbSortByPosition = NULL; + rbSortByValue = NULL; + sizerDialogButtons = NULL; + m_btnClose = NULL; + m_btnClear = NULL; + m_btnApply = NULL; +////@end WinEDA_AnnotateFrame member initialisation +} + + /*! * Control creation for WinEDA_AnnotateFrame */ void WinEDA_AnnotateFrame::CreateControls() { - wxFont fontBold = this->GetFont(); - fontBold.SetWeight(wxFONTWEIGHT_BOLD); +////@begin WinEDA_AnnotateFrame content construction + // Generated by DialogBlocks, 16/04/2008 20:16:13 (unregistered) - wxBoxSizer* sizerTop = new wxBoxSizer( wxVERTICAL ); + WinEDA_AnnotateFrame* itemDialog1 = this; - /* Sizer flags for setting up the spacing of the controls in the dialog - * box. These eventually should be moved to a file with a header in - * the common directory so all of the dialogs share the same layout - * spacing */ + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + itemDialog1->SetSizer(itemBoxSizer2); - /* Spacing for grouping labels in a dialog box. */ - wxSizerFlags flagsLabelSpacing( 0 ); - flagsLabelSpacing.Align( wxALIGN_TOP | wxALIGN_LEFT ); - flagsLabelSpacing.Border( wxLEFT | wxTOP, 6 ); + wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxRIGHT|wxTOP|wxBOTTOM, 5); - /* Spacing for grouping radio buttons inside the grouping sizer. */ - wxSizerFlags flagsRadioButtonSpacing( 0 ); - flagsRadioButtonSpacing.Align( wxALIGN_LEFT ); - flagsRadioButtonSpacing.Border( wxTOP | wxLEFT | wxRIGHT, 6 ); + wxStaticText* itemStaticText4 = new wxStaticText( itemDialog1, wxID_STATIC, _("Scope"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText4->SetForegroundColour(wxColour(0, 128, 64)); + itemStaticText4->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma"))); + itemBoxSizer3->Add(itemStaticText4, 0, wxALIGN_LEFT|wxALL, 5); - /* Spacing for the radio button sizer inside the group sizer. */ - wxSizerFlags flagsRadioButtonSizerSpacing( 0 ); - flagsRadioButtonSizerSpacing.Align( wxALIGN_TOP | wxALIGN_LEFT ); - flagsRadioButtonSizerSpacing.Border( wxLEFT, 20 ); + wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer3->Add(itemBoxSizer5, 0, wxGROW|wxLEFT, 25); - /* Spacing for the vertical group sizers. */ - wxSizerFlags flagsGroupSizerSpacing( 1 ); - flagsGroupSizerSpacing.Align( wxALIGN_TOP | wxALIGN_LEFT ); - flagsGroupSizerSpacing.Border( wxTOP | wxLEFT | wxRIGHT, 12 ); + m_rbEntireSchematic = new wxRadioButton( itemDialog1, ID_ENTIRE_SCHEMATIC, _("Annotate the &entire schematic"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_rbEntireSchematic->SetValue(true); + itemBoxSizer5->Add(m_rbEntireSchematic, 0, wxGROW|wxALL, 5); - /* Spacing for dialog button sizer. */ - wxSizerFlags flagsDialogButtonSizerSpacing( 0 ); - flagsDialogButtonSizerSpacing.Border( wxALL, 12 ); + wxRadioButton* itemRadioButton7 = new wxRadioButton( itemDialog1, ID_CURRENT_PAGE, _("Annotate the current &page only"), wxDefaultPosition, wxDefaultSize, 0 ); + itemRadioButton7->SetValue(false); + itemBoxSizer5->Add(itemRadioButton7, 0, wxGROW|wxALL, 5); - /* Spacing for the dialog buttons. */ - wxSizerFlags flagsDialogButtonSpacing( 0 ); - flagsDialogButtonSpacing.Border( wxLEFT | wxRIGHT, 3 ); + m_cbResetAnnotation = new wxCheckBox( itemDialog1, ID_RESET_ANNOTATION, _("&Reset existing annotation"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cbResetAnnotation->SetValue(false); + m_cbResetAnnotation->SetForegroundColour(wxColour(217, 38, 52)); + itemBoxSizer5->Add(m_cbResetAnnotation, 0, wxGROW|wxALL, 5); - /* Annotate scope sizers, label, and radio buttons. */ - wxBoxSizer* sizerAnnotate = new wxBoxSizer( wxVERTICAL ); - wxStaticText* labelAnnotate = new wxStaticText( this, -1, - _( "Scope" ) ); - labelAnnotate->SetFont( fontBold ); - sizerAnnotate->Add( labelAnnotate, flagsLabelSpacing ); - wxBoxSizer* sizerAnnotateItems = new wxBoxSizer( wxVERTICAL ); - m_rbEntireSchematic = - new wxRadioButton( this, ID_ENTIRE_SCHEMATIC, - _( "Annotate the &entire schematic" ), - wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - wxRadioButton* rbCurrentPage = - new wxRadioButton( this, ID_CURRENT_PAGE, - _( "Annotate the current &page only" ) ); - m_rbEntireSchematic->SetValue( true ); - m_cbResetAnnotation = new wxCheckBox( this, ID_RESET_ANNOTATION, - _( "&Reset existing annotation" ) ); + wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("Order"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText9->SetForegroundColour(wxColour(125, 2, 12)); + itemStaticText9->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxT("Tahoma"))); + itemBoxSizer3->Add(itemStaticText9, 0, wxALIGN_LEFT|wxALL, 5); - sizerAnnotateItems->Add( m_rbEntireSchematic, flagsRadioButtonSpacing ); - sizerAnnotateItems->Add( rbCurrentPage, flagsRadioButtonSpacing ); - sizerAnnotateItems->Add( m_cbResetAnnotation, flagsRadioButtonSpacing ); - sizerAnnotate->Add( sizerAnnotateItems, flagsRadioButtonSizerSpacing ); - sizerTop->Add( sizerAnnotate, flagsGroupSizerSpacing ); - /* This is an ugly hack to make sure the focus is set correctly so the - * escape key closes the dialog without requiring one of the controls - * to be activated by the user first. This problem only occurs on the - * GTK version of wxWidgets */ -#ifdef __WXGTK__ - m_rbEntireSchematic->SetFocus( ); -#endif + wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL); + itemBoxSizer3->Add(itemBoxSizer10, 0, wxGROW|wxLEFT, 25); - /* Annotation sort order sizers, label, and radio buttons. */ - wxBoxSizer* sizerSort = new wxBoxSizer( wxVERTICAL ); - wxStaticText* labelSort = new wxStaticText( this, wxID_ANY, - _( "Order" ) ); - labelSort->SetFont( fontBold ); - sizerSort->Add( labelSort, flagsLabelSpacing ); - wxBoxSizer* sizerSortItems = new wxBoxSizer( wxVERTICAL ); - m_rbSortByPosition = new wxRadioButton( this, - ID_SORT_BY_POSITION, - _( "Sort components by p&osition" ), - wxDefaultPosition, - wxDefaultSize, - wxRB_GROUP ); - wxRadioButton* rbSortByValue = - new wxRadioButton( this, ID_SORT_BY_VALUE, - _( "Sort components by &value" ) ); - sizerSortItems->Add( m_rbSortByPosition, flagsRadioButtonSpacing ); - sizerSortItems->Add( rbSortByValue, flagsRadioButtonSpacing ); - sizerSort->Add( sizerSortItems, flagsRadioButtonSizerSpacing ); - sizerTop->Add( sizerSort, flagsGroupSizerSpacing ); + m_rbSortByPosition = new wxRadioButton( itemDialog1, ID_SORT_BY_POSITION, _("Sort Components by &Y Position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_rbSortByPosition->SetValue(true); + itemBoxSizer10->Add(m_rbSortByPosition, 0, wxGROW|wxALL, 5); - /* Standard dialog buttons and sizer. */ - wxBoxSizer* sizerDialogButtons = new wxBoxSizer( wxHORIZONTAL ); - wxButton* btnClose = new wxButton( this, wxID_CANCEL, _("Close") ); - /* TODO: Check if there is any existing annotation and enable/disable - * the clear button accordingly. Probably should also enable/ - * disable new components radio button if all of the components - * are already annotated. Some low level work on the DrawSheetPath - * class will need to be done to accomadate this. - */ - m_btnClear = new wxButton( this, ID_CLEAR_ANNOTATION, _("Clear Annotation") ); - wxButton* btnApply = new wxButton( this, wxID_APPLY, _("Annotation") ); - sizerDialogButtons->Add( btnClose, flagsDialogButtonSpacing ); - sizerDialogButtons->Add( new wxBoxSizer( wxHORIZONTAL ), - wxSizerFlags( 1 ).Expand( ) ); - sizerDialogButtons->Add( m_btnClear, flagsDialogButtonSpacing ); - sizerDialogButtons->Add( btnApply, flagsDialogButtonSpacing ); - sizerTop->Add( sizerDialogButtons, flagsDialogButtonSizerSpacing ); - SetSizer( sizerTop ); + rbSortByValue = new wxRadioButton( itemDialog1, ID_SORT_BY_VALUE, _("Sort Components by &Value"), wxDefaultPosition, wxDefaultSize, 0 ); + rbSortByValue->SetValue(false); + itemBoxSizer10->Add(rbSortByValue, 0, wxGROW|wxALL, 5); + + sizerDialogButtons = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer2->Add(sizerDialogButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + + m_btnClose = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnClose->SetDefault(); + sizerDialogButtons->Add(m_btnClose, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + + m_btnClear = new wxButton( itemDialog1, ID_CLEAR_ANNOTATION_CMP, _("Clear Annotation"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnClear->SetForegroundColour(wxColour(0, 0, 230)); + sizerDialogButtons->Add(m_btnClear, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + + m_btnApply = new wxButton( itemDialog1, wxID_APPLY, _("Annotation"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnApply->SetDefault(); + m_btnApply->SetForegroundColour(wxColour(198, 0, 0)); + sizerDialogButtons->Add(m_btnApply, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + +////@end WinEDA_AnnotateFrame content construction } /*! - * Should we show tooltips? + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_APPLY */ -bool WinEDA_AnnotateFrame::ShowToolTips() -{ - return true; -} - - -/*! - * Get bitmap resources - */ - -wxBitmap WinEDA_AnnotateFrame::GetBitmapResource( const wxString& name ) -{ - // Bitmap retrieval - wxUnusedVar( name ); - return wxNullBitmap; -} - - -/*! - * Get icon resources - */ - -wxIcon WinEDA_AnnotateFrame::GetIconResource( const wxString& name ) -{ - // Icon retrieval - wxUnusedVar( name ); - return wxNullIcon; -} - -void WinEDA_AnnotateFrame::OnClearAnnotation( wxCommandEvent& event ) -{ - int response; - - wxString message = _( "Clear the existing annotation for " ); - if( GetLevel() ) - message += _( "the entire schematic?" ); - else - message += _( "the current sheet?" ); - - message += _( "\n\nThis operation will clear the existing annotation " \ - "and cannot be undone." ); - response = wxMessageBox( message, wxT( "" ), - wxICON_EXCLAMATION | wxOK | wxCANCEL ); - if (response == wxCANCEL) - return; - DeleteAnnotation( m_Parent, GetLevel() ); - m_btnClear->Enable(false); -} - -void WinEDA_AnnotateFrame::OnApply( wxCommandEvent& event ) +void WinEDA_AnnotateFrame::OnApplyClick( wxCommandEvent& event ) { int response; wxString message; @@ -302,7 +241,37 @@ void WinEDA_AnnotateFrame::OnApply( wxCommandEvent& event ) m_btnClear->Enable(); } -void WinEDA_AnnotateFrame::OnCancel( wxCommandEvent& event ) + +/*! + * wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DEANNOTATE_CMP + */ + +void WinEDA_AnnotateFrame::OnClearAnnotationCmpClick( wxCommandEvent& event ) +{ + int response; + + wxString message = _( "Clear the existing annotation for " ); + if( GetLevel() ) + message += _( "the entire schematic?" ); + else + message += _( "the current sheet?" ); + + message += _( "\n\nThis operation will clear the existing annotation " \ + "and cannot be undone." ); + response = wxMessageBox( message, wxT( "" ), + wxICON_EXCLAMATION | wxOK | wxCANCEL ); + if (response == wxCANCEL) + return; + DeleteAnnotation( m_Parent, GetLevel() ); + m_btnClear->Enable(false); +} + + +/*! + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + */ + +void WinEDA_AnnotateFrame::OnCancelClick( wxCommandEvent& event ) { if( IsModal() ) EndModal( wxID_CANCEL ); @@ -313,6 +282,7 @@ void WinEDA_AnnotateFrame::OnCancel( wxCommandEvent& event ) } } + bool WinEDA_AnnotateFrame::GetLevel( void ) { wxASSERT_MSG( ((m_rbEntireSchematic != NULL) && @@ -342,3 +312,40 @@ bool WinEDA_AnnotateFrame::GetSortOrder( void ) return m_rbSortByPosition->GetValue(); } + + + +/*! + * Should we show tooltips? + */ + +bool WinEDA_AnnotateFrame::ShowToolTips() +{ + return true; +} + +/*! + * Get bitmap resources + */ + +wxBitmap WinEDA_AnnotateFrame::GetBitmapResource( const wxString& name ) +{ + // Bitmap retrieval +////@begin WinEDA_AnnotateFrame bitmap retrieval + wxUnusedVar(name); + return wxNullBitmap; +////@end WinEDA_AnnotateFrame bitmap retrieval +} + +/*! + * Get icon resources + */ + +wxIcon WinEDA_AnnotateFrame::GetIconResource( const wxString& name ) +{ + // Icon retrieval +////@begin WinEDA_AnnotateFrame icon retrieval + wxUnusedVar(name); + return wxNullIcon; +////@end WinEDA_AnnotateFrame icon retrieval +} diff --git a/eeschema/annotate_dialog.h b/eeschema/annotate_dialog.h index 770ca71d83..640c0ec6e8 100644 --- a/eeschema/annotate_dialog.h +++ b/eeschema/annotate_dialog.h @@ -1,20 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// - // 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" +////@begin includes +////@end includes -#include "common.h" -#include "program.h" -#include "libcmp.h" -#include "general.h" +/*! + * Forward declarations + */ +////@begin forward declarations +class wxBoxSizer; +////@end forward declarations /*! * Control identifiers */ -#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 +////@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 -#define ANNOTATE_DIALOG_STYLE wxDEFAULT_DIALOG_STYLE | MAYBE_RESIZE_BORDER -#define ANNOTATE_DIALOG_TITLE _( "Annotate" ) - - -/*! - * Compatibility - */ - -#ifndef wxCLOSE_BOX -#define wxCLOSE_BOX 0x1000 -#endif - /*! * 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_ diff --git a/eeschema/annotate_dialog.pjd b/eeschema/annotate_dialog.pjd index b97453be83..cc4af0e2e7 100644 --- a/eeschema/annotate_dialog.pjd +++ b/eeschema/annotate_dialog.pjd @@ -108,10 +108,12 @@ 0 0 1 + 0 1 1 0 1 + 0 @@ -134,6 +136,7 @@ 0 "" 1 + -8519680 "" "Debug" "ANSI" @@ -175,6 +178,8 @@ "%AUTO%" "%AUTO%" "%AUTO%" + 0 + 1 @@ -246,7 +251,6 @@ 1 0 0 - 0 0 0 0 @@ -278,7 +282,7 @@ 0 "" - "wxBoxSizer H" + "wxBoxSizer V" "dialog-control-document" "" "sizer" @@ -287,7 +291,7 @@ 0 0 "wbBoxSizerProxy" - "Horizontal" + "Vertical" "" 0 0 @@ -306,7 +310,7 @@ "wbBoxSizerProxy" "Vertical" "" - "Centre" + "Expand" "Centre" 0 5 @@ -319,34 +323,33 @@ 0 "<Any platform>" - "wxRadioBox: ID_RADIOBOX" + "wxStaticText: wxID_STATIC" "dialog-control-document" "" - "radiobox" + "statictext" 0 1 0 0 - "5/2/2006" - "wbRadioBoxProxy" - "ID_RADIOBOX" - 10001 - "wxRadioBox" - "wxRadioBox" + "16/4/2008" + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" 1 0 "" "" - "m_AnnotProjetCtrl" - "annotate:" - 1 - "Hierarchy|Current sheet" - 0 + "" + "Scope" + -1 "" "" "" - "" - "" + "008040" + "8, wxSWISS, wxNORMAL, wxBOLD, false, Tahoma" 0 1 "<Any platform>" @@ -357,8 +360,16 @@ "" "" "" - 0 - 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 0 @@ -367,7 +378,7 @@ -1 -1 -1 - "Expand" + "Left" "Centre" 0 5 @@ -382,34 +393,247 @@ "" - "wxRadioBox: ID_RADIOBOX1" + "wxBoxSizer V" "dialog-control-document" "" - "radiobox" + "sizer" 0 1 0 0 - "5/2/2006" - "wbRadioBoxProxy" - "ID_RADIOBOX1" - 10002 - "wxRadioBox" - "wxRadioBox" + "16/4/2008" + "wbBoxSizerProxy" + "Vertical" + "" + "Expand" + "Centre" + 0 + 25 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + "<Any platform>" + + "wxRadioButton: ID_ENTIRE_SCHEMATIC" + "dialog-control-document" + "" + "radiobutton" + 0 + 1 + 0 + 0 + "16/4/2008" + "wbRadioButtonProxy" + "ID_ENTIRE_SCHEMATIC" + 10002 + "" + "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" + "m_rbEntireSchematic" + "Annotate the &entire schematic" + 1 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 1 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxRadioButton: ID_CURRENT_PAGE" + "dialog-control-document" + "" + "radiobutton" + 0 + 1 + 0 + 0 + "16/4/2008" + "wbRadioButtonProxy" + "ID_CURRENT_PAGE" + 10003 + "" + "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" + "" + "Annotate the current &page only" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxCheckBox: ID_RESET_ANNOTATION" + "dialog-control-document" + "" + "checkbox" + 0 + 1 + 0 + 0 + "16/4/2008" + "wbCheckBoxProxy" + "ID_RESET_ANNOTATION" + 10009 + "" + "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" + "m_cbResetAnnotation" + "&Reset existing annotation" + 0 + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "D92634" + "" + 0 + 1 + "<Any platform>" + 0 + 0 + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + + "wxStaticText: wxID_STATIC" + "dialog-control-document" + "" + "statictext" + 0 + 1 + 0 + 0 + "16/4/2008" + "wbStaticTextProxy" + "wxID_STATIC" + 5105 + "" + "wxStaticText" + "wxStaticText" 1 0 "" "" - "m_AnnotNewCmpCtrl" - "select items:" - 1 - "all components|new components only" - 0 + "" + "Order" + -1 "" "" "" - "" - "" + "7D020C" + "8, wxSWISS, wxNORMAL, wxBOLD, false, Tahoma" 0 1 "<Any platform>" @@ -420,8 +644,16 @@ "" "" "" - 0 - 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 0 @@ -430,7 +662,7 @@ -1 -1 -1 - "Expand" + "Left" "Centre" 0 5 @@ -445,71 +677,158 @@ "" - "wxRadioBox: ID_RADIOBOX2" + "wxBoxSizer V" "dialog-control-document" "" - "radiobox" + "sizer" 0 1 0 0 - "5/7/2007" - "wbRadioBoxProxy" - "ID_RADIOBOX2" - 10005 - "wxRadioBox" - "wxRadioBox" - 1 - 0 - "" - "" - "m_AnnotSortCmpCtrl" - "sorting:" - 1 - "by position|by value" - 0 - "" - "" - "" - "" - "" - 0 - 1 - "<Any platform>" - "" - "" - "" - "" - "" - "" - "" - 0 - 1 - 0 - 0 - 0 - "" - -1 - -1 - -1 - -1 + "16/4/2008" + "wbBoxSizerProxy" + "Vertical" + "" "Expand" "Centre" 0 - 5 + 25 1 - 1 - 1 - 1 + 0 + 0 + 0 0 0 0 - "" - "" + "<Any platform>" + + "wxRadioButton: ID_SORT_BY_POSITION" + "dialog-control-document" + "" + "radiobutton" + 0 + 1 + 0 + 0 + "16/4/2008" + "wbRadioButtonProxy" + "ID_SORT_BY_POSITION" + 10010 + "" + "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" + "m_rbSortByPosition" + "Sort Components by &Y Position" + 1 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 1 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + + + "wxRadioButton: ID_SORT_BY_VALUE" + "dialog-control-document" + "" + "radiobutton" + 0 + 1 + 0 + 0 + "16/4/2008" + "wbRadioButtonProxy" + "ID_SORT_BY_VALUE" + 10011 + "" + "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" + "rbSortByValue" + "Sort Components by &Value" + 0 + "" + "" + "" + "" + "" + 0 + 1 + "<Any platform>" + "" + "" + "" + "" + "" + "" + "" + 0 + 0 + 0 + 0 + 0 + "" + -1 + -1 + -1 + -1 + "Expand" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + "" + "" + - "wxBoxSizer V" + "wxBoxSizer H" "dialog-control-document" "" "sizer" @@ -519,8 +838,8 @@ 0 "5/2/2006" "wbBoxSizerProxy" - "Vertical" - "" + "Horizontal" + "sizerDialogButtons" "Centre" "Centre" 0 @@ -534,7 +853,7 @@ 0 "<Any platform>" - "wxButton: ID_ANNOTATE_CMP" + "wxButton: wxID_CANCEL" "dialog-control-document" "" "dialogcontrol" @@ -542,19 +861,20 @@ 1 0 0 - "5/2/2006" + "16/4/2008" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnAnnotateCmpClick" - "ID_ANNOTATE_CMP" - 10003 + "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||" + "wxID_CANCEL" + 5101 + "" "wxButton" "wxButton" 1 0 "" "" - "" - "&Annotate" + "m_btnClose" + "Close" 1 "" "" @@ -566,7 +886,7 @@ "" "" "" - "C60000" + "" "" 0 1 @@ -600,7 +920,7 @@ "" - "wxButton: ID_DEANNOTATE_CMP" + "wxButton: ID_CLEAR_ANNOTATION_CMP" "dialog-control-document" "" "dialogcontrol" @@ -608,19 +928,20 @@ 1 0 0 - "5/2/2006" + "16/4/2008" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnDeannotateCmpClick" - "ID_DEANNOTATE_CMP" + "wxEVT_COMMAND_BUTTON_CLICKED|OnClearAnnotationCmpClick|||" + "ID_CLEAR_ANNOTATION_CMP" 10004 + "" "wxButton" "wxButton" 1 0 "" "" - "" - "&Del Annotate" + "m_btnClear" + "Clear Annotation" 0 "" "" @@ -666,7 +987,7 @@ "" - "wxButton: wxID_CANCEL" + "wxButton: wxID_APPLY" "dialog-control-document" "" "dialogcontrol" @@ -676,18 +997,19 @@ 0 "5/2/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||" - "wxID_CANCEL" - 5101 + "wxEVT_COMMAND_BUTTON_CLICKED|OnApplyClick|||" + "wxID_APPLY" + 5102 + "" "wxButton" "wxButton" 1 0 "" "" - "" - "&Cancel" - 0 + "m_btnApply" + "Annotation" + 1 "" "" "" @@ -698,7 +1020,7 @@ "" "" "" - "" + "C60000" "" 0 1 diff --git a/internat/fr/kicad.mo b/internat/fr/kicad.mo index 7f4e914e3a..ae12078cf0 100644 Binary files a/internat/fr/kicad.mo and b/internat/fr/kicad.mo differ diff --git a/internat/fr/kicad.po b/internat/fr/kicad.po index 4fcd9a57b1..e75749d2df 100644 --- a/internat/fr/kicad.po +++ b/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 \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)"