Browse Source
			
			
			Refactor eeschema dialog_color_config.xx, using wxFormBuilder to create the base dialog
			
			
				pull/5/head
			
			
		
		Refactor eeschema dialog_color_config.xx, using wxFormBuilder to create the base dialog
	
		
	
			
			
				pull/5/head
			
			
		
				 6 changed files with 363 additions and 121 deletions
			
			
		- 
					3eeschema/CMakeLists.txt
 - 
					128eeschema/dialogs/dialog_color_config.cpp
 - 
					24eeschema/dialogs/dialog_color_config.h
 - 
					55eeschema/dialogs/dialog_color_config_base.cpp
 - 
					217eeschema/dialogs/dialog_color_config_base.fbp
 - 
					57eeschema/dialogs/dialog_color_config_base.h
 
@ -0,0 +1,55 @@ | 
				
			|||
///////////////////////////////////////////////////////////////////////////
 | 
				
			|||
// C++ code generated with wxFormBuilder (version Jun  5 2014)
 | 
				
			|||
// http://www.wxformbuilder.org/
 | 
				
			|||
//
 | 
				
			|||
// PLEASE DO "NOT" EDIT THIS FILE!
 | 
				
			|||
///////////////////////////////////////////////////////////////////////////
 | 
				
			|||
 | 
				
			|||
#include "dialog_color_config_base.h"
 | 
				
			|||
 | 
				
			|||
///////////////////////////////////////////////////////////////////////////
 | 
				
			|||
 | 
				
			|||
DIALOG_COLOR_CONFIG_BASE::DIALOG_COLOR_CONFIG_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) | 
				
			|||
{ | 
				
			|||
	this->SetSizeHints( wxDefaultSize, wxDefaultSize ); | 
				
			|||
	 | 
				
			|||
	wxBoxSizer* bmainSizer; | 
				
			|||
	bmainSizer = new wxBoxSizer( wxVERTICAL ); | 
				
			|||
	 | 
				
			|||
	m_mainBoxSizer = new wxBoxSizer( wxHORIZONTAL ); | 
				
			|||
	 | 
				
			|||
	 | 
				
			|||
	bmainSizer->Add( m_mainBoxSizer, 1, wxEXPAND, 5 ); | 
				
			|||
	 | 
				
			|||
	m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); | 
				
			|||
	bmainSizer->Add( m_staticline, 0, wxEXPAND | wxALL, 5 ); | 
				
			|||
	 | 
				
			|||
	m_sdbSizer = new wxStdDialogButtonSizer(); | 
				
			|||
	m_sdbSizerOK = new wxButton( this, wxID_OK ); | 
				
			|||
	m_sdbSizer->AddButton( m_sdbSizerOK ); | 
				
			|||
	m_sdbSizerApply = new wxButton( this, wxID_APPLY ); | 
				
			|||
	m_sdbSizer->AddButton( m_sdbSizerApply ); | 
				
			|||
	m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); | 
				
			|||
	m_sdbSizer->AddButton( m_sdbSizerCancel ); | 
				
			|||
	m_sdbSizer->Realize(); | 
				
			|||
	 | 
				
			|||
	bmainSizer->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 ); | 
				
			|||
	 | 
				
			|||
	 | 
				
			|||
	this->SetSizer( bmainSizer ); | 
				
			|||
	this->Layout(); | 
				
			|||
	 | 
				
			|||
	this->Centre( wxBOTH ); | 
				
			|||
	 | 
				
			|||
	// Connect Events
 | 
				
			|||
	m_sdbSizerApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_COLOR_CONFIG_BASE::OnApplyClick ), NULL, this ); | 
				
			|||
	m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_COLOR_CONFIG_BASE::OnOkClick ), NULL, this ); | 
				
			|||
} | 
				
			|||
 | 
				
			|||
DIALOG_COLOR_CONFIG_BASE::~DIALOG_COLOR_CONFIG_BASE() | 
				
			|||
{ | 
				
			|||
	// Disconnect Events
 | 
				
			|||
	m_sdbSizerApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_COLOR_CONFIG_BASE::OnApplyClick ), NULL, this ); | 
				
			|||
	m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_COLOR_CONFIG_BASE::OnOkClick ), NULL, this ); | 
				
			|||
	 | 
				
			|||
} | 
				
			|||
