Commit 2d008c79 authored by Mark Roszko's avatar Mark Roszko Committed by Wayne Stambaugh
Browse files

More module to footprint UI fixes.

parent 716613b7

pcbnew/dialogs/dialog_block_options_base.cpp

+3 −3
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// C++ code generated with wxFormBuilder (version Jun  6 2014)

// http://www.wxformbuilder.org/

// http://www.wxformbuilder.org/

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -22,14 +22,14 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow 
	wxGridSizer* gSizer1;

	wxGridSizer* gSizer1;

	gSizer1 = new wxGridSizer( 4, 2, 0, 0 );

	gSizer1 = new wxGridSizer( 4, 2, 0, 0 );

	

	

	m_Include_Modules = new wxCheckBox( this, wxID_ANY, _("Include modules"), wxDefaultPosition, wxDefaultSize, 0 );

	m_Include_Modules = new wxCheckBox( this, wxID_ANY, _("Include footprints"), wxDefaultPosition, wxDefaultSize, 0 );

	gSizer1->Add( m_Include_Modules, 0, wxALL, 5 );

	gSizer1->Add( m_Include_Modules, 0, wxALL, 5 );

	

	

	m_Include_PcbTextes = new wxCheckBox( this, wxID_ANY, _("Include text items"), wxDefaultPosition, wxDefaultSize, 0 );

	m_Include_PcbTextes = new wxCheckBox( this, wxID_ANY, _("Include text items"), wxDefaultPosition, wxDefaultSize, 0 );

	m_Include_PcbTextes->SetValue(true); 

	m_Include_PcbTextes->SetValue(true); 

	gSizer1->Add( m_Include_PcbTextes, 0, wxALL, 5 );

	gSizer1->Add( m_Include_PcbTextes, 0, wxALL, 5 );

	

	

	m_IncludeLockedModules = new wxCheckBox( this, wxID_ANY, _("Include locked modules"), wxDefaultPosition, wxDefaultSize, 0 );

	m_IncludeLockedModules = new wxCheckBox( this, wxID_ANY, _("Include locked footprints"), wxDefaultPosition, wxDefaultSize, 0 );

	gSizer1->Add( m_IncludeLockedModules, 0, wxALL, 5 );

	gSizer1->Add( m_IncludeLockedModules, 0, wxALL, 5 );

	

	

	m_Include_Draw_Items = new wxCheckBox( this, wxID_ANY, _("Include drawings"), wxDefaultPosition, wxDefaultSize, 0 );

	m_Include_Draw_Items = new wxCheckBox( this, wxID_ANY, _("Include drawings"), wxDefaultPosition, wxDefaultSize, 0 );

pcbnew/dialogs/dialog_block_options_base.fbp

+6 −4
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="11" />

    <FileVersion major="1" minor="13" />

    <object class="Project" expanded="1">

    <object class="Project" expanded="1">

        <property name="class_decoration"></property>

        <property name="class_decoration"></property>

        <property name="code_generation">C++</property>

        <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@ 
        <property name="path">.</property>

        <property name="path">.</property>

        <property name="precompiled_header"></property>

        <property name="precompiled_header"></property>

        <property name="relative_path">1</property>

        <property name="relative_path">1</property>

        <property name="skip_lua_events">1</property>

        <property name="skip_php_events">1</property>

        <property name="skip_php_events">1</property>

        <property name="skip_python_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_enum">0</property>

        <property name="use_microsoft_bom">0</property>

        <property name="use_microsoft_bom">0</property>

        <object class="Dialog" expanded="1">

        <object class="Dialog" expanded="1">
@@ -42,7 +44,7 @@ 
            <property name="minimum_size"></property>

            <property name="minimum_size"></property>

            <property name="name">DIALOG_BLOCK_OPTIONS_BASE</property>

            <property name="name">DIALOG_BLOCK_OPTIONS_BASE</property>

            <property name="pos"></property>

            <property name="pos"></property>

            <property name="size">397,226</property>

            <property name="size">500,226</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

            <property name="title"></property>

            <property name="title"></property>
