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

Update preference panel names.

This commit is contained in:
Jeff Young 2020-10-25 19:24:00 +00:00
parent 0e686d377b
commit 2f1e755f66
17 changed files with 80 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/CMakeLists.txt
View File

@ -115,16 +115,16 @@ set( EESCHEMA_DLGS
dialogs/panel_eeschema_template_fieldnames_base.cpp dialogs/panel_eeschema_template_fieldnames_base.cpp
dialogs/panel_eeschema_display_options.cpp dialogs/panel_eeschema_display_options.cpp
dialogs/panel_eeschema_display_options_base.cpp dialogs/panel_eeschema_display_options_base.cpp
dialogs/panel_eeschema_settings.cpp dialogs/panel_eeschema_editing_options.cpp
dialogs/panel_eeschema_settings_base.cpp dialogs/panel_eeschema_editing_options_base.cpp
dialogs/panel_libedit_settings.cpp
dialogs/panel_libedit_settings_base.cpp
dialogs/panel_libedit_color_settings.cpp
dialogs/panel_libedit_color_settings_base.cpp
dialogs/panel_setup_formatting.cpp dialogs/panel_setup_formatting.cpp
dialogs/panel_setup_formatting_base.cpp dialogs/panel_setup_formatting_base.cpp
dialogs/panel_setup_pinmap.cpp dialogs/panel_setup_pinmap.cpp
dialogs/panel_setup_pinmap_base.cpp dialogs/panel_setup_pinmap_base.cpp
dialogs/panel_sym_editing_options.cpp
dialogs/panel_sym_editing_options_base.cpp
dialogs/panel_sym_color_settings.cpp
dialogs/panel_sym_color_settings_base.cpp
dialogs/panel_sym_lib_table.cpp dialogs/panel_sym_lib_table.cpp
dialogs/panel_sym_lib_table_base.cpp dialogs/panel_sym_lib_table_base.cpp
) )

13
eeschema/dialogs/panel_eeschema_settings.cpp → eeschema/dialogs/panel_eeschema_editing_options.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -28,18 +28,19 @@
#include <painter.h> #include <painter.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <eeschema_settings.h> #include <eeschema_settings.h>
#include "panel_eeschema_settings.h" #include "panel_eeschema_editing_options.h"
PANEL_EESCHEMA_SETTINGS::PANEL_EESCHEMA_SETTINGS( SCH_EDIT_FRAME* aFrame, wxWindow* aWindow ) : PANEL_EESCHEMA_EDITING_OPTIONS::PANEL_EESCHEMA_EDITING_OPTIONS( SCH_EDIT_FRAME* aFrame,
PANEL_EESCHEMA_SETTINGS_BASE( aWindow ), wxWindow* aWindow ) :
PANEL_EESCHEMA_EDITING_OPTIONS_BASE( aWindow ),
m_frame( aFrame ), m_frame( aFrame ),
m_hPitch( aFrame, m_hPitchLabel, m_hPitchCtrl, m_hPitchUnits, true ), m_hPitch( aFrame, m_hPitchLabel, m_hPitchCtrl, m_hPitchUnits, true ),
m_vPitch( aFrame, m_vPitchLabel, m_vPitchCtrl, m_vPitchUnits, true ) m_vPitch( aFrame, m_vPitchLabel, m_vPitchCtrl, m_vPitchUnits, true )
{} {}
bool PANEL_EESCHEMA_SETTINGS::TransferDataToWindow() bool PANEL_EESCHEMA_EDITING_OPTIONS::TransferDataToWindow()
{ {
EESCHEMA_SETTINGS* cfg = m_frame->eeconfig(); EESCHEMA_SETTINGS* cfg = m_frame->eeconfig();
@ -73,7 +74,7 @@ bool PANEL_EESCHEMA_SETTINGS::TransferDataToWindow()
} }
bool PANEL_EESCHEMA_SETTINGS::TransferDataFromWindow() bool PANEL_EESCHEMA_EDITING_OPTIONS::TransferDataFromWindow()
{ {
EESCHEMA_SETTINGS* cfg = m_frame->eeconfig(); EESCHEMA_SETTINGS* cfg = m_frame->eeconfig();

14
eeschema/dialogs/panel_eeschema_settings.h → eeschema/dialogs/panel_eeschema_editing_options.h
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2017-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2017-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -17,16 +17,16 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef KICAD_PANEL_EESCHEMA_SETTINGS_H #ifndef PANEL_EESCHEMA_EDITING_OPTIONS_H
#define KICAD_PANEL_EESCHEMA_SETTINGS_H #define PANEL_EESCHEMA_EDITING_OPTIONS_H
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include "panel_eeschema_settings_base.h" #include "panel_eeschema_editing_options_base.h"
class SCH_EDIT_FRAME; class SCH_EDIT_FRAME;
class PANEL_EESCHEMA_SETTINGS : public PANEL_EESCHEMA_SETTINGS_BASE class PANEL_EESCHEMA_EDITING_OPTIONS : public PANEL_EESCHEMA_EDITING_OPTIONS_BASE
{ {
SCH_EDIT_FRAME* m_frame; SCH_EDIT_FRAME* m_frame;
@ -34,7 +34,7 @@ class PANEL_EESCHEMA_SETTINGS : public PANEL_EESCHEMA_SETTINGS_BASE
UNIT_BINDER m_vPitch; UNIT_BINDER m_vPitch;
public: public:
PANEL_EESCHEMA_SETTINGS( SCH_EDIT_FRAME* aFrame, wxWindow* aWindow ); PANEL_EESCHEMA_EDITING_OPTIONS( SCH_EDIT_FRAME* aFrame, wxWindow* aWindow );
private: private:
bool TransferDataToWindow() override; bool TransferDataToWindow() override;
@ -42,4 +42,4 @@ private:
}; };
#endif //KICAD_PANEL_EESCHEMA_SETTINGS_H #endif //PANEL_EESCHEMA_EDITING_OPTIONS_H

6
eeschema/dialogs/panel_eeschema_settings_base.cpp → eeschema/dialogs/panel_eeschema_editing_options_base.cpp
View File

@ -5,11 +5,11 @@
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "panel_eeschema_settings_base.h" #include "panel_eeschema_editing_options_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
PANEL_EESCHEMA_SETTINGS_BASE::PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) PANEL_EESCHEMA_EDITING_OPTIONS_BASE::PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
{ {
wxBoxSizer* bPanelSizer; wxBoxSizer* bPanelSizer;
bPanelSizer = new wxBoxSizer( wxHORIZONTAL ); bPanelSizer = new wxBoxSizer( wxHORIZONTAL );
@ -170,6 +170,6 @@ PANEL_EESCHEMA_SETTINGS_BASE::PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wx
bPanelSizer->Fit( this ); bPanelSizer->Fit( this );
} }
PANEL_EESCHEMA_SETTINGS_BASE::~PANEL_EESCHEMA_SETTINGS_BASE() PANEL_EESCHEMA_EDITING_OPTIONS_BASE::~PANEL_EESCHEMA_EDITING_OPTIONS_BASE()
{ {
} }

6
eeschema/dialogs/panel_eeschema_settings_base.fbp → eeschema/dialogs/panel_eeschema_editing_options_base.fbp
View File

@ -11,12 +11,12 @@
<property name="embedded_files_path">res</property> <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">table</property> <property name="event_generation">table</property>
<property name="file">panel_eeschema_settings_base</property> <property name="file">panel_eeschema_editing_options_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">PanelEeschemaSettingsBase</property> <property name="name">PanelEeschemaEditingOptionsBase</property>
<property name="namespace"></property> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header"></property> <property name="precompiled_header"></property>
@ -41,7 +41,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">PANEL_EESCHEMA_SETTINGS_BASE</property> <property name="name">PANEL_EESCHEMA_EDITING_OPTIONS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property> <property name="subclass">; forward_declare</property>

8
eeschema/dialogs/panel_eeschema_settings_base.h → eeschema/dialogs/panel_eeschema_editing_options_base.h
View File

@ -27,9 +27,9 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_EESCHEMA_SETTINGS_BASE /// Class PANEL_EESCHEMA_EDITING_OPTIONS_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class PANEL_EESCHEMA_SETTINGS_BASE : public wxPanel class PANEL_EESCHEMA_EDITING_OPTIONS_BASE : public wxPanel
{ {
private: private:
@ -58,8 +58,8 @@ class PANEL_EESCHEMA_SETTINGS_BASE : public wxPanel
public: public:
PANEL_EESCHEMA_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); PANEL_EESCHEMA_EDITING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_EESCHEMA_SETTINGS_BASE(); ~PANEL_EESCHEMA_EDITING_OPTIONS_BASE();
}; };

12
eeschema/dialogs/panel_libedit_color_settings.cpp → eeschema/dialogs/panel_sym_color_settings.cpp
View File