@ -0,0 +1,217 @@ | 
				
			|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> | 
				
			|||
<wxFormBuilder_Project> | 
				
			|||
    <FileVersion major="1" minor="13" /> | 
				
			|||
    <object class="Project" expanded="1"> | 
				
			|||
        <property name="class_decoration"></property> | 
				
			|||
        <property name="code_generation">C++</property> | 
				
			|||
        <property name="disconnect_events">1</property> | 
				
			|||
        <property name="disconnect_mode">source_name</property> | 
				
			|||
        <property name="disconnect_php_events">0</property> | 
				
			|||
        <property name="disconnect_python_events">0</property> | 
				
			|||
        <property name="embedded_files_path">res</property> | 
				
			|||
        <property name="encoding">UTF-8</property> | 
				
			|||
        <property name="event_generation">connect</property> | 
				
			|||
        <property name="file">dialog_color_config_base</property> | 
				
			|||
        <property name="first_id">1000</property> | 
				
			|||
        <property name="help_provider">none</property> | 
				
			|||
        <property name="internationalize">1</property> | 
				
			|||
        <property name="name">dialog_color_config_base</property> | 
				
			|||
        <property name="namespace"></property> | 
				
			|||
        <property name="path">.</property> | 
				
			|||
        <property name="precompiled_header"></property> | 
				
			|||
        <property name="relative_path">1</property> | 
				
			|||
        <property name="skip_lua_events">1</property> | 
				
			|||
        <property name="skip_php_events">1</property> | 
				
			|||
        <property name="skip_python_events">1</property> | 
				
			|||
        <property name="ui_table">UI</property> | 
				
			|||
        <property name="use_enum">0</property> | 
				
			|||
        <property name="use_microsoft_bom">0</property> | 
				
			|||
        <object class="Dialog" expanded="1"> | 
				
			|||
            <property name="aui_managed">0</property> | 
				
			|||
            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> | 
				
			|||
            <property name="bg"></property> | 
				
			|||
            <property name="center">wxBOTH</property> | 
				
			|||
            <property name="context_help"></property> | 
				
			|||
            <property name="context_menu">1</property> | 
				
			|||
            <property name="enabled">1</property> | 
				
			|||
            <property name="event_handler">impl_virtual</property> | 
				
			|||
            <property name="extra_style"></property> | 
				
			|||
            <property name="fg"></property> | 
				
			|||
            <property name="font"></property> | 
				
			|||
            <property name="hidden">0</property> | 
				
			|||
            <property name="id">wxID_ANY</property> | 
				
			|||
            <property name="maximum_size"></property> | 
				
			|||
            <property name="minimum_size"></property> | 
				
			|||
            <property name="name">DIALOG_COLOR_CONFIG_BASE</property> | 
				
			|||
            <property name="pos"></property> | 
				
			|||
            <property name="size">446,344</property> | 
				
			|||
            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> | 
				
			|||
            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property> | 
				
			|||
            <property name="title">EESchema Colors</property> | 
				
			|||
            <property name="tooltip"></property> | 
				
			|||
            <property name="window_extra_style"></property> | 
				
			|||
            <property name="window_name"></property> | 
				
			|||
            <property name="window_style"></property> | 
				
			|||
            <event name="OnActivate"></event> | 
				
			|||
            <event name="OnActivateApp"></event> | 
				
			|||
            <event name="OnAuiFindManager"></event> | 
				
			|||
            <event name="OnAuiPaneButton"></event> | 
				
			|||
            <event name="OnAuiPaneClose"></event> | 
				
			|||
            <event name="OnAuiPaneMaximize"></event> | 
				
			|||
            <event name="OnAuiPaneRestore"></event> | 
				
			|||
            <event name="OnAuiRender"></event> | 
				
			|||
            <event name="OnChar"></event> | 
				
			|||
            <event name="OnClose"></event> | 
				
			|||
            <event name="OnEnterWindow"></event> | 
				
			|||
            <event name="OnEraseBackground"></event> | 
				
			|||
            <event name="OnHibernate"></event> | 
				
			|||
            <event name="OnIconize"></event> | 
				
			|||
            <event name="OnIdle"></event> | 
				
			|||
            <event name="OnInitDialog"></event> | 
				
			|||
            <event name="OnKeyDown"></event> | 
				
			|||
            <event name="OnKeyUp"></event> | 
				
			|||
            <event name="OnKillFocus"></event> | 
				
			|||
            <event name="OnLeaveWindow"></event> | 
				
			|||
            <event name="OnLeftDClick"></event> | 
				
			|||
            <event name="OnLeftDown"></event> | 
				
			|||
            <event name="OnLeftUp"></event> | 
				
			|||
            <event name="OnMiddleDClick"></event> | 
				
			|||
            <event name="OnMiddleDown"></event> | 
				
			|||
            <event name="OnMiddleUp"></event> | 
				
			|||
            <event name="OnMotion"></event> | 
				
			|||
            <event name="OnMouseEvents"></event> | 
				
			|||
            <event name="OnMouseWheel"></event> | 
				
			|||
            <event name="OnPaint"></event> | 
				
			|||
            <event name="OnRightDClick"></event> | 
				
			|||
            <event name="OnRightDown"></event> | 
				
			|||
            <event name="OnRightUp"></event> | 
				
			|||
            <event name="OnSetFocus"></event> | 
				
			|||
            <event name="OnSize"></event> | 
				
			|||
            <event name="OnUpdateUI"></event> | 
				
			|||
            <object class="wxBoxSizer" expanded="1"> | 
				
			|||
                <property name="minimum_size"></property> | 
				
			|||
                <property name="name">bmainSizer</property> | 
				
			|||
                <property name="orient">wxVERTICAL</property> | 
				
			|||
                <property name="permission">none</property> | 
				
			|||
                <object class="sizeritem" expanded="1"> | 
				
			|||
                    <property name="border">5</property> | 
				
			|||
                    <property name="flag">wxEXPAND</property> | 
				
			|||
                    <property name="proportion">1</property> | 
				
			|||
                    <object class="wxBoxSizer" expanded="1"> | 
				
			|||
                        <property name="minimum_size"></property> | 
				
			|||
                        <property name="name">m_mainBoxSizer</property> | 
				
			|||
                        <property name="orient">wxHORIZONTAL</property> | 
				
			|||
                        <property name="permission">protected</property> | 
				
			|||
                    </object> | 
				
			|||
                </object> | 
				
			|||
                <object class="sizeritem" expanded="1"> | 
				
			|||
                    <property name="border">5</property> | 
				
			|||
                    <property name="flag">wxEXPAND | wxALL</property> | 
				
			|||
                    <property name="proportion">0</property> | 
				
			|||
                    <object class="wxStaticLine" expanded="1"> | 
				
			|||
                        <property name="BottomDockable">1</property> | 
				
			|||
                        <property name="LeftDockable">1</property> | 
				
			|||
                        <property name="RightDockable">1</property> | 
				
			|||
                        <property name="TopDockable">1</property> | 
				
			|||
                        <property name="aui_layer"></property> | 
				
			|||
                        <property name="aui_name"></property> | 
				
			|||
                        <property name="aui_position"></property> | 
				
			|||
                        <property name="aui_row"></property> | 
				
			|||
                        <property name="best_size"></property> | 
				
			|||
                        <property name="bg"></property> | 
				
			|||
                        <property name="caption"></property> | 
				
			|||
                        <property name="caption_visible">1</property> | 
				
			|||
                        <property name="center_pane">0</property> | 
				
			|||
                        <property name="close_button">1</property> | 
				
			|||
                        <property name="context_help"></property> | 
				
			|||
                        <property name="context_menu">1</property> | 
				
			|||
                        <property name="default_pane">0</property> | 
				
			|||
                        <property name="dock">Dock</property> | 
				
			|||
                        <property name="dock_fixed">0</property> | 
				
			|||
                        <property name="docking">Left</property> | 
				
			|||
                        <property name="enabled">1</property> | 
				
			|||
                        <property name="fg"></property> | 
				
			|||
                        <property name="floatable">1</property> | 
				
			|||
                        <property name="font"></property> | 
				
			|||
                        <property name="gripper">0</property> | 
				
			|||
                        <property name="hidden">0</property> | 
				
			|||
                        <property name="id">wxID_ANY</property> | 
				
			|||
                        <property name="max_size"></property> | 
				
			|||
                        <property name="maximize_button">0</property> | 
				
			|||
                        <property name="maximum_size"></property> | 
				
			|||
                        <property name="min_size"></property> | 
				
			|||
                        <property name="minimize_button">0</property> | 
				
			|||
                        <property name="minimum_size"></property> | 
				
			|||
                        <property name="moveable">1</property> | 
				
			|||
                        <property name="name">m_staticline</property> | 
				
			|||
                        <property name="pane_border">1</property> | 
				
			|||
                        <property name="pane_position"></property> | 
				
			|||
                        <property name="pane_size"></property> | 
				
			|||
                        <property name="permission">protected</property> | 
				
			|||
                        <property name="pin_button">1</property> | 
				
			|||
                        <property name="pos"></property> | 
				
			|||
                        <property name="resize">Resizable</property> | 
				
			|||
                        <property name="show">1</property> | 
				
			|||
                        <property name="size"></property> | 
				
			|||
                        <property name="style">wxLI_HORIZONTAL</property> | 
				
			|||
                        <property name="subclass"></property> | 
				
			|||
                        <property name="toolbar_pane">0</property> | 
				
			|||
                        <property name="tooltip"></property> | 
				
			|||
                        <property name="window_extra_style"></property> | 
				
			|||
                        <property name="window_name"></property> | 
				
			|||
                        <property name="window_style"></property> | 
				
			|||
                        <event name="OnChar"></event> | 
				
			|||
                        <event name="OnEnterWindow"></event> | 
				
			|||
                        <event name="OnEraseBackground"></event> | 
				
			|||
                        <event name="OnKeyDown"></event> | 
				
			|||
                        <event name="OnKeyUp"></event> | 
				
			|||
                        <event name="OnKillFocus"></event> | 
				
			|||
                        <event name="OnLeaveWindow"></event> | 
				
			|||
                        <event name="OnLeftDClick"></event> | 
				
			|||
                        <event name="OnLeftDown"></event> | 
				
			|||
                        <event name="OnLeftUp"></event> | 
				
			|||
                        <event name="OnMiddleDClick"></event> | 
				
			|||
                        <event name="OnMiddleDown"></event> | 
				
			|||
                        <event name="OnMiddleUp"></event> | 
				
			|||
                        <event name="OnMotion"></event> | 
				
			|||
                        <event name="OnMouseEvents"></event> | 
				
			|||
                        <event name="OnMouseWheel"></event> | 
				
			|||
                        <event name="OnPaint"></event> | 
				
			|||
                        <event name="OnRightDClick"></event> | 
				
			|||
                        <event name="OnRightDown"></event> | 
				
			|||
                        <event name="OnRightUp"></event> | 
				
			|||
                        <event name="OnSetFocus"></event> | 
				
			|||
                        <event name="OnSize"></event> | 
				
			|||
                        <event name="OnUpdateUI"></event> | 
				
			|||
                    </object> | 
				
			|||
                </object> | 
				
			|||
                <object class="sizeritem" expanded="1"> | 
				
			|||
                    <property name="border">5</property> | 
				
			|||
                    <property name="flag">wxALIGN_RIGHT|wxALL</property> | 
				
			|||
                    <property name="proportion">0</property> | 
				
			|||
                    <object class="wxStdDialogButtonSizer" expanded="1"> | 
				
			|||
                        <property name="Apply">1</property> | 
				
			|||
                        <property name="Cancel">1</property> | 
				
			|||
                        <property name="ContextHelp">0</property> | 
				
			|||
                        <property name="Help">0</property> | 
				
			|||
                        <property name="No">0</property> | 
				
			|||
                        <property name="OK">1</property> | 
				
			|||
                        <property name="Save">0</property> | 
				
			|||
                        <property name="Yes">0</property> | 
				
			|||
                        <property name="minimum_size"></property> | 
				
			|||
                        <property name="name">m_sdbSizer</property> | 
				
			|||
                        <property name="permission">protected</property> | 
				
			|||
                        <event name="OnApplyButtonClick">OnApplyClick</event> | 
				
			|||
                        <event name="OnCancelButtonClick"></event> | 
				
			|||
                        <event name="OnContextHelpButtonClick"></event> | 
				
			|||
                        <event name="OnHelpButtonClick"></event> | 
				
			|||
                        <event name="OnNoButtonClick"></event> | 
				
			|||
                        <event name="OnOKButtonClick">OnOkClick</event> | 
				
			|||
                        <event name="OnSaveButtonClick"></event> | 
				
			|||
                        <event name="OnYesButtonClick"></event> | 
				
			|||
                    </object> | 
				
			|||
                </object> | 
				
			|||
            </object> | 
				
			|||
        </object> | 
				
			|||
    </object> | 
				
			|||