@@ -148,7 +150,7 @@ 
                                        <property name="gripper">0</property>

                                        <property name="gripper">0</property>

                                        <property name="hidden">0</property>

                                        <property name="hidden">0</property>

                                        <property name="id">wxID_ANY</property>

                                        <property name="id">wxID_ANY</property>

                                        <property name="label">Include modules</property>

                                        <property name="label">Include footprints</property>

                                        <property name="max_size"></property>

                                        <property name="max_size"></property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximum_size"></property>

                                        <property name="maximum_size"></property>
@@ -324,7 +326,7 @@ 
                                        <property name="gripper">0</property>

                                        <property name="gripper">0</property>

                                        <property name="hidden">0</property>

                                        <property name="hidden">0</property>

                                        <property name="id">wxID_ANY</property>

                                        <property name="id">wxID_ANY</property>

                                        <property name="label">Include locked modules</property>

                                        <property name="label">Include locked footprints</property>

                                        <property name="max_size"></property>

                                        <property name="max_size"></property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximum_size"></property>

                                        <property name="maximum_size"></property>

pcbnew/dialogs/dialog_block_options_base.h

+4 −2
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// C++ code generated with wxFormBuilder (version Jun  6 2014)

// http://www.wxformbuilder.org/

// http://www.wxformbuilder.org/

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -11,6 +11,8 @@ 
#include <wx/artprov.h>

#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

#include <wx/intl.h>

class DIALOG_SHIM;



#include "dialog_shim.h"

#include "dialog_shim.h"

#include <wx/string.h>

#include <wx/string.h>

#include <wx/checkbox.h>

#include <wx/checkbox.h>
@@ -57,7 +59,7 @@ class DIALOG_BLOCK_OPTIONS_BASE : public DIALOG_SHIM 
	

	

	public:

	public:

		

		

		DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 397,226 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,226 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_BLOCK_OPTIONS_BASE();

		~DIALOG_BLOCK_OPTIONS_BASE();

	

	

};

};

pcbnew/dialogs/dialog_display_options_base.cpp

+3 −3
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 10 2012)

// C++ code generated with wxFormBuilder (version Jun  6 2014)

// http://www.wxformbuilder.org/

