Commit 8cd77e78 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Minor dialog spacing, grammar, and UI policy fixes.

parent 13972e06

common/dialogs/dialog_list_selector_base.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ EDA_LIST_DIALOG_BASE::EDA_LIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, con 
	m_sdbSizer->AddButton( m_sdbSizerCancel );

	m_sdbSizer->Realize();

	

	bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 );

	bSizerMain->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );

	

	

	this->SetSizer( bSizerMain );

common/dialogs/dialog_list_selector_base.fbp

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ 
                </object>

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

                    <property name="border">5</property>

                    <property name="flag">wxALIGN_RIGHT</property>

                    <property name="flag">wxALL|wxEXPAND</property>

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

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

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

eeschema/dialogs/dialog_build_BOM_base.cpp

+8 −7
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

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

// C++ code generated with wxFormBuilder (version Oct  8 2012)

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -34,10 +34,10 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	m_ListCmpbyValItems = new wxCheckBox( this, wxID_ANY, _("Components by value"), wxDefaultPosition, wxDefaultSize, 0 );

	sbListOptionsSizer->Add( m_ListCmpbyValItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_GenListLabelsbyVal = new wxCheckBox( this, wxID_ANY, _("Hierarchy pins by name"), wxDefaultPosition, wxDefaultSize, 0 );

	m_GenListLabelsbyVal = new wxCheckBox( this, wxID_ANY, _("Hierarchical pins by name"), wxDefaultPosition, wxDefaultSize, 0 );

	sbListOptionsSizer->Add( m_GenListLabelsbyVal, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_GenListLabelsbySheet = new wxCheckBox( this, wxID_ANY, _("Hierarchy pins by sheets"), wxDefaultPosition, wxDefaultSize, 0 );

	m_GenListLabelsbySheet = new wxCheckBox( this, wxID_ANY, _("Hierarchical pins by sheet"), wxDefaultPosition, wxDefaultSize, 0 );

	sbListOptionsSizer->Add( m_GenListLabelsbySheet, 0, wxALL, 5 );
@@ -59,7 +59,7 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	sbOptionsSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 );

	

	

	bSizerUpper->Add( sbOptionsSizer, 10, wxALL|wxEXPAND, 5 );

	bSizerUpper->Add( sbOptionsSizer, 3, wxALL|wxEXPAND, 5 );

	

	wxBoxSizer* bRightSizer;

	bRightSizer = new wxBoxSizer( wxVERTICAL );
@@ -119,13 +119,13 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	bRightSizer->Add( sbAddToListSelectionSizer, 1, wxEXPAND, 5 );

	

	

	bSizerUpper->Add( bRightSizer, 0, wxALL|wxEXPAND, 5 );

	bSizerUpper->Add( bRightSizer, 2, wxALL|wxEXPAND, 5 );

	

	

	bMainSizer->Add( bSizerUpper, 1, wxEXPAND, 5 );

	

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );

	bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	m_sdbSizer = new wxStdDialogButtonSizer();

	m_sdbSizerOK = new wxButton( this, wxID_OK );
@@ -134,11 +134,12 @@ DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id, c 
	m_sdbSizer->AddButton( m_sdbSizerCancel );

	m_sdbSizer->Realize();

	

	bMainSizer->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 );

	bMainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 5 );

	

	

	this->SetSizer( bMainSizer );

	this->Layout();

	bMainSizer->Fit( this );

	

	// Connect Events

	m_OutputFormCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnRadioboxSelectFormatSelected ), NULL, this );

eeschema/dialogs/dialog_build_BOM_base.fbp

+8 −8
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ 
            <property name="minimum_size"></property>

            <property name="name">DIALOG_BUILD_BOM_BASE</property>

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

            <property name="size">424,388</property>

            <property name="size">-1,-1</property>

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

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

            <property name="title">List of Material</property>

            <property name="title">List of Materials</property>

            <property name="tooltip"></property>

            <property name="window_extra_style"></property>

            <property name="window_name"></property>
@@ -103,7 +103,7 @@ 
                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxEXPAND</property>

                            <property name="proportion">10</property>

                            <property name="proportion">3</property>

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

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

                                <property name="label">Options:</property>
@@ -421,7 +421,7 @@ 
                                                <property name="gripper">0</property>

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

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

                                                <property name="label">Hierarchy pins by name</property>

                                                <property name="label">Hierarchical pins by name</property>

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

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

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

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

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

                                                <property name="label">Hierarchy pins by sheets</property>

                                                <property name="label">Hierarchical pins by sheet</property>

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

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

                                                <property name="maximum_size"></property>
@@ -839,7 +839,7 @@ 
                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxEXPAND</property>

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

                            <property name="proportion">2</property>

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

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

                                <property name="name">bRightSizer</property>
@@ -1949,7 +1949,7 @@ 
                </object>

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

                    <property name="border">5</property>

                    <property name="flag">wxEXPAND | wxALL</property>

                    <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>

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

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

                        <property name="BottomDockable">1</property>
@@ -2030,7 +2030,7 @@ 
                </object>

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

                    <property name="border">5</property>

                    <property name="flag">wxALIGN_RIGHT</property>

                    <property name="flag">wxALL|wxEXPAND</property>

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

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

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

eeschema/dialogs/dialog_build_BOM_base.h

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

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

// C++ code generated with wxFormBuilder (version Oct  8 2012)

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

//

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

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

class DIALOG_SHIM;



#include "dialog_shim.h"

#include <wx/string.h>

#include <wx/checkbox.h>
@@ -73,7 +75,7 @@ class DIALOG_BUILD_BOM_BASE : public DIALOG_SHIM 
	

	public:

		

		DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,388 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Materials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_BUILD_BOM_BASE();

	

};