Commit 53f33d39 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Pcbnew: minor target properties dialog improvements. 

* Make spacing between controls and dialog frame consistent.
* Use default size to allow wxWigdets to determine optimal dialog size.
* Set OK button as default so return key works properly.
parent f472b6de

pcbnew/dialogs/dialog_target_properties_base.cpp

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

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

// C++ code generated with wxFormBuilder (version Nov  6 2013)

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

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

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

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -76,11 +76,12 @@ TARGET_PROPERTIES_DIALOG_EDITOR_BASE::TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWi 
	m_sdbSizerButts->AddButton( m_sdbSizerButtsCancel );

	m_sdbSizerButts->AddButton( m_sdbSizerButtsCancel );

	m_sdbSizerButts->Realize();

	m_sdbSizerButts->Realize();

	

	

	bSizerMain->Add( m_sdbSizerButts, 0, wxALIGN_RIGHT|wxEXPAND, 5 );

	bSizerMain->Add( m_sdbSizerButts, 0, wxALIGN_RIGHT|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

	

	

	

	

	this->SetSizer( bSizerMain );

	this->SetSizer( bSizerMain );

	this->Layout();

	this->Layout();

	bSizerMain->Fit( this );

	

	

	this->Centre( wxBOTH );

	this->Centre( wxBOTH );

pcbnew/dialogs/dialog_target_properties_base.fbp

+2 −4
Original line number Original line Diff line number Diff line
@@ -20,10 +20,8 @@ 
        <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">
@@ -44,7 +42,7 @@ 
            <property name="minimum_size"></property>

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

            <property name="name">TARGET_PROPERTIES_DIALOG_EDITOR_BASE</property>

            <property name="name">TARGET_PROPERTIES_DIALOG_EDITOR_BASE</property>

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

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

            <property name="size">285,170</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>

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

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

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

            <property name="title">Target Properties</property>
@@ -900,7 +898,7 @@ 
                </object>

                </object>

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

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

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

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

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

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

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

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

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

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

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

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

pcbnew/dialogs/dialog_target_properties_base.h

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

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

// C++ code generated with wxFormBuilder (version Nov  6 2013)

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

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

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

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -57,7 +57,7 @@ class TARGET_PROPERTIES_DIALOG_EDITOR_BASE : public DIALOG_SHIM 
	

	

	public:

	public:

		

		

		TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Target Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 285,170 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		TARGET_PROPERTIES_DIALOG_EDITOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Target Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~TARGET_PROPERTIES_DIALOG_EDITOR_BASE();

		~TARGET_PROPERTIES_DIALOG_EDITOR_BASE();

	

	

};

};

pcbnew/target_edit.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -109,6 +109,9 @@ TARGET_PROPERTIES_DIALOG_EDITOR::TARGET_PROPERTIES_DIALOG_EDITOR( PCB_EDIT_FRAME 
    // Shape

    // Shape

    m_TargetShape->SetSelection( m_Target->GetShape() ? 1 : 0 );

    m_TargetShape->SetSelection( m_Target->GetShape() ? 1 : 0 );





    // OK button on return key.

    SetDefaultItem( m_sdbSizerButtsOK );



    GetSizer()->Fit( this );

    GetSizer()->Fit( this );

    GetSizer()->SetSizeHints( this );

    GetSizer()->SetSizeHints( this );

    Centre();

    Centre();