// http://www.wxformbuilder.org/

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -74,7 +74,7 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi 
	

	

	wxString m_OptDisplayModEdgesChoices[] = { _("Line"), _("Filled"), _("Sketch") };

	wxString m_OptDisplayModEdgesChoices[] = { _("Line"), _("Filled"), _("Sketch") };

	int m_OptDisplayModEdgesNChoices = sizeof( m_OptDisplayModEdgesChoices ) / sizeof( wxString );

	int m_OptDisplayModEdgesNChoices = sizeof( m_OptDisplayModEdgesChoices ) / sizeof( wxString );

	m_OptDisplayModEdges = new wxRadioBox( this, ID_EDGES_MODULES, _("Module Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesNChoices, m_OptDisplayModEdgesChoices, 1, wxRA_SPECIFY_COLS );

	m_OptDisplayModEdges = new wxRadioBox( this, ID_EDGES_MODULES, _("Footprint Edges:"), wxDefaultPosition, wxDefaultSize, m_OptDisplayModEdgesNChoices, m_OptDisplayModEdgesChoices, 1, wxRA_SPECIFY_COLS );

	m_OptDisplayModEdges->SetSelection( 1 );

	m_OptDisplayModEdges->SetSelection( 1 );

	bLModuleSizer->Add( m_OptDisplayModEdges, 0, wxALL|wxEXPAND, 5 );

	bLModuleSizer->Add( m_OptDisplayModEdges, 0, wxALL|wxEXPAND, 5 );
@@ -128,7 +128,7 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi 
	wxString m_Show_Page_LimitsChoices[] = { _("Yes"), _("No") };

	wxString m_Show_Page_LimitsChoices[] = { _("Yes"), _("No") };

	int m_Show_Page_LimitsNChoices = sizeof( m_Show_Page_LimitsChoices ) / sizeof( wxString );

	int m_Show_Page_LimitsNChoices = sizeof( m_Show_Page_LimitsChoices ) / sizeof( wxString );

	m_Show_Page_Limits = new wxRadioBox( this, wxID_ANY, _("Show page limits"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsNChoices, m_Show_Page_LimitsChoices, 1, wxRA_SPECIFY_COLS );

	m_Show_Page_Limits = new wxRadioBox( this, wxID_ANY, _("Show page limits"), wxDefaultPosition, wxDefaultSize, m_Show_Page_LimitsNChoices, m_Show_Page_LimitsChoices, 1, wxRA_SPECIFY_COLS );

	m_Show_Page_Limits->SetSelection( 0 );

	m_Show_Page_Limits->SetSelection( 1 );

	sRightUpperSizer->Add( m_Show_Page_Limits, 0, wxALL|wxEXPAND, 5 );

	sRightUpperSizer->Add( m_Show_Page_Limits, 0, wxALL|wxEXPAND, 5 );

pcbnew/dialogs/dialog_display_options_base.fbp

+6 −4
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="11" />

    <FileVersion major="1" minor="13" />

    <object class="Project" expanded="1">

    <object class="Project" expanded="1">

        <property name="class_decoration"></property>

        <property name="class_decoration"></property>

        <property name="code_generation">C++</property>

        <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@ 
        <property name="path">.</property>

        <property name="path">.</property>

        <property name="precompiled_header"></property>

        <property name="precompiled_header"></property>

        <property name="relative_path">1</property>

        <property name="relative_path">1</property>

        <property name="skip_lua_events">1</property>

        <property name="skip_php_events">1</property>

        <property name="skip_php_events">1</property>

        <property name="skip_python_events">1</property>

        <property name="skip_python_events">1</property>

        <property name="ui_table">UI</property>

        <property name="use_enum">1</property>

        <property name="use_enum">1</property>

        <property name="use_microsoft_bom">0</property>

        <property name="use_microsoft_bom">0</property>

        <object class="Dialog" expanded="1">

        <object class="Dialog" expanded="1">
@@ -42,7 +44,7 @@ 
            <property name="minimum_size"></property>

            <property name="minimum_size"></property>

            <property name="name">DIALOG_DISPLAY_OPTIONS_BASE</property>

            <property name="name">DIALOG_DISPLAY_OPTIONS_BASE</property>

            <property name="pos"></property>

            <property name="pos"></property>

            <property name="size">731,291</property>

            <property name="size">880,320</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

            <property name="title">Display options</property>

            <property name="title">Display options</property>
@@ -623,7 +625,7 @@ 
                                        <property name="gripper">0</property>

                                        <property name="gripper">0</property>

                                        <property name="hidden">0</property>

                                        <property name="hidden">0</property>

                                        <property name="id">ID_EDGES_MODULES</property>

                                        <property name="id">ID_EDGES_MODULES</property>

                                        <property name="label">Module Edges:</property>

                                        <property name="label">Footprint Edges:</property>

                                        <property name="majorDimension">1</property>

                                        <property name="majorDimension">1</property>

                                        <property name="max_size"></property>

                                        <property name="max_size"></property>

                                        <property name="maximize_button">0</property>

                                        <property name="maximize_button">0</property>
@@ -1303,7 +1305,7 @@ 
                                        <property name="pin_button">1</property>

                                        <property name="pin_button">1</property>

                                        <property name="pos"></property>

                                        <property name="pos"></property>

                                        <property name="resize">Resizable</property>

                                        <property name="resize">Resizable</property>

                                        <property name="selection">0</property>

                                        <property name="selection">1</property>

                                        <property name="show">1</property>

                                        <property name="show">1</property>

                                        <property name="size"></property>

                                        <property name="size"></property>

                                        <property name="style">wxRA_SPECIFY_COLS</property>

                                        <property name="style">wxRA_SPECIFY_COLS</property>