</wxFormBuilder_Project> | 
				
			|||
@ -0,0 +1,57 @@ | 
				
			|||
/////////////////////////////////////////////////////////////////////////// | 
				
			|||
// C++ code generated with wxFormBuilder (version Jun  5 2014) | 
				
			|||
// http://www.wxformbuilder.org/ | 
				
			|||
// | 
				
			|||
// PLEASE DO "NOT" EDIT THIS FILE! | 
				
			|||
/////////////////////////////////////////////////////////////////////////// | 
				
			|||
 | 
				
			|||
#ifndef __DIALOG_COLOR_CONFIG_BASE_H__ | 
				
			|||
#define __DIALOG_COLOR_CONFIG_BASE_H__ | 
				
			|||
 | 
				
			|||
#include <wx/artprov.h> | 
				
			|||
#include <wx/xrc/xmlres.h> | 
				
			|||
#include <wx/intl.h> | 
				
			|||
class DIALOG_SHIM; | 
				
			|||
 | 
				
			|||
#include "dialog_shim.h" | 
				
			|||
#include <wx/sizer.h> | 
				
			|||
#include <wx/gdicmn.h> | 
				
			|||
#include <wx/statline.h> | 
				
			|||
#include <wx/font.h> | 
				
			|||
#include <wx/colour.h> | 
				
			|||
#include <wx/settings.h> | 
				
			|||
#include <wx/string.h> | 
				
			|||
#include <wx/button.h> | 
				
			|||
#include <wx/dialog.h> | 
				
			|||
 | 
				
			|||
/////////////////////////////////////////////////////////////////////////// | 
				
			|||
 | 
				
			|||
 | 
				
			|||
/////////////////////////////////////////////////////////////////////////////// | 
				
			|||
/// Class DIALOG_COLOR_CONFIG_BASE | 
				
			|||
/////////////////////////////////////////////////////////////////////////////// | 
				
			|||
class DIALOG_COLOR_CONFIG_BASE : public DIALOG_SHIM | 
				
			|||
{ | 
				
			|||
	private: | 
				
			|||
	 | 
				
			|||
	protected: | 
				
			|||
		wxBoxSizer* m_mainBoxSizer; | 
				
			|||
		wxStaticLine* m_staticline; | 
				
			|||
		wxStdDialogButtonSizer* m_sdbSizer; | 
				
			|||
		wxButton* m_sdbSizerOK; | 
				
			|||
		wxButton* m_sdbSizerApply; | 
				
			|||
		wxButton* m_sdbSizerCancel; | 
				
			|||
		 | 
				
			|||
		// Virtual event handlers, overide them in your derived class | 
				
			|||
		virtual void OnApplyClick( wxCommandEvent& event ) { event.Skip(); } | 
				
			|||
		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } | 
				
			|||
		 | 
				
			|||
	 | 
				
			|||
	public: | 
				
			|||
		 | 
				
			|||
		DIALOG_COLOR_CONFIG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EESchema Colors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 446,344 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );  | 
				
			|||
		~DIALOG_COLOR_CONFIG_BASE(); | 
				
			|||
	 | 
				
			|||
}; | 
				
			|||
 | 
				
			|||
#endif //__DIALOG_COLOR_CONFIG_BASE_H__ | 
				
			|||
						Write
						Preview
					
					
					Loading…
					
					Cancel
						Save
					
		Reference in new issue