haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename WIDGET_COLOR_CONFIG -> WIDGET_EESCHEMA_COLOR_CONFIG

This commit is contained in:
Chris Pavlina 2016-01-16 18:51:27 -05:00
parent 8c2427d3fa
commit 9513741816
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/CMakeLists.txt
View File

@ -73,7 +73,7 @@ set( EESCHEMA_DLGS
) )
set( EESCHEMA_WIDGETS set( EESCHEMA_WIDGETS
widgets/widget_color_config.cpp widgets/widget_eeschema_color_config.cpp
) )

2
eeschema/dialogs/dialog_color_config.cpp
View File

@ -40,7 +40,7 @@ DIALOG_COLOR_CONFIG::DIALOG_COLOR_CONFIG( EDA_DRAW_FRAME* aParent ) :
{ {
m_parent = aParent; m_parent = aParent;
m_colorConfig = new WIDGET_COLOR_CONFIG( this, aParent ); m_colorConfig = new WIDGET_EESCHEMA_COLOR_CONFIG( this, aParent );
m_colorConfig->InstallOnPanel( m_pnlColors ); m_colorConfig->InstallOnPanel( m_pnlColors );
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );

6
eeschema/dialogs/dialog_color_config.h
View File

@ -26,7 +26,7 @@
#define DIALOG_COLOR_CONFIG_H_ #define DIALOG_COLOR_CONFIG_H_
#include <dialog_color_config_base.h> #include <dialog_color_config_base.h>
#include "../widgets/widget_color_config.h" #include "../widgets/widget_eeschema_color_config.h"
class wxBoxSizer; class wxBoxSizer;
class wxStaticLine; class wxStaticLine;
@ -39,8 +39,8 @@ class wxStdDialogButtonSizer;
class DIALOG_COLOR_CONFIG : public DIALOG_COLOR_CONFIG_BASE class DIALOG_COLOR_CONFIG : public DIALOG_COLOR_CONFIG_BASE
{ {
EDA_DRAW_FRAME* m_parent; EDA_DRAW_FRAME* m_parent;
WIDGET_COLOR_CONFIG* m_colorConfig; WIDGET_EESCHEMA_COLOR_CONFIG* m_colorConfig;
public: public:
// Constructors and destructor // Constructors and destructor

14
eeschema/widgets/widget_color_config.cpp → eeschema/widgets/widget_eeschema_color_config.cpp
View File

@ -31,7 +31,7 @@
#include <general.h> #include <general.h>
#include "widget_color_config.h" #include "widget_eeschema_color_config.h"
// Specify the width and height of every (color-displaying / bitmap) button // Specify the width and height of every (color-displaying / bitmap) button
const int BUTT_SIZE_X = 16; const int BUTT_SIZE_X = 16;
@ -107,7 +107,7 @@ static BUTTONINDEX buttonGroups[] = {
static EDA_COLOR_T currentColors[ LAYERSCH_ID_COUNT ]; static EDA_COLOR_T currentColors[ LAYERSCH_ID_COUNT ];
WIDGET_COLOR_CONFIG::WIDGET_COLOR_CONFIG( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame ) : WIDGET_EESCHEMA_COLOR_CONFIG::WIDGET_EESCHEMA_COLOR_CONFIG( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame ) :
wxPanel( aParent ), m_drawFrame( aDrawFrame ) wxPanel( aParent ), m_drawFrame( aDrawFrame )
{ {
CreateControls(); CreateControls();
@ -116,7 +116,7 @@ WIDGET_COLOR_CONFIG::WIDGET_COLOR_CONFIG( wxWindow* aParent, EDA_DRAW_FRAME* aDr
} }
void WIDGET_COLOR_CONFIG::CreateControls() void WIDGET_EESCHEMA_COLOR_CONFIG::CreateControls()
{ {
wxStaticText* label; wxStaticText* label;
int buttonId = 1800; int buttonId = 1800;
@ -184,7 +184,7 @@ void WIDGET_COLOR_CONFIG::CreateControls()
} }
Connect( 1800, buttonId - 1, wxEVT_COMMAND_BUTTON_CLICKED, Connect( 1800, buttonId - 1, wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler( WIDGET_COLOR_CONFIG::SetColor ) ); wxCommandEventHandler( WIDGET_EESCHEMA_COLOR_CONFIG::SetColor ) );
wxArrayString selBgColorStrings; wxArrayString selBgColorStrings;
selBgColorStrings.Add( _( "White" ) ); selBgColorStrings.Add( _( "White" ) );
@ -207,7 +207,7 @@ void WIDGET_COLOR_CONFIG::CreateControls()
} }
void WIDGET_COLOR_CONFIG::SetColor( wxCommandEvent& event ) void WIDGET_EESCHEMA_COLOR_CONFIG::SetColor( wxCommandEvent& event )
{ {
wxBitmapButton* button = (wxBitmapButton*) event.GetEventObject(); wxBitmapButton* button = (wxBitmapButton*) event.GetEventObject();
@ -245,7 +245,7 @@ void WIDGET_COLOR_CONFIG::SetColor( wxCommandEvent& event )
} }
bool WIDGET_COLOR_CONFIG::TransferDataFromControl() bool WIDGET_EESCHEMA_COLOR_CONFIG::TransferDataFromControl()
{ {
bool warning = false; bool warning = false;
@ -295,7 +295,7 @@ bool WIDGET_COLOR_CONFIG::TransferDataFromControl()
} }
void WIDGET_COLOR_CONFIG::InstallOnPanel( wxPanel* aPanel ) void WIDGET_EESCHEMA_COLOR_CONFIG::InstallOnPanel( wxPanel* aPanel )
{ {
wxBoxSizer* sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* sizer = new wxBoxSizer( wxVERTICAL );

12
eeschema/widgets/widget_color_config.h → eeschema/widgets/widget_eeschema_color_config.h
View File

@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef WIDGET_COLOR_CONFIG_H_ #ifndef WIDGET_EESCHEMA_COLOR_CONFIG_H_
#define WIDGET_COLOR_CONFIG_H_ #define WIDGET_EESCHEMA_COLOR_CONFIG_H_
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/sizer.h> #include <wx/sizer.h>
@ -37,7 +37,7 @@ class wxStdDialogButtonSizer;
/* Derived class for the frame color settings. */ /* Derived class for the frame color settings. */
/***********************************************/ /***********************************************/
class WIDGET_COLOR_CONFIG : public wxPanel class WIDGET_EESCHEMA_COLOR_CONFIG : public wxPanel
{ {
private: private:
EDA_DRAW_FRAME* m_drawFrame; EDA_DRAW_FRAME* m_drawFrame;
@ -53,17 +53,17 @@ private:
public: public:
// Constructors and destructor // Constructors and destructor
WIDGET_COLOR_CONFIG( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame ); WIDGET_EESCHEMA_COLOR_CONFIG( wxWindow* aParent, EDA_DRAW_FRAME* aDrawFrame );
bool TransferDataFromControl(); bool TransferDataFromControl();
/** /**
* Method InstallOnPanel * Method InstallOnPanel
* Install this WIDGET_COLOR_CONFIG onto an empty panel. This is useful * Install this WIDGET_EESCHEMA_COLOR_CONFIG onto an empty panel. This is useful
* when combining with wxFormBuilder, as an empty panel can be left as a * when combining with wxFormBuilder, as an empty panel can be left as a
* placeholder in the layout. * placeholder in the layout.
*/ */
void InstallOnPanel( wxPanel* aPanel ); void InstallOnPanel( wxPanel* aPanel );
}; };
#endif // WIDGET_COLOR_CONFIG_H_ #endif // WIDGET_EESCHEMA_COLOR_CONFIG_H_