Skip to content

K
kicad-source-mirror
Commit 1e896d17 authored by g_harland's avatar g_harland
Browse files
Options

Enhance more dialog boxes for EESchema

parent c4f2b296
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 724 additions and 216 deletions
change_log.txt
View file @ 1e896d17
......@@ -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 <gharlandau@yahoo.com.au>
================================================================================
+ 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 <gharlandau@yahoo.com.au>
================================================================================
+ eeschema
......
common/makefile.include
View file @ 1e896d17
......@@ -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
......
eeschema/annotate.cpp
View file @ 1e896d17
......@@ -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 );
}
......
eeschema/annotate_dialog.cpp
View file @ 1e896d17
......@@ -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 );
}
eeschema/annotate_dialog.h
View file @ 1e896d17
......@@ -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
......
eeschema/annotate_dialog.pjd
View file @ 1e896d17
......@@ -10,8 +10,10 @@
<bool name="convert_images_to_xpm">0</bool>
<bool name="inline_images">0</bool>
<bool name="generate_cpp_for_xrc">0</bool>
<long name="working_mode">1</long>
<bool name="use_help_text_for_tooltips">1</bool>
<bool name="translate_strings">1</bool>
<bool name="make_unicode_strings">1</bool>
<bool name="extract_strings">0</bool>
<string name="user_name">"jean-pierre Charras"</string>
<string name="copyright_string">"License GNU"</string>
......@@ -213,6 +215,7 @@
<bool name="use-id-suffix">0</bool>
<string name="id-suffix">""</string>
<long name="use-xrc">0</long>
<long name="working-mode">0</long>
<string name="proxy-Id name">"ID_DIALOG"</string>
<long name="proxy-Id value">10000</long>
<string name="proxy-Class">"WinEDA_AnnotateFrame"</string>
......@@ -233,14 +236,21 @@
<bool name="proxy-Hidden">0</bool>
<bool name="proxy-Enabled">1</bool>
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<bool name="proxy-wxDEFAULT_DIALOG_STYLE">0</bool>
<bool name="proxy-wxCAPTION">1</bool>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Texture">""</string>
<string name="proxy-Texture style">"Tiled"</string>
<bool name="proxy-wxDEFAULT_DIALOG_STYLE">1</bool>
<bool name="proxy-wxCAPTION">0</bool>
<bool name="proxy-wxRESIZE_BORDER">0</bool>
<bool name="proxy-wxTHICK_FRAME">0</bool>
<bool name="proxy-wxSYSTEM_MENU">1</bool>
<bool name="proxy-wxSYSTEM_MENU">0</bool>
<bool name="proxy-wxSTAY_ON_TOP">0</bool>
<bool name="proxy-wxDIALOG_NO_PARENT">0</bool>
<bool name="proxy-wxCLOSE_BOX">1</bool>
<bool name="proxy-wxCLOSE_BOX">0</bool>
<bool name="proxy-wxMAXIMIZE_BOX">0</bool>
<bool name="proxy-wxMINIMIZE_BOX">0</bool>
<bool name="proxy-wxDIALOG_MODAL">0</bool>
......@@ -342,6 +352,11 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
......@@ -400,6 +415,11 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
......@@ -458,6 +478,11 @@
<string name="proxy-Platform">"&lt;Any platform&gt;"</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<bool name="proxy-wxRA_SPECIFY_ROWS">0</bool>
<bool name="proxy-wxRA_SPECIFY_COLS">1</bool>
<bool name="proxy-wxWANTS_CHARS">0</bool>
......@@ -533,6 +558,13 @@
<bool name="proxy-Default">1</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"C60000"</string>
<string name="proxy-Font">""</string>
......@@ -592,6 +624,13 @@
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">"0000E6"</string>
<string name="proxy-Font">""</string>
......@@ -627,7 +666,7 @@
<string name="proxy-Custom ctor arguments">""</string>
</document>
<document>
<string name="title">"wxButton: wxID_CLOSE"</string>
<string name="title">"wxButton: wxID_CANCEL"</string>
<string name="type">"dialog-control-document"</string>
<string name="filename">""</string>
<string name="icon-name">"dialogcontrol"</string>
......@@ -637,9 +676,9 @@
<long name="locked">0</long>
<string name="created">"5/2/2006"</string>
<string name="proxy-type">"wbButtonProxy"</string>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick"</string>
<string name="proxy-Id name">"wxID_CLOSE"</string>
<long name="proxy-Id value">5001</long>
<string name="event-handler-0">"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||"</string>
<string name="proxy-Id name">"wxID_CANCEL"</string>
<long name="proxy-Id value">5101</long>
<string name="proxy-Class">"wxButton"</string>
<string name="proxy-Base class">"wxButton"</string>
<bool name="proxy-External implementation">1</bool>
......@@ -647,10 +686,17 @@
<string name="proxy-Implementation filename">""</string>
<string name="proxy-Header filename">""</string>
<string name="proxy-Member variable name">""</string>
<string name="proxy-Label">"&amp;Close"</string>
<string name="proxy-Label">"&amp;Cancel"</string>
<bool name="proxy-Default">0</bool>
<string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string>
<string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string>
<string name="proxy-Data source">""</string>
<string name="proxy-Data class name">""</string>
<string name="proxy-Data class implementation filename">""</string>
<string name="proxy-Data class header filename">""</string>
<string name="proxy-Data class manager window">""</string>
<string name="proxy-Background colour">""</string>
<string name="proxy-Foreground colour">""</string>
<string name="proxy-Font">""</string>
......
eeschema/dialog_edit_component_in_schematic.cpp
View file @ 1e896d17
......@@ -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);
}
eeschema/dialog_edit_component_in_schematic.h
View file @ 1e896d17
......@@ -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 );
......
eeschema/dialog_edit_label.cpp
View file @ 1e896d17
......@@ -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
*/
void WinEDA_LabelPropertiesFrame::OnCloseClick( wxCommandEvent& event )
{
Close();
}
/*!
* wxEVT_CLOSE_WINDOW event handler for ID_DIALOG
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL
*/
void WinEDA_LabelPropertiesFrame::OnCloseWindow( wxCloseEvent& event )
void WinEDA_LabelPropertiesFrame::OnCancelClick( wxCommandEvent& event )
{
m_Parent->DrawPanel->MouseToCursorSchema();
event.Skip();
m_Parent->DrawPanel->MouseToCursorSchema();
EndModal( -1 );
}
eeschema/dialog_edit_label.h
View file @ 1e896d17
......@@ -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
......
eeschema/dialog_edit_label.pjd
View file @ 1e896d17
This diff is collapsed.
eeschema/dialog_erc.cpp
View file @ 1e896d17
......@@ -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);
}
eeschema/dialog_erc.h
View file @ 1e896d17
......@@ -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 );
......
eeschema/dialog_erc.pjd
View file @ 1e896d17
This diff is collapsed.
eeschema/edit_component_in_schematic.cpp
View file @ 1e896d17
......@@ -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 );
}
eeschema/edit_label.cpp
View file @ 1e896d17
......@@ -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 );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment