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

Rename old DIALOG_BLOCK_OPTIONS to DIALOG_FILTER_SELECTION.... 

... which is what it has done for some time now.
This commit is contained in:
Jeff Young 2020-01-12 20:30:58 +00:00
parent 3a1585718f
commit 127c66285b
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/CMakeLists.txt
View File

@ -50,8 +50,8 @@ include_directories(
) )
set( PCBNEW_DIALOGS set( PCBNEW_DIALOGS
dialogs/dialog_block_options.cpp dialogs/dialog_filter_selection.cpp
dialogs/dialog_block_options_base.cpp dialogs/dialog_filter_selection_base.cpp
dialogs/dialog_board_setup.cpp dialogs/dialog_board_setup.cpp
dialogs/dialog_board_statistics.cpp dialogs/dialog_board_statistics.cpp
dialogs/dialog_board_statistics_base.cpp dialogs/dialog_board_statistics_base.cpp

12
pcbnew/dialogs/dialog_block_options.cpp → pcbnew/dialogs/dialog_filter_selection.cpp
View File

@ -22,14 +22,14 @@
*/ */
#include <dialog_block_options.h> #include <dialog_filter_selection.h>
#include <pcb_edit_frame.h> #include <pcb_edit_frame.h>
DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent, DIALOG_FILTER_SELECTION::DIALOG_FILTER_SELECTION( PCB_BASE_FRAME* aParent,
OPTIONS& aOptions, bool aShowLegacyOptions, OPTIONS& aOptions, bool aShowLegacyOptions,
const wxString& aTitle ) : const wxString& aTitle ) :
DIALOG_BLOCK_OPTIONS_BASE( aParent, -1, aTitle ), DIALOG_BLOCK_OPTIONS_BASE( aParent, -1, aTitle ),
m_options( aOptions ) m_options( aOptions )
{ {
@ -64,7 +64,7 @@ DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
} }
void DIALOG_BLOCK_OPTIONS::checkBoxClicked( wxCommandEvent& aEvent ) void DIALOG_FILTER_SELECTION::checkBoxClicked( wxCommandEvent& aEvent )
{ {
if( m_Include_Modules->GetValue() ) if( m_Include_Modules->GetValue() )
m_IncludeLockedModules->Enable(); m_IncludeLockedModules->Enable();
@ -73,7 +73,7 @@ void DIALOG_BLOCK_OPTIONS::checkBoxClicked( wxCommandEvent& aEvent )
} }
void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event ) void DIALOG_FILTER_SELECTION::ExecuteCommand( wxCommandEvent& event )
{ {
m_options.includeModules = m_Include_Modules->GetValue(); m_options.includeModules = m_Include_Modules->GetValue();
m_options.includeLockedModules = m_IncludeLockedModules->GetValue(); m_options.includeLockedModules = m_IncludeLockedModules->GetValue();

16
pcbnew/dialogs/dialog_block_options.h → pcbnew/dialogs/dialog_filter_selection.h
View File

@ -21,14 +21,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef DIALOG_BLOCK_OPTIONS_H_ #ifndef DIALOG_FILTER_SELECTION_H
#define DIALOG_BLOCK_OPTIONS_H_ #define DIALOG_FILTER_SELECTION_H
#include <dialogs/dialog_block_options_base.h> #include <dialogs/dialog_filter_selection_base.h>
class PCB_BASE_FRAME; class PCB_BASE_FRAME;
class DIALOG_BLOCK_OPTIONS : public DIALOG_BLOCK_OPTIONS_BASE class DIALOG_FILTER_SELECTION : public DIALOG_BLOCK_OPTIONS_BASE
{ {
public: public:
@ -50,11 +50,11 @@ public:
bool includeItemsOnInvisibleLayers = false; bool includeItemsOnInvisibleLayers = false;
}; };
DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent, OPTIONS& aOptions, DIALOG_FILTER_SELECTION( PCB_BASE_FRAME* aParent, OPTIONS& aOptions,
bool aShowLegacyOptions, bool aShowLegacyOptions,
const wxString& aTitle ); const wxString& aTitle );
~DIALOG_BLOCK_OPTIONS() ~DIALOG_FILTER_SELECTION()
{ {
} }

2
pcbnew/dialogs/dialog_block_options_base.cpp → pcbnew/dialogs/dialog_filter_selection_base.cpp
View File

@ -5,7 +5,7 @@
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_block_options_base.h" #include "dialog_filter_selection_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////

6
pcbnew/dialogs/dialog_block_options_base.fbp → pcbnew/dialogs/dialog_filter_selection_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">connect</property> <property name="event_generation">connect</property>
<property name="file">dialog_block_options_base</property> <property name="file">dialog_filter_selection_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">dialog_block_options_base</property> <property name="name">dialog_filter_selection_base</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>
@ -43,7 +43,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">DIALOG_BLOCK_OPTIONS_BASE</property> <property name="name">DIALOG_FILTER_SELECTION_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

0
pcbnew/dialogs/dialog_block_options_base.h → pcbnew/dialogs/dialog_filter_selection_base.h
View File

10
pcbnew/tools/selection_tool.cpp
View File

@ -36,7 +36,7 @@ using namespace std::placeholders;
#include <collectors.h> #include <collectors.h>
#include <confirm.h> #include <confirm.h>
#include <dialog_find.h> #include <dialog_find.h>
#include <dialog_block_options.h> #include <dialog_filter_selection.h>
#include <class_draw_panel_gal.h> #include <class_draw_panel_gal.h>
#include <view/view_controls.h> #include <view/view_controls.h>
#include <preview_items/selection_area.h> #include <preview_items/selection_area.h>
@ -103,7 +103,7 @@ private:
class SELECTION_TOOL::PRIV class SELECTION_TOOL::PRIV
{ {
public: public:
DIALOG_BLOCK_OPTIONS::OPTIONS m_filterOpts; DIALOG_FILTER_SELECTION::OPTIONS m_filterOpts;
}; };
@ -1179,7 +1179,7 @@ int SELECTION_TOOL::find( const TOOL_EVENT& aEvent )
*/ */
static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem, static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem,
const BOARD& aBoard, const BOARD& aBoard,
const DIALOG_BLOCK_OPTIONS::OPTIONS& aBlockOpts ) const DIALOG_FILTER_SELECTION::OPTIONS& aBlockOpts )
{ {
bool include = true; bool include = true;
const PCB_LAYER_ID layer = aItem.GetLayer(); const PCB_LAYER_ID layer = aItem.GetLayer();
@ -1255,8 +1255,8 @@ static bool itemIsIncludedByFilter( const BOARD_ITEM& aItem,
int SELECTION_TOOL::filterSelection( const TOOL_EVENT& aEvent ) int SELECTION_TOOL::filterSelection( const TOOL_EVENT& aEvent )
{ {
const BOARD& board = *getModel<BOARD>(); const BOARD& board = *getModel<BOARD>();
DIALOG_BLOCK_OPTIONS::OPTIONS& opts = m_priv->m_filterOpts; DIALOG_FILTER_SELECTION::OPTIONS& opts = m_priv->m_filterOpts;
DIALOG_BLOCK_OPTIONS dlg( m_frame, opts, false, _( "Filter selection" ) ); DIALOG_FILTER_SELECTION dlg( m_frame, opts, false, _( "Filter selection" ) );
const int cmd = dlg.ShowModal(); const int cmd = dlg.ShowModal();

12
qa/qa_utils/mocks.cpp
View File

@ -43,7 +43,7 @@
#include <tools/pcb_actions.h> #include <tools/pcb_actions.h>
#include <router/router_tool.h> #include <router/router_tool.h>
#include <dialog_find.h> #include <dialog_find.h>
#include <dialog_block_options.h> #include <dialog_filter_selection.h>
static struct IFACE : public KIFACE_I static struct IFACE : public KIFACE_I
@ -235,9 +235,9 @@ DIALOG_BLOCK_OPTIONS_BASE::~DIALOG_BLOCK_OPTIONS_BASE()
} }
DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent, DIALOG_FILTER_SELECTION::DIALOG_FILTER_SELECTION( PCB_BASE_FRAME* aParent,
OPTIONS& aOptions, bool aShowLegacyOptions, OPTIONS& aOptions, bool aShowLegacyOptions,
const wxString& aTitle ) : const wxString& aTitle ) :
DIALOG_BLOCK_OPTIONS_BASE( aParent, -1, aTitle ), DIALOG_BLOCK_OPTIONS_BASE( aParent, -1, aTitle ),
m_options( aOptions ) m_options( aOptions )
{ {
@ -247,12 +247,12 @@ DIALOG_BLOCK_OPTIONS::DIALOG_BLOCK_OPTIONS( PCB_BASE_FRAME* aParent,
} }
void DIALOG_BLOCK_OPTIONS::checkBoxClicked( wxCommandEvent& aEvent ) void DIALOG_FILTER_SELECTION::checkBoxClicked( wxCommandEvent& aEvent )
{ {
} }
void DIALOG_BLOCK_OPTIONS::ExecuteCommand( wxCommandEvent& event ) void DIALOG_FILTER_SELECTION::ExecuteCommand( wxCommandEvent& event )
{ {
} }