diff --git a/change_log.txt b/change_log.txt index 2a0f931bc4..242c99543d 100644 --- a/change_log.txt +++ b/change_log.txt @@ -4,6 +4,23 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. +2007-Nov-07 UPDATE Geoff Harland +================================================================================ ++ all + * The common/svg_print.cpp, common/svg_print.h, and common/svg_print.pjd files (which + are not currently used) have been removed, and replaced with svg_print.cpp.notused, + svg_print.h.notused, and svg_print.pjd.notused. And common/makefile.include has + also been updated so that none of those files are now listed at all. ++ eeschema + * A "Cancel" button has now been provided within each of the "Component properties", + "EESchema Annotation", "EESchema Erc", "Global Label properties", "Label properties", + and "Text properties" dialog boxes, and each of those dialogs can now (otherwise) be + cancelled by pressing the "Esc" key. (In due course, each of those dialogs will be + refined yet further; this is just an incremental enhancement.) + * The eestatus.cpp file (which is not currently used) has been removed, and replaced + with eestatus.cpp.notused. + + 2007-Nov-05 UPDATE Geoff Harland ================================================================================ + eeschema diff --git a/common/makefile.include b/common/makefile.include index 90409c4029..470fc2d41c 100644 --- a/common/makefile.include +++ b/common/makefile.include @@ -58,8 +58,6 @@ common_plotHPGL_functions.o: common_plotPS_functions.cpp ../include/plot_common. drawtxt.o: drawtxt.cpp ../include/grfonte.h $(COMMON) -svg_print.o: svg_print.cpp $(COMMON) - gr_basic.o: gr_basic.cpp ../include/gr_basic.h $(COMMON) ../include/plot_common.h dcsvg.o: dcsvg.cpp $(COMMON) ../include/dcsvg.h diff --git a/common/svg_print.cpp b/common/svg_print.cpp.notused similarity index 100% rename from common/svg_print.cpp rename to common/svg_print.cpp.notused diff --git a/common/svg_print.h b/common/svg_print.h.notused similarity index 100% rename from common/svg_print.h rename to common/svg_print.h.notused diff --git a/common/svg_print.pjd b/common/svg_print.pjd.notused similarity index 100% rename from common/svg_print.pjd rename to common/svg_print.pjd.notused diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp index a65362422a..c53b45531b 100644 --- a/eeschema/annotate.cpp +++ b/eeschema/annotate.cpp @@ -72,7 +72,8 @@ void InstallAnnotateFrame( WinEDA_SchematicFrame* parent, wxPoint& pos ) { WinEDA_AnnotateFrame* frame = new WinEDA_AnnotateFrame( parent ); - frame->ShowModal(); frame->Destroy(); + frame->ShowModal(); + frame->Destroy(); } @@ -162,7 +163,7 @@ void WinEDA_AnnotateFrame::AnnotateComponents( wxCommandEvent& event ) CheckAnnotate( m_Parent, AnnotProject ? FALSE : TRUE ); m_Parent->DrawPanel->Refresh( TRUE ); /* Refresh screen */ - Close(); + EndModal( 1 ); } @@ -218,7 +219,7 @@ void WinEDA_AnnotateFrame::DeleteAnnotation( wxCommandEvent& event ) } m_Parent->DrawPanel->Refresh( TRUE ); - Close(); + EndModal( 0 ); } diff --git a/eeschema/annotate_dialog.cpp b/eeschema/annotate_dialog.cpp index 54662ce097..558f82cc17 100644 --- a/eeschema/annotate_dialog.cpp +++ b/eeschema/annotate_dialog.cpp @@ -51,7 +51,7 @@ BEGIN_EVENT_TABLE( WinEDA_AnnotateFrame, wxDialog ) EVT_BUTTON( ID_DEANNOTATE_CMP, WinEDA_AnnotateFrame::OnDeannotateCmpClick ) - EVT_BUTTON( wxID_CLOSE, WinEDA_AnnotateFrame::OnCloseClick ) + EVT_BUTTON( wxID_CANCEL, WinEDA_AnnotateFrame::OnCancelClick ) ////@end WinEDA_AnnotateFrame event table entries @@ -90,7 +90,7 @@ bool WinEDA_AnnotateFrame::Create( wxWindow* parent, wxWindowID id, const wxStri wxDialog::Create( parent, id, caption, pos, size, style ); CreateControls(); - if (GetSizer()) + if( GetSizer() ) { GetSizer()->SetSizeHints(this); } @@ -108,7 +108,7 @@ void WinEDA_AnnotateFrame::CreateControls() SetFont(*g_DialogFont); ////@begin WinEDA_AnnotateFrame content construction - // Generated by DialogBlocks, 05/07/2007 21:07:04 (unregistered) + // Generated by DialogBlocks, 07/11/2007 08:19:55 (unregistered) WinEDA_AnnotateFrame* itemDialog1 = this; @@ -151,7 +151,7 @@ void WinEDA_AnnotateFrame::CreateControls() itemButton9->SetForegroundColour(wxColour(0, 0, 230)); itemBoxSizer7->Add(itemButton9, 0, wxGROW|wxALL, 5); - wxButton* itemButton10 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton10 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer7->Add(itemButton10, 0, wxGROW|wxALL, 5); ////@end WinEDA_AnnotateFrame content construction @@ -210,12 +210,10 @@ void WinEDA_AnnotateFrame::OnDeannotateCmpClick( wxCommandEvent& event ) } /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL */ -void WinEDA_AnnotateFrame::OnCloseClick( wxCommandEvent& event ) +void WinEDA_AnnotateFrame::OnCancelClick( wxCommandEvent& event ) { - Close(TRUE); + EndModal( -1 ); } - - diff --git a/eeschema/annotate_dialog.h b/eeschema/annotate_dialog.h index 4d5a3e3bda..a0da8e77b3 100644 --- a/eeschema/annotate_dialog.h +++ b/eeschema/annotate_dialog.h @@ -49,7 +49,7 @@ #define ID_RADIOBOX2 10005 #define ID_ANNOTATE_CMP 10003 #define ID_DEANNOTATE_CMP 10004 -#define SYMBOL_WINEDA_ANNOTATEFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER +#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) @@ -92,8 +92,8 @@ public: /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_DEANNOTATE_CMP void OnDeannotateCmpClick( wxCommandEvent& event ); - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE - void OnCloseClick( wxCommandEvent& event ); + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + void OnCancelClick( wxCommandEvent& event ); ////@end WinEDA_AnnotateFrame event handler declarations diff --git a/eeschema/annotate_dialog.pjd b/eeschema/annotate_dialog.pjd index 9663e9806e..b97453be83 100644 --- a/eeschema/annotate_dialog.pjd +++ b/eeschema/annotate_dialog.pjd @@ -10,8 +10,10 @@ 0 0 0 + 1 1 1 + 1 0 "jean-pierre Charras" "License GNU" @@ -213,6 +215,7 @@ 0 "" 0 + 0 "ID_DIALOG" 10000 "WinEDA_AnnotateFrame" @@ -233,14 +236,21 @@ 0 1 "<Any platform>" - 0 - 1 + "" + "" + "" + "" + "" + "" + "Tiled" + 1 + 0 0 0 - 1 + 0 0 0 - 1 + 0 0 0 0 @@ -342,6 +352,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -400,6 +415,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -458,6 +478,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -533,6 +558,13 @@ 1 "" "" + "" + "" + "" + "" + "" + "" + "" "" "C60000" "" @@ -592,6 +624,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000E6" "" @@ -627,7 +666,7 @@ "" - "wxButton: wxID_CLOSE" + "wxButton: wxID_CANCEL" "dialog-control-document" "" "dialogcontrol" @@ -637,9 +676,9 @@ 0 "5/2/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick" - "wxID_CLOSE" - 5001 + "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||" + "wxID_CANCEL" + 5101 "wxButton" "wxButton" 1 @@ -647,10 +686,17 @@ "" "" "" - "&Close" + "&Cancel" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "" "" diff --git a/eeschema/dialog_edit_component_in_schematic.cpp b/eeschema/dialog_edit_component_in_schematic.cpp index 931853e584..30e9216002 100644 --- a/eeschema/dialog_edit_component_in_schematic.cpp +++ b/eeschema/dialog_edit_component_in_schematic.cpp @@ -33,7 +33,7 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_ComponentPropertiesFrame, wxDialog ) BEGIN_EVENT_TABLE( WinEDA_ComponentPropertiesFrame, wxDialog ) ////@begin WinEDA_ComponentPropertiesFrame event table entries - EVT_BUTTON( wxID_CLOSE, WinEDA_ComponentPropertiesFrame::OnCloseClick ) + EVT_BUTTON( wxID_CANCEL, WinEDA_ComponentPropertiesFrame::OnCancelClick ) EVT_BUTTON( ID_RESTORE_CMP_DEFAULTS, WinEDA_ComponentPropertiesFrame::OnRestoreCmpDefaultsClick ) @@ -118,7 +118,7 @@ void WinEDA_ComponentPropertiesFrame::CreateControls() SetFont(*g_DialogFont); ////@begin WinEDA_ComponentPropertiesFrame content construction - // Generated by DialogBlocks, 24/11/2006 13:20:15 (unregistered) + // Generated by DialogBlocks, 07/11/2007 08:28:00 (unregistered) WinEDA_ComponentPropertiesFrame* itemDialog1 = this; @@ -131,36 +131,35 @@ void WinEDA_ComponentPropertiesFrame::CreateControls() wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); m_PanelBasic->SetSizer(itemBoxSizer5); - wxString m_SelectUnitStrings[] = { - _("Unit 1"), - _("Unit 2"), - _("Unit 3"), - _("Unit 4"), - _("Unit 5"), - _("Unit 6"), - _("Unit 7"), - _("Unit 8"), - _("Unit 9"), - _("Unit 10"), - _("Unit 11"), - _("Unit 12"), - _("Unit 13"), - _("Unit 14"), - _("Unit 15"), - _("Unit 16"), - _("Unit 16"), - _("Unit 17"), - _("Unit 18"), - _("Unit 19"), - _("Unit 20"), - _("Unit 21"), - _("Unit 22"), - _("Unit 23"), - _("Unit 24"), - _("Unit 25"), - _("Unit 26") - }; - m_SelectUnit = new wxRadioBox( m_PanelBasic, ID_RADIOBOX_UNIT, _("Unit:"), wxDefaultPosition, wxDefaultSize, 27, m_SelectUnitStrings, 9, wxRA_SPECIFY_ROWS ); + wxArrayString m_SelectUnitStrings; + m_SelectUnitStrings.Add(_("Unit 1")); + m_SelectUnitStrings.Add(_("Unit 2")); + m_SelectUnitStrings.Add(_("Unit 3")); + m_SelectUnitStrings.Add(_("Unit 4")); + m_SelectUnitStrings.Add(_("Unit 5")); + m_SelectUnitStrings.Add(_("Unit 6")); + m_SelectUnitStrings.Add(_("Unit 7")); + m_SelectUnitStrings.Add(_("Unit 8")); + m_SelectUnitStrings.Add(_("Unit 9")); + m_SelectUnitStrings.Add(_("Unit 10")); + m_SelectUnitStrings.Add(_("Unit 11")); + m_SelectUnitStrings.Add(_("Unit 12")); + m_SelectUnitStrings.Add(_("Unit 13")); + m_SelectUnitStrings.Add(_("Unit 14")); + m_SelectUnitStrings.Add(_("Unit 15")); + m_SelectUnitStrings.Add(_("Unit 16")); + m_SelectUnitStrings.Add(_("Unit 16")); + m_SelectUnitStrings.Add(_("Unit 17")); + m_SelectUnitStrings.Add(_("Unit 18")); + m_SelectUnitStrings.Add(_("Unit 19")); + m_SelectUnitStrings.Add(_("Unit 20")); + m_SelectUnitStrings.Add(_("Unit 21")); + m_SelectUnitStrings.Add(_("Unit 22")); + m_SelectUnitStrings.Add(_("Unit 23")); + m_SelectUnitStrings.Add(_("Unit 24")); + m_SelectUnitStrings.Add(_("Unit 25")); + m_SelectUnitStrings.Add(_("Unit 26")); + m_SelectUnit = new wxRadioBox( m_PanelBasic, ID_RADIOBOX_UNIT, _("Unit:"), wxDefaultPosition, wxDefaultSize, m_SelectUnitStrings, 9, wxRA_SPECIFY_ROWS ); m_SelectUnit->SetSelection(0); itemBoxSizer5->Add(m_SelectUnit, 0, wxGROW|wxALL, 5); @@ -168,22 +167,20 @@ void WinEDA_ComponentPropertiesFrame::CreateControls() itemBoxSizer5->Add(itemBoxSizer7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer7->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxString m_OrientUnitStrings[] = { - _("0"), - _("+90"), - _("180"), - _("-90") - }; - m_OrientUnit = new wxRadioBox( m_PanelBasic, ID_RADIOBOX_ORIENT, _("Orient:"), wxDefaultPosition, wxDefaultSize, 4, m_OrientUnitStrings, 1, wxRA_SPECIFY_COLS ); + wxArrayString m_OrientUnitStrings; + m_OrientUnitStrings.Add(_("0")); + m_OrientUnitStrings.Add(_("+90")); + m_OrientUnitStrings.Add(_("180")); + m_OrientUnitStrings.Add(_("-90")); + m_OrientUnit = new wxRadioBox( m_PanelBasic, ID_RADIOBOX_ORIENT, _("Orient:"), wxDefaultPosition, wxDefaultSize, m_OrientUnitStrings, 1, wxRA_SPECIFY_COLS ); m_OrientUnit->SetSelection(0); itemBoxSizer8->Add(m_OrientUnit, 0, wxGROW|wxLEFT|wxRIGHT, 5); - wxString m_MirrorUnitStrings[] = { - _("Normal"), - _("Mirror --"), - _("Mirror !") - }; - m_MirrorUnit = new wxRadioBox( m_PanelBasic, ID_RADIOBOX_MIRROR, _("Mirror:"), wxDefaultPosition, wxDefaultSize, 3, m_MirrorUnitStrings, 1, wxRA_SPECIFY_COLS ); + wxArrayString m_MirrorUnitStrings; + m_MirrorUnitStrings.Add(_("Normal")); + m_MirrorUnitStrings.Add(_("Mirror --")); + m_MirrorUnitStrings.Add(_("Mirror !")); + m_MirrorUnit = new wxRadioBox( m_PanelBasic, ID_RADIOBOX_MIRROR, _("Mirror:"), wxDefaultPosition, wxDefaultSize, m_MirrorUnitStrings, 1, wxRA_SPECIFY_COLS ); m_MirrorUnit->SetSelection(0); itemBoxSizer8->Add(m_MirrorUnit, 0, wxGROW|wxLEFT|wxRIGHT, 5); @@ -232,7 +229,7 @@ void WinEDA_ComponentPropertiesFrame::CreateControls() wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxHORIZONTAL); m_GeneralBoxSizer->Add(itemBoxSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton24 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton24 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton24->SetForegroundColour(wxColour(0, 0, 255)); itemBoxSizer23->Add(itemButton24, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -284,12 +281,12 @@ wxIcon WinEDA_ComponentPropertiesFrame::GetIconResource( const wxString& name ) ////@end WinEDA_ComponentPropertiesFrame icon retrieval } /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL */ -void WinEDA_ComponentPropertiesFrame::OnCloseClick( wxCommandEvent& event ) +void WinEDA_ComponentPropertiesFrame::OnCancelClick( wxCommandEvent& event ) { - Close(true); + EndModal( -1 ); } /*! @@ -309,5 +306,3 @@ void WinEDA_ComponentPropertiesFrame::OnOkClick( wxCommandEvent& event ) { ComponentPropertiesAccept(event); } - - diff --git a/eeschema/dialog_edit_component_in_schematic.h b/eeschema/dialog_edit_component_in_schematic.h index 3cb12a1175..877d59872e 100644 --- a/eeschema/dialog_edit_component_in_schematic.h +++ b/eeschema/dialog_edit_component_in_schematic.h @@ -48,7 +48,7 @@ class wxNotebook; #define ID_CHECKBOX_SHOW_FILED 10010 #define ID_CHECKBOX_FILED_ORIENT 10011 #define ID_RESTORE_CMP_DEFAULTS 10006 -#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER +#define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_TITLE _("Component properties") #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_IDNAME ID_DIALOG #define SYMBOL_WINEDA_COMPONENTPROPERTIESFRAME_SIZE wxSize(400, 300) @@ -87,8 +87,8 @@ public: ////@begin WinEDA_ComponentPropertiesFrame event handler declarations - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE - void OnCloseClick( wxCommandEvent& event ); + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + void OnCancelClick( wxCommandEvent& event ); /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RESTORE_CMP_DEFAULTS void OnRestoreCmpDefaultsClick( wxCommandEvent& event ); diff --git a/eeschema/dialog_edit_component_in_schematic.pjd b/eeschema/dialog_edit_component_in_schematic.pjd index 9f5075df69..254339b2dc 100644 --- a/eeschema/dialog_edit_component_in_schematic.pjd +++ b/eeschema/dialog_edit_component_in_schematic.pjd @@ -1,4 +1,4 @@ - +
0 @@ -6,13 +6,14 @@ "" "" "" - 33 "" 0 0 0 + 1 1 1 + 1 0 "jean-pierre Charras" "License GNU" @@ -44,12 +45,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -" - " -/*! - * %BODY% - */ - " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -83,6 +78,14 @@ #include "wx/wx.h" #endif +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + " "app_resources.h" "app_resources.cpp" @@ -94,6 +97,7 @@ "" "<None>" "<System>" + "utf-8" "<System>" "" 0 @@ -106,6 +110,7 @@ 1 1 1 + 0 1
@@ -183,7 +188,7 @@ 1 1 0 - 0 + 1 "Windows" "html-document" @@ -207,7 +212,10 @@ 10000 0 "" + 0 + "" 0 + 0 "ID_DIALOG" 10000 "WinEDA_ComponentPropertiesFrame" @@ -228,14 +236,21 @@ 0 1 "<Any platform>" - 0 - 1 + "" + "" + "" + "" + "" + "" + "Tiled" + 1 + 0 0 0 - 1 + 0 0 0 - 1 + 0 0 0 0 @@ -260,6 +275,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -292,6 +308,11 @@ "ID_SCHEDIT_NOTEBOOK" 10001 "wxNotebook" + "wxNotebook" + 1 + 0 + "" + "" "m_NoteBook" 0 "" @@ -304,6 +325,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 1 0 @@ -358,13 +384,13 @@ 10002 "wxPanel" "wxPanel" - "m_PanelBasic" - "Options" - "" 0 0 "" "" + "m_PanelBasic" + "Options" + "" "" "" "" @@ -373,6 +399,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 0 @@ -386,6 +419,7 @@ 0 0 1 + 0 0 0 "" @@ -407,6 +441,7 @@ 0 "" "" + 0 "" "wxBoxSizer H" @@ -447,6 +482,11 @@ "ID_RADIOBOX_UNIT" 10004 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_SelectUnit" "Unit:" 9 @@ -462,6 +502,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -550,6 +595,11 @@ "ID_RADIOBOX_ORIENT" 10005 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_OrientUnit" "Orient:" 1 @@ -565,6 +615,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -603,6 +658,11 @@ "ID_RADIOBOX_MIRROR" 10007 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_MirrorUnit" "Mirror:" 1 @@ -618,6 +678,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -657,6 +722,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_MsgPartLocked" "Parts are locked" -1 @@ -670,6 +740,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -716,6 +791,11 @@ "ID_CHECKBOX" 10008 "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_ConvertButt" "Convert" 0 @@ -723,6 +803,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -769,6 +854,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Chip Name:" -1 @@ -782,6 +872,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -828,6 +923,11 @@ "ID_TEXTCTRL" 10009 "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_RefInLib" "" 0 @@ -841,6 +941,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -854,8 +959,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -883,6 +989,7 @@ 0 "" "" + 0 @@ -902,13 +1009,13 @@ 10003 "wxPanel" "wxPanel" - "m_PanelField" - "Fields" - "" 0 0 "" "" + "m_PanelField" + "Fields" + "" "" "" "" @@ -917,6 +1024,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 0 @@ -930,6 +1044,7 @@ 0 0 1 + 0 0 0 "" @@ -951,6 +1066,7 @@ 0 "" "" + 0 "" "wxBoxSizer H" @@ -1041,6 +1157,11 @@ "ID_CHECKBOX_SHOW_FILED" 10010 "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_ShowFieldTextCtrl" "Show Text" 0 @@ -1048,6 +1169,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -1094,6 +1220,11 @@ "ID_CHECKBOX_FILED_ORIENT" 10011 "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_VorientFieldText" "Vertical" 0 @@ -1101,6 +1232,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -1216,7 +1352,7 @@ 0 "<Any platform>" - "wxButton: wxID_CLOSE" + "wxButton: wxID_CANCEL" "dialog-control-document" "" "dialogcontrol" @@ -1226,15 +1362,27 @@ 0 "3/5/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick" - "wxID_CLOSE" - 5001 + "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||" + "wxID_CANCEL" + 5101 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" - "&Close" + "&Cancel" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000FF" "" @@ -1284,11 +1432,23 @@ "ID_RESTORE_CMP_DEFAULTS" 10006 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Defaults" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "CE0000" "" @@ -1338,11 +1498,23 @@ "wxID_OK" 5100 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&OK" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "008000" "" diff --git a/eeschema/dialog_edit_label.cpp b/eeschema/dialog_edit_label.cpp index 68b74b8b2b..d3daee610e 100644 --- a/eeschema/dialog_edit_label.cpp +++ b/eeschema/dialog_edit_label.cpp @@ -34,11 +34,9 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_LabelPropertiesFrame, wxDialog ) BEGIN_EVENT_TABLE( WinEDA_LabelPropertiesFrame, wxDialog ) ////@begin WinEDA_LabelPropertiesFrame event table entries - EVT_CLOSE( WinEDA_LabelPropertiesFrame::OnCloseWindow ) - EVT_BUTTON( wxID_OK, WinEDA_LabelPropertiesFrame::OnOkClick ) - EVT_BUTTON( wxID_CLOSE, WinEDA_LabelPropertiesFrame::OnCloseClick ) + EVT_BUTTON( wxID_CANCEL, WinEDA_LabelPropertiesFrame::OnCancelClick ) ////@end WinEDA_LabelPropertiesFrame event table entries @@ -121,7 +119,7 @@ void WinEDA_LabelPropertiesFrame::CreateControls() { SetFont(*g_DialogFont); ////@begin WinEDA_LabelPropertiesFrame content construction - // Generated by DialogBlocks, 19/02/2006 16:49:06 (unregistered) + // Generated by DialogBlocks, 07/11/2007 12:37:47 (unregistered) WinEDA_LabelPropertiesFrame* itemDialog1 = this; @@ -140,25 +138,25 @@ void WinEDA_LabelPropertiesFrame::CreateControls() wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer3->Add(itemBoxSizer6, 0, wxGROW|wxALL, 5); - wxString m_TextOrientStrings[] = { - _("Right"), - _("Up"), - _("Left"), - _("Down") - }; - m_TextOrient = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Text Orient:"), wxDefaultPosition, wxDefaultSize, 4, m_TextOrientStrings, 1, wxRA_SPECIFY_COLS ); + wxArrayString m_TextOrientStrings; + m_TextOrientStrings.Add(_("Right")); + m_TextOrientStrings.Add(_("Up")); + m_TextOrientStrings.Add(_("Left")); + m_TextOrientStrings.Add(_("Down")); + m_TextOrient = new wxRadioBox( itemDialog1, ID_RADIOBOX, _("Text Orient:"), wxDefaultPosition, wxDefaultSize, m_TextOrientStrings, 1, wxRA_SPECIFY_COLS ); + m_TextOrient->SetSelection(0); itemBoxSizer6->Add(m_TextOrient, 0, wxALIGN_TOP|wxALL, 5); itemBoxSizer6->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxString m_TextShapeStrings[] = { - _("Input"), - _("Output"), - _("Bidi"), - _("TriState"), - _("Passive") - }; - m_TextShape = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Glabel Shape:"), wxDefaultPosition, wxDefaultSize, 5, m_TextShapeStrings, 1, wxRA_SPECIFY_COLS ); + wxArrayString m_TextShapeStrings; + m_TextShapeStrings.Add(_("Input")); + m_TextShapeStrings.Add(_("Output")); + m_TextShapeStrings.Add(_("Bidi")); + m_TextShapeStrings.Add(_("TriState")); + m_TextShapeStrings.Add(_("Passive")); + m_TextShape = new wxRadioBox( itemDialog1, ID_RADIOBOX1, _("Glabel Shape:"), wxDefaultPosition, wxDefaultSize, m_TextShapeStrings, 1, wxRA_SPECIFY_COLS ); + m_TextShape->SetSelection(0); m_TextShape->Show(false); itemBoxSizer6->Add(m_TextShape, 0, wxALIGN_TOP|wxALL, 5); @@ -178,7 +176,7 @@ void WinEDA_LabelPropertiesFrame::CreateControls() itemButton14->SetForegroundColour(wxColour(204, 0, 0)); itemBoxSizer10->Add(itemButton14, 0, wxGROW|wxALL, 5); - wxButton* itemButton15 = new wxButton( itemDialog1, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton15 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton15->SetForegroundColour(wxColour(0, 0, 255)); itemBoxSizer10->Add(itemButton15, 0, wxGROW|wxALL, 5); @@ -235,23 +233,11 @@ void WinEDA_LabelPropertiesFrame::OnOkClick( wxCommandEvent& event ) } /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL */ -void WinEDA_LabelPropertiesFrame::OnCloseClick( wxCommandEvent& event ) +void WinEDA_LabelPropertiesFrame::OnCancelClick( wxCommandEvent& event ) { - Close(); + m_Parent->DrawPanel->MouseToCursorSchema(); + EndModal( -1 ); } - - -/*! - * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG - */ - -void WinEDA_LabelPropertiesFrame::OnCloseWindow( wxCloseEvent& event ) -{ - m_Parent->DrawPanel->MouseToCursorSchema(); - event.Skip(); -} - - diff --git a/eeschema/dialog_edit_label.h b/eeschema/dialog_edit_label.h index 0c35d53bf9..7c7e3418dc 100644 --- a/eeschema/dialog_edit_label.h +++ b/eeschema/dialog_edit_label.h @@ -36,15 +36,15 @@ ////@begin control identifiers #define ID_DIALOG 10000 -#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER -#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_TITLE _("Dialog") -#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_IDNAME ID_DIALOG -#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_SIZE wxSize(400, 300) -#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_POSITION wxDefaultPosition #define ID_TEXTCTRL 10001 #define ID_RADIOBOX 10003 #define ID_RADIOBOX1 10004 #define ID_TEXTCTRL1 10002 +#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER +#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_TITLE _("Dialog") +#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_IDNAME ID_DIALOG +#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_SIZE wxSize(400, 300) +#define SYMBOL_WINEDA_LABELPROPERTIESFRAME_POSITION wxDefaultPosition ////@end control identifiers /*! @@ -80,14 +80,11 @@ public: ////@begin WinEDA_LabelPropertiesFrame event handler declarations - /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG - void OnCloseWindow( wxCloseEvent& event ); - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK void OnOkClick( wxCommandEvent& event ); - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE - void OnCloseClick( wxCommandEvent& event ); + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + void OnCancelClick( wxCommandEvent& event ); ////@end WinEDA_LabelPropertiesFrame event handler declarations diff --git a/eeschema/dialog_edit_label.pjd b/eeschema/dialog_edit_label.pjd index 42007eb85a..d7ffe43dd3 100644 --- a/eeschema/dialog_edit_label.pjd +++ b/eeschema/dialog_edit_label.pjd @@ -1,4 +1,4 @@ - +
0 @@ -6,18 +6,20 @@ "" "" "" - 22 "" 0 0 0 + 1 1 1 + 1 0 "jean-pierre Charras" "License GNU" "" 0 + 0 "<All platforms>" "<Any>" "///////////////////////////////////////////////////////////////////////////// @@ -43,12 +45,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -" - " -/*! - * %BODY% - */ - " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -82,6 +78,14 @@ #include "wx/wx.h" #endif +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + " "app_resources.h" "app_resources.cpp" @@ -93,11 +97,21 @@ "" "<None>" "<System>" + "utf-8" "<System>" "" + 0 + 0 + 4 + " " + "" 0 + 0 + 1 1 1 + 0 + 1
@@ -174,7 +188,7 @@ 1 1 0 - 0 + 1 "Windows" "html-document" @@ -198,8 +212,10 @@ 10000 0 "" + 0 + "" 0 - "wxEVT_CLOSE_WINDOW|OnCloseWindow" + 0 "ID_DIALOG" 10000 "WinEDA_LabelPropertiesFrame" @@ -220,14 +236,21 @@ 0 1 "<Any platform>" - 0 - 1 + "" + "" + "" + "" + "" + "" + "Tiled" + 1 + 0 0 0 - 1 + 0 0 0 - 1 + 0 0 0 0 @@ -238,7 +261,9 @@ 0 0 0 - 0 + 0 + 0 + 0 0 0 1 @@ -250,6 +275,7 @@ -1 400 300 + 0 "" "wxBoxSizer H" @@ -306,8 +332,14 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Text " + -1 "" "" "" @@ -318,6 +350,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -329,6 +366,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -362,6 +401,11 @@ "ID_TEXTCTRL" 10001 "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_TextLabel" "" 0 @@ -375,6 +419,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -388,8 +437,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -397,6 +447,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -455,9 +507,16 @@ "ID_RADIOBOX" 10003 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_TextOrient" "Text Orient:" 1 + "Right|Up|Left|Down" + 0 "" "" "" @@ -468,10 +527,16 @@ "<Any platform>" "m_CurrentText->m_Orient" "wxGenericValidator(& %VARIABLE%)" + "" + "" + "" + "" + "" 0 1 - "Right|Up|Left|Down" 0 + 0 + 0 "" -1 -1 @@ -531,9 +596,16 @@ "ID_RADIOBOX1" 10004 "wxRadioBox" + "wxRadioBox" + 1 + 0 + "" + "" "m_TextShape" "Glabel Shape:" 1 + "Input|Output|Bidi|TriState|Passive" + 0 "" "" "" @@ -544,10 +616,16 @@ "<Any platform>" "m_CurrentText->m_Shape" "wxGenericValidator(& %VARIABLE%)" + "" + "" + "" + "" + "" 0 1 - "Input|Output|Bidi|TriState|Passive" 0 + 0 + 0 "" -1 -1 @@ -608,8 +686,14 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_SizeTitle" "Size " + -1 "" "" "" @@ -620,6 +704,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -631,6 +720,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -664,6 +755,11 @@ "ID_TEXTCTRL1" 10002 "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_TextSize" "" 0 @@ -677,6 +773,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -690,8 +791,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -699,6 +801,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -759,11 +863,23 @@ "wxID_OK" 5100 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&OK" 1 "" "" + "" + "" + "" + "" + "" + "" + "" "" "CC0000" "" @@ -777,6 +893,8 @@ 0 0 0 + 0 + 0 "" -1 -1 @@ -797,7 +915,7 @@ "" - "wxButton: wxID_CLOSE" + "wxButton: wxID_CANCEL" "dialog-control-document" "" "dialogcontrol" @@ -807,15 +925,27 @@ 0 "19/2/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick" - "wxID_CLOSE" - 5001 + "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||" + "wxID_CANCEL" + 5101 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" - "&Close" + "&Cancel" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000FF" "" @@ -829,6 +959,8 @@ 0 0 0 + 0 + 0 "" -1 -1 diff --git a/eeschema/dialog_erc.cpp b/eeschema/dialog_erc.cpp index 75408ac1ca..4ecd2e8568 100644 --- a/eeschema/dialog_erc.cpp +++ b/eeschema/dialog_erc.cpp @@ -60,7 +60,7 @@ BEGIN_EVENT_TABLE( WinEDA_ErcFrame, wxDialog ) EVT_BUTTON( ID_ERASE_DRC_MARKERS, WinEDA_ErcFrame::OnEraseDrcMarkersClick ) - EVT_BUTTON( wxID_EXIT, WinEDA_ErcFrame::OnExitClick ) + EVT_BUTTON( wxID_CANCEL, WinEDA_ErcFrame::OnCancelClick ) EVT_BUTTON( ID_RESET_MATRIX, WinEDA_ErcFrame::OnResetMatrixClick ) @@ -153,7 +153,7 @@ void WinEDA_ErcFrame::CreateControls() SetFont(*g_DialogFont); ////@begin WinEDA_ErcFrame content construction - // Generated by DialogBlocks, 19/11/2006 20:27:15 (unregistered) + // Generated by DialogBlocks, 07/11/2007 08:01:37 (unregistered) WinEDA_ErcFrame* itemDialog1 = this; @@ -215,7 +215,7 @@ void WinEDA_ErcFrame::CreateControls() wxButton* itemButton21 = new wxButton( m_PanelERC, ID_ERASE_DRC_MARKERS, _("&Del Markers"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer19->Add(itemButton21, 0, wxGROW|wxALL, 5); - wxButton* itemButton22 = new wxButton( m_PanelERC, wxID_EXIT, _("&Quit"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton22 = new wxButton( m_PanelERC, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton22->SetForegroundColour(wxColour(0, 0, 255)); itemBoxSizer19->Add(itemButton22, 0, wxGROW|wxALL, 5); @@ -290,10 +290,10 @@ void WinEDA_ErcFrame::OnEraseDrcMarkersClick( wxCommandEvent& event ) } /*! - * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_EXIT + * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL */ -void WinEDA_ErcFrame::OnExitClick( wxCommandEvent& event ) +void WinEDA_ErcFrame::OnCancelClick( wxCommandEvent& event ) { EndModal(0); } @@ -316,5 +316,3 @@ void WinEDA_ErcFrame::OnErcCmpClick( wxCommandEvent& event ) { TestErc(event); } - - diff --git a/eeschema/dialog_erc.h b/eeschema/dialog_erc.h index 3e6c923cb6..1c65f34b67 100644 --- a/eeschema/dialog_erc.h +++ b/eeschema/dialog_erc.h @@ -53,9 +53,7 @@ class wxStaticLine; #define ID_ERASE_DRC_MARKERS 10003 #define ID_PANEL1 10005 #define ID_RESET_MATRIX 10007 - -#define SYMBOL_WINEDA_ERCFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER - +#define SYMBOL_WINEDA_ERCFRAME_STYLE wxDEFAULT_DIALOG_STYLE|MAYBE_RESIZE_BORDER #define SYMBOL_WINEDA_ERCFRAME_TITLE _("EESchema Erc") #define SYMBOL_WINEDA_ERCFRAME_IDNAME ID_DIALOG #define SYMBOL_WINEDA_ERCFRAME_SIZE wxDefaultSize @@ -99,8 +97,8 @@ public: /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_ERASE_DRC_MARKERS void OnEraseDrcMarkersClick( wxCommandEvent& event ); - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_EXIT - void OnExitClick( wxCommandEvent& event ); + /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL + void OnCancelClick( wxCommandEvent& event ); /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RESET_MATRIX void OnResetMatrixClick( wxCommandEvent& event ); diff --git a/eeschema/dialog_erc.pjd b/eeschema/dialog_erc.pjd index aa1f0ef974..87423c2c80 100644 --- a/eeschema/dialog_erc.pjd +++ b/eeschema/dialog_erc.pjd @@ -1,4 +1,4 @@ - +
0 @@ -6,13 +6,14 @@ "" "" "" - 34 "" 0 0 0 + 1 1 1 + 1 0 "jean-pierre Charras" "License GNU" @@ -44,12 +45,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -" - " -/*! - * %BODY% - */ - " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -83,6 +78,14 @@ #include "wx/wx.h" #endif +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + " "app_resources.h" "app_resources.cpp" @@ -94,6 +97,7 @@ "" "<None>" "<System>" + "utf-8" "<System>" "" 0 @@ -106,6 +110,7 @@ 1 1 1 + 0 1
@@ -183,7 +188,7 @@ 1 1 0 - 0 + 1 "Windows" "html-document" @@ -207,7 +212,10 @@ 10000 0 "" + 0 + "" 0 + 0 "ID_DIALOG" 10000 "WinEDA_ErcFrame" @@ -228,14 +236,21 @@ 0 1 "<Any platform>" - 0 - 1 + "" + "" + "" + "" + "" + "" + "Tiled" + 1 + 0 0 0 - 1 + 0 0 0 - 1 + 0 0 0 0 @@ -260,6 +275,7 @@ -1 -1 -1 + 0 "" "wxBoxSizer V" @@ -291,6 +307,11 @@ "ID_ERC_NOTEBOOK" 10001 "wxNotebook" + "wxNotebook" + 1 + 0 + "" + "" "m_NoteBook" 0 "" @@ -303,6 +324,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 1 0 @@ -356,13 +382,13 @@ 10004 "wxPanel" "wxPanel" - "m_PanelERC" - "erc" - "" 0 0 "" "" + "m_PanelERC" + "erc" + "" "" "" "" @@ -371,6 +397,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 0 @@ -384,6 +417,7 @@ 0 0 1 + 0 0 0 "" @@ -405,6 +439,7 @@ 0 "" "" + 0 "" "wxBoxSizer H" @@ -470,13 +505,14 @@ "wxID_ANY" -1 "Erc File Report:" + "" "" "" "" 0 1 + "wxStaticBox" "Horizontal" - "" "Left" "Centre" 0 @@ -528,6 +564,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "ErcTotalErrors" "-> Total Errors: " -1 @@ -541,6 +582,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -587,6 +633,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "WarnErcErrors" "-> Last Warnings: " -1 @@ -600,6 +651,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -646,6 +702,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "ErcErrors" "-> Last Errors: " -1 @@ -659,6 +720,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -731,6 +797,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_TotalErrCount" "0000" -1 @@ -744,6 +815,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -790,6 +866,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_LastWarningCount" "0" -1 @@ -803,6 +884,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -849,6 +935,11 @@ "wxID_STATIC" 5105 "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_LastErrCount" "0" -1 @@ -862,6 +953,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -936,13 +1032,14 @@ "wxID_ANY" -1 "Erc File Report:" + "" "" "" "" 0 1 + "wxStaticBox" "Horizontal" - "" "Expand" "Centre" 0 @@ -969,6 +1066,11 @@ "ID_CHECKBOX" 10006 "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_WriteResultOpt" "Write erc report" 0 @@ -976,6 +1078,11 @@ "" "WriteFichierERC" "wxGenericValidator(& %VARIABLE%)" + "" + "" + "" + "" + "" "" "" "" @@ -1050,11 +1157,23 @@ "ID_ERC_CMP" 10002 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Test Erc" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "C60000" "" @@ -1104,11 +1223,23 @@ "ID_ERASE_DRC_MARKERS" 10003 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Del Markers" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -1144,7 +1275,7 @@ "" - "wxButton: wxID_EXIT" + "wxButton: wxID_CANCEL" "dialog-control-document" "" "dialogcontrol" @@ -1154,15 +1285,27 @@ 0 "12/3/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnExitClick" - "wxID_EXIT" - 5006 + "wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||" + "wxID_CANCEL" + 5101 "wxButton" + "wxButton" + 1 + 0 + "" + "" "" - "&Quit" + "&Cancel" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000FF" "" @@ -1215,13 +1358,13 @@ 10005 "wxPanel" "wxPanel" - "m_PanelERCOptions" - "Options" - "" 0 0 "" "" + "m_PanelERCOptions" + "Options" + "" "" "" "" @@ -1230,6 +1373,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 0 @@ -1243,6 +1393,7 @@ 0 0 1 + 0 0 0 "" @@ -1264,6 +1415,7 @@ 0 "" "" + 0 "" "wxBoxSizer V" @@ -1305,11 +1457,23 @@ "ID_RESET_MATRIX" 10007 "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_ResetOptButton" "Reset" 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -1358,6 +1522,11 @@ "wxID_STATIC" 5105 "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "m_SeparatorLine" "" "" diff --git a/eeschema/edit_component_in_schematic.cpp b/eeschema/edit_component_in_schematic.cpp index 671ed4a8fa..9d55bfd436 100644 --- a/eeschema/edit_component_in_schematic.cpp +++ b/eeschema/edit_component_in_schematic.cpp @@ -426,7 +426,7 @@ void WinEDA_ComponentPropertiesFrame::ComponentPropertiesAccept( wxCommandEvent& RedrawOneStruct( m_Parent->DrawPanel, &dc, m_Cmp, GR_DEFAULT_DRAWMODE ); m_Parent->TestDanglingEnds( m_Parent->m_CurrentScreen->EEDrawList, &dc ); - Close(); + EndModal( 0 ); } @@ -847,5 +847,5 @@ void WinEDA_ComponentPropertiesFrame::SetInitCmp( wxCommandEvent& event ) m_Parent->m_CurrentScreen->SetModify(); RedrawOneStruct( m_Parent->DrawPanel, &dc, m_Cmp, GR_DEFAULT_DRAWMODE ); - Close(); + EndModal( 1 ); } diff --git a/eeschema/edit_label.cpp b/eeschema/edit_label.cpp index 860fc4e4c7..dc19dadcb2 100644 --- a/eeschema/edit_label.cpp +++ b/eeschema/edit_label.cpp @@ -61,7 +61,8 @@ void WinEDA_LabelPropertiesFrame::TextPropertiesAccept( wxCommandEvent& event ) if( (m_CurrentText->m_Flags & IS_NEW) != 0 ) g_DefaultTextLabelSize = m_CurrentText->m_Size.x; - Close( TRUE ); + m_Parent->DrawPanel->MouseToCursorSchema(); + EndModal( 0 ); } diff --git a/eeschema/eestatus.cpp b/eeschema/eestatus.cpp.notused similarity index 100% rename from eeschema/eestatus.cpp rename to eeschema/eestatus.cpp.notused