@ -29,17 +29,17 @@
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <view/view.h> #include <view/view.h>
#include "panel_libedit_color_settings.h" #include "panel_sym_color_settings.h"
PANEL_LIBEDIT_COLOR_SETTINGS::PANEL_LIBEDIT_COLOR_SETTINGS( LIB_EDIT_FRAME* aFrame, PANEL_SYM_COLOR_SETTINGS::PANEL_SYM_COLOR_SETTINGS( LIB_EDIT_FRAME* aFrame,
wxWindow* aWindow ) wxWindow* aWindow )
: PANEL_LIBEDIT_COLOR_SETTINGS_BASE( aWindow ), m_frame( aFrame ) : PANEL_SYM_COLOR_SETTINGS_BASE( aWindow ), m_frame( aFrame )
{ {
} }
bool PANEL_LIBEDIT_COLOR_SETTINGS::TransferDataToWindow() bool PANEL_SYM_COLOR_SETTINGS::TransferDataToWindow()
{ {
auto cfg = Pgm().GetSettingsManager().GetAppSettings<LIBEDIT_SETTINGS>(); auto cfg = Pgm().GetSettingsManager().GetAppSettings<LIBEDIT_SETTINGS>();
@ -75,7 +75,7 @@ bool PANEL_LIBEDIT_COLOR_SETTINGS::TransferDataToWindow()
} }
bool PANEL_LIBEDIT_COLOR_SETTINGS::TransferDataFromWindow() bool PANEL_SYM_COLOR_SETTINGS::TransferDataFromWindow()
{ {
SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager(); SETTINGS_MANAGER& mgr = Pgm().GetSettingsManager();
@ -102,7 +102,7 @@ bool PANEL_LIBEDIT_COLOR_SETTINGS::TransferDataFromWindow()
} }
void PANEL_LIBEDIT_COLOR_SETTINGS::OnUseEeschemaThemeChanged( wxCommandEvent& event ) void PANEL_SYM_COLOR_SETTINGS::OnUseEeschemaThemeChanged( wxCommandEvent& event )
{ {
bool useEeschema = m_useEeschemaTheme->GetValue(); bool useEeschema = m_useEeschemaTheme->GetValue();

10
eeschema/dialogs/panel_libedit_color_settings.h → eeschema/dialogs/panel_sym_color_settings.h
View File

@ -21,20 +21,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef PANEL_LIBEDIT_COLOR_SETTINGS_H #ifndef PANEL_SYM_COLOR_SETTINGS_H
#define PANEL_LIBEDIT_COLOR_SETTINGS_H #define PANEL_SYM_COLOR_SETTINGS_H
#include "panel_libedit_color_settings_base.h" #include "panel_sym_color_settings_base.h"
class LIB_EDIT_FRAME; class LIB_EDIT_FRAME;
class PANEL_LIBEDIT_COLOR_SETTINGS : public PANEL_LIBEDIT_COLOR_SETTINGS_BASE class PANEL_SYM_COLOR_SETTINGS : public PANEL_SYM_COLOR_SETTINGS_BASE
{ {
LIB_EDIT_FRAME* m_frame; LIB_EDIT_FRAME* m_frame;
public: public:
PANEL_LIBEDIT_COLOR_SETTINGS( LIB_EDIT_FRAME* aFrame, wxWindow* aWindow ); PANEL_SYM_COLOR_SETTINGS( LIB_EDIT_FRAME* aFrame, wxWindow* aWindow );
protected: protected:
void OnUseEeschemaThemeChanged( wxCommandEvent& event ) override; void OnUseEeschemaThemeChanged( wxCommandEvent& event ) override;

10
eeschema/dialogs/panel_libedit_color_settings_base.cpp → eeschema/dialogs/panel_sym_color_settings_base.cpp
View File

@ -5,15 +5,15 @@
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "panel_libedit_color_settings_base.h" #include "panel_sym_color_settings_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( PANEL_LIBEDIT_COLOR_SETTINGS_BASE, wxPanel ) BEGIN_EVENT_TABLE( PANEL_SYM_COLOR_SETTINGS_BASE, wxPanel )
EVT_CHECKBOX( wxID_ANY, PANEL_LIBEDIT_COLOR_SETTINGS_BASE::_wxFB_OnUseEeschemaThemeChanged ) EVT_CHECKBOX( wxID_ANY, PANEL_SYM_COLOR_SETTINGS_BASE::_wxFB_OnUseEeschemaThemeChanged )
END_EVENT_TABLE() END_EVENT_TABLE()
PANEL_LIBEDIT_COLOR_SETTINGS_BASE::PANEL_LIBEDIT_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) PANEL_SYM_COLOR_SETTINGS_BASE::PANEL_SYM_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
{ {
wxBoxSizer* p1mainSizer; wxBoxSizer* p1mainSizer;
p1mainSizer = new wxBoxSizer( wxHORIZONTAL ); p1mainSizer = new wxBoxSizer( wxHORIZONTAL );
@ -51,6 +51,6 @@ PANEL_LIBEDIT_COLOR_SETTINGS_BASE::PANEL_LIBEDIT_COLOR_SETTINGS_BASE( wxWindow*
p1mainSizer->Fit( this ); p1mainSizer->Fit( this );
} }
PANEL_LIBEDIT_COLOR_SETTINGS_BASE::~PANEL_LIBEDIT_COLOR_SETTINGS_BASE() PANEL_SYM_COLOR_SETTINGS_BASE::~PANEL_SYM_COLOR_SETTINGS_BASE()
{ {
} }

6
eeschema/dialogs/panel_libedit_color_settings_base.fbp → eeschema/dialogs/panel_sym_color_settings_base.fbp
View File

@ -11,12 +11,12 @@
<property name="embedded_files_path">res</property> <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">table</property> <property name="event_generation">table</property>
<property name="file">panel_libedit_color_settings_base</property> <property name="file">panel_sym_color_settings_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">PanelLibeditColorSettingsBase</property> <property name="name">PanelSymColorSettingsBase</property>
<property name="namespace"></property> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header"></property> <property name="precompiled_header"></property>
@ -41,7 +41,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">PANEL_LIBEDIT_COLOR_SETTINGS_BASE</property> <property name="name">PANEL_SYM_COLOR_SETTINGS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property> <property name="subclass">; forward_declare</property>

8
eeschema/dialogs/panel_libedit_color_settings_base.h → eeschema/dialogs/panel_sym_color_settings_base.h
View File

@ -26,9 +26,9 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_LIBEDIT_COLOR_SETTINGS_BASE /// Class PANEL_SYM_COLOR_SETTINGS_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class PANEL_LIBEDIT_COLOR_SETTINGS_BASE : public wxPanel class PANEL_SYM_COLOR_SETTINGS_BASE : public wxPanel
{ {
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
@ -48,8 +48,8 @@ class PANEL_LIBEDIT_COLOR_SETTINGS_BASE : public wxPanel
public: public:
PANEL_LIBEDIT_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); PANEL_SYM_COLOR_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_LIBEDIT_COLOR_SETTINGS_BASE(); ~PANEL_SYM_COLOR_SETTINGS_BASE();
}; };

10
eeschema/dialogs/panel_libedit_settings.cpp → eeschema/dialogs/panel_sym_editing_options.cpp
View File

@ -28,11 +28,11 @@
#include <settings/settings_manager.h> #include <settings/settings_manager.h>
#include <libedit/libedit_settings.h> #include <libedit/libedit_settings.h>
#include "panel_libedit_settings.h" #include "panel_sym_editing_options.h"
PANEL_LIBEDIT_SETTINGS::PANEL_LIBEDIT_SETTINGS( LIB_EDIT_FRAME* aFrame, wxWindow* aWindow ) : PANEL_SYM_EDITING_OPTIONS::PANEL_SYM_EDITING_OPTIONS( LIB_EDIT_FRAME* aFrame, wxWindow* aWindow ) :
PANEL_LIBEDIT_SETTINGS_BASE( aWindow ), PANEL_SYM_EDITING_OPTIONS_BASE( aWindow ),
m_frame( aFrame ), m_frame( aFrame ),
m_lineWidth( aFrame, m_lineWidthLabel, m_lineWidthCtrl, m_lineWidthUnits, true ), m_lineWidth( aFrame, m_lineWidthLabel, m_lineWidthCtrl, m_lineWidthUnits, true ),
m_textSize( aFrame, m_textSizeLabel, m_textSizeCtrl, m_textSizeUnits, true ), m_textSize( aFrame, m_textSizeLabel, m_textSizeCtrl, m_textSizeUnits, true ),
@ -44,7 +44,7 @@ PANEL_LIBEDIT_SETTINGS::PANEL_LIBEDIT_SETTINGS( LIB_EDIT_FRAME* aFrame, wxWindow
{} {}
bool PANEL_LIBEDIT_SETTINGS::TransferDataToWindow() bool PANEL_SYM_EDITING_OPTIONS::TransferDataToWindow()
{ {
LIBEDIT_SETTINGS* settings = Pgm().GetSettingsManager().GetAppSettings<LIBEDIT_SETTINGS>(); LIBEDIT_SETTINGS* settings = Pgm().GetSettingsManager().GetAppSettings<LIBEDIT_SETTINGS>();
@ -64,7 +64,7 @@ bool PANEL_LIBEDIT_SETTINGS::TransferDataToWindow()
} }
bool PANEL_LIBEDIT_SETTINGS::TransferDataFromWindow() bool PANEL_SYM_EDITING_OPTIONS::TransferDataFromWindow()
{ {
LIBEDIT_SETTINGS* settings = Pgm().GetSettingsManager().GetAppSettings<LIBEDIT_SETTINGS>(); LIBEDIT_SETTINGS* settings = Pgm().GetSettingsManager().GetAppSettings<LIBEDIT_SETTINGS>();

12
eeschema/dialogs/panel_libedit_settings.h → eeschema/dialogs/panel_sym_editing_options.h
View File

@ -17,16 +17,16 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef PANEL_LIBEDIT_SETTINGS_H #ifndef PANEL_SYM_EDITING_OPTIONS_H
#define PANEL_LIBEDIT_SETTINGS_H #define PANEL_SYM_EDITING_OPTIONS_H
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include "panel_libedit_settings_base.h" #include "panel_sym_editing_options_base.h"
class LIB_EDIT_FRAME; class LIB_EDIT_FRAME;
class PANEL_LIBEDIT_SETTINGS : public PANEL_LIBEDIT_SETTINGS_BASE class PANEL_SYM_EDITING_OPTIONS : public PANEL_SYM_EDITING_OPTIONS_BASE
{ {
LIB_EDIT_FRAME* m_frame; LIB_EDIT_FRAME* m_frame;
@ -41,7 +41,7 @@ class PANEL_LIBEDIT_SETTINGS : public PANEL_LIBEDIT_SETTINGS_BASE
UNIT_BINDER m_vPitch; UNIT_BINDER m_vPitch;
public: public:
PANEL_LIBEDIT_SETTINGS( LIB_EDIT_FRAME* aFrame, wxWindow* aWindow ); PANEL_SYM_EDITING_OPTIONS( LIB_EDIT_FRAME* aFrame, wxWindow* aWindow );
private: private:
bool TransferDataToWindow() override; bool TransferDataToWindow() override;
@ -49,4 +49,4 @@ private:
}; };
#endif //PANEL_LIBEDIT_SETTINGS_H #endif //PANEL_SYM_EDITING_OPTIONS_H

6
eeschema/dialogs/panel_libedit_settings_base.cpp → eeschema/dialogs/panel_sym_editing_options_base.cpp
View File

@ -5,11 +5,11 @@
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "panel_libedit_settings_base.h" #include "panel_sym_editing_options_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
PANEL_LIBEDIT_SETTINGS_BASE::PANEL_LIBEDIT_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) PANEL_SYM_EDITING_OPTIONS_BASE::PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
{ {
wxBoxSizer* p1mainSizer; wxBoxSizer* p1mainSizer;
p1mainSizer = new wxBoxSizer( wxHORIZONTAL ); p1mainSizer = new wxBoxSizer( wxHORIZONTAL );
@ -172,6 +172,6 @@ PANEL_LIBEDIT_SETTINGS_BASE::PANEL_LIBEDIT_SETTINGS_BASE( wxWindow* parent, wxWi
p1mainSizer->Fit( this ); p1mainSizer->Fit( this );
} }
PANEL_LIBEDIT_SETTINGS_BASE::~PANEL_LIBEDIT_SETTINGS_BASE() PANEL_SYM_EDITING_OPTIONS_BASE::~PANEL_SYM_EDITING_OPTIONS_BASE()
{ {
} }

6
eeschema/dialogs/panel_libedit_settings_base.fbp → eeschema/dialogs/panel_sym_editing_options_base.fbp
View File

@ -11,12 +11,12 @@
<property name="embedded_files_path">res</property> <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">table</property> <property name="event_generation">table</property>
<property name="file">panel_libedit_settings_base</property> <property name="file">panel_sym_editing_options_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">PanelLibeditSettingsBase</property> <property name="name">PanelSymEditingOptionsBase</property>
<property name="namespace"></property> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header"></property> <property name="precompiled_header"></property>
@ -41,7 +41,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">PANEL_LIBEDIT_SETTINGS_BASE</property> <property name="name">PANEL_SYM_EDITING_OPTIONS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property> <property name="subclass">; forward_declare</property>

8
eeschema/dialogs/panel_libedit_settings_base.h → eeschema/dialogs/panel_sym_editing_options_base.h
View File

@ -28,9 +28,9 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_LIBEDIT_SETTINGS_BASE /// Class PANEL_SYM_EDITING_OPTIONS_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class PANEL_LIBEDIT_SETTINGS_BASE : public wxPanel class PANEL_SYM_EDITING_OPTIONS_BASE : public wxPanel
{ {
private: private:
@ -65,8 +65,8 @@ class PANEL_LIBEDIT_SETTINGS_BASE : public wxPanel
public: public:
PANEL_LIBEDIT_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); PANEL_SYM_EDITING_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_LIBEDIT_SETTINGS_BASE(); ~PANEL_SYM_EDITING_OPTIONS_BASE();
}; };

12
eeschema/eeschema_config.cpp
View File

@ -25,10 +25,10 @@
#include <confirm.h> #include <confirm.h>
#include <dialogs/panel_eeschema_color_settings.h> #include <dialogs/panel_eeschema_color_settings.h>
#include <dialogs/panel_eeschema_display_options.h> #include <dialogs/panel_eeschema_display_options.h>
#include <dialogs/panel_eeschema_settings.h> #include <dialogs/panel_eeschema_editing_options.h>
#include <dialogs/panel_eeschema_template_fieldnames.h> #include <dialogs/panel_eeschema_template_fieldnames.h>
#include <dialogs/panel_libedit_color_settings.h> #include <dialogs/panel_sym_color_settings.h>
#include <dialogs/panel_libedit_settings.h> #include <dialogs/panel_sym_editing_options.h>
#include <dialogs/dialog_schematic_setup.h> #include <dialogs/dialog_schematic_setup.h>
#include <eeschema_config.h> #include <eeschema_config.h>
#include <erc_settings.h> #include <erc_settings.h>
@ -222,7 +222,7 @@ void SCH_EDIT_FRAME::InstallPreferences( PAGED_DIALOG* aParent,
book->AddPage( new wxPanel( book ), _( "Eeschema" ) ); book->AddPage( new wxPanel( book ), _( "Eeschema" ) );
book->AddSubPage( new PANEL_EESCHEMA_DISPLAY_OPTIONS( this, book ), _( "Display Options" ) ); book->AddSubPage( new PANEL_EESCHEMA_DISPLAY_OPTIONS( this, book ), _( "Display Options" ) );
book->AddSubPage( new PANEL_EESCHEMA_SETTINGS( this, book ), _( "Editing Options" ) ); book->AddSubPage( new PANEL_EESCHEMA_EDITING_OPTIONS( this, book ), _( "Editing Options" ) );
book->AddSubPage( new PANEL_EESCHEMA_COLOR_SETTINGS( this, book ), _( "Colors" ) ); book->AddSubPage( new PANEL_EESCHEMA_COLOR_SETTINGS( this, book ), _( "Colors" ) );
book->AddSubPage( new PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( this, book, true ), book->AddSubPage( new PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( this, book, true ),
_( "Field Name Templates" ) ); _( "Field Name Templates" ) );
@ -393,8 +393,8 @@ void LIB_EDIT_FRAME::InstallPreferences( PAGED_DIALOG* aParent,
book->AddPage( new wxPanel( book ), _( "Symbol Editor" ) ); book->AddPage( new wxPanel( book ), _( "Symbol Editor" ) );
book->AddSubPage( new PANEL_GAL_DISPLAY_OPTIONS( this, aParent ), _( "Display Options" ) ); book->AddSubPage( new PANEL_GAL_DISPLAY_OPTIONS( this, aParent ), _( "Display Options" ) );
book->AddSubPage( new PANEL_LIBEDIT_SETTINGS( this, book ), _( "Editing Options" ) ); book->AddSubPage( new PANEL_SYM_EDITING_OPTIONS( this, book ), _( "Editing Options" ) );
book->AddSubPage( new PANEL_LIBEDIT_COLOR_SETTINGS( this, book ), _( "Colors" ) ); book->AddSubPage( new PANEL_SYM_COLOR_SETTINGS( this, book ), _( "Colors" ) );
aHotkeysPanel->AddHotKeys( GetToolManager() ); aHotkeysPanel->AddHotKeys( GetToolManager() );
} }