Commit 4e48640f authored by charras's avatar charras
Browse files

Fixing vertical size of the design rules dialog to meet our minimal screen... 

Fixing vertical size of the design rules dialog to meet our minimal screen size requirement (768 pixels height)
parent ac826545

common/build_version.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
#define KICAD_BUILD_VERSION "(2010-02-09)"

#define KICAD_BUILD_VERSION "(2010-02-09)"

#endif

#endif





#define VERSION_STABILITY "RC1"

#define VERSION_STABILITY "RC2"





/** Function GetBuildVersion()

/** Function GetBuildVersion()

 * Return the build date and version

 * Return the build date and version

pcbnew/dialog_design_rules_base.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID 
	

	

	buttonBoxSizer->Add( m_moveUpButton, 0, wxRIGHT|wxLEFT, 5 );

	buttonBoxSizer->Add( m_moveUpButton, 0, wxRIGHT|wxLEFT, 5 );

	

	

	sbSizer1->Add( buttonBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );

	sbSizer1->Add( buttonBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );

	

	

	bpanelNetClassesSizer->Add( sbSizer1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	bpanelNetClassesSizer->Add( sbSizer1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -101,11 +101,11 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID 
	leftNetSelectBoxSizer->Add( m_leftClassChoice, 0, wxEXPAND, 5 );

	leftNetSelectBoxSizer->Add( m_leftClassChoice, 0, wxEXPAND, 5 );

	

	

	m_leftListCtrl = new wxListCtrl( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES|wxSUNKEN_BORDER );

	m_leftListCtrl = new wxListCtrl( m_panelNetClassesEditor, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES|wxSUNKEN_BORDER );

	m_leftListCtrl->SetMinSize( wxSize( 220,300 ) );

	m_leftListCtrl->SetMinSize( wxSize( 220,200 ) );

	

	

	leftNetSelectBoxSizer->Add( m_leftListCtrl, 1, wxEXPAND|wxTOP, 5 );

	leftNetSelectBoxSizer->Add( m_leftListCtrl, 1, wxEXPAND|wxTOP, 5 );

	

	

	sbSizer4->Add( leftNetSelectBoxSizer, 1, wxALL|wxEXPAND, 5 );

	sbSizer4->Add( leftNetSelectBoxSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	

	wxBoxSizer* bmiddleSizerNetSelect;

	wxBoxSizer* bmiddleSizerNetSelect;

	bmiddleSizerNetSelect = new wxBoxSizer( wxVERTICAL );

	bmiddleSizerNetSelect = new wxBoxSizer( wxVERTICAL );
@@ -145,9 +145,9 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID 
	

	

	rghtNetSelectBoxSizer->Add( m_rightListCtrl, 1, wxEXPAND|wxTOP, 5 );

	rghtNetSelectBoxSizer->Add( m_rightListCtrl, 1, wxEXPAND|wxTOP, 5 );

	

	

	sbSizer4->Add( rghtNetSelectBoxSizer, 1, wxALL|wxEXPAND, 5 );

	sbSizer4->Add( rghtNetSelectBoxSizer, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	

	bpanelNetClassesSizer->Add( sbSizer4, 2, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bpanelNetClassesSizer->Add( sbSizer4, 2, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	

	m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer );

	m_panelNetClassesEditor->SetSizer( bpanelNetClassesSizer );

	m_panelNetClassesEditor->Layout();

	m_panelNetClassesEditor->Layout();
@@ -358,7 +358,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID 
	bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules );

	bpanelGlobRulesSizer->Fit( m_panelGolbalDesignRules );

	m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false );

	m_DRnotebook->AddPage( m_panelGolbalDesignRules, _("Global Design Rules"), false );

	

	

	bMainSizer->Add( m_DRnotebook, 1, wxEXPAND | wxALL, 5 );

	bMainSizer->Add( m_DRnotebook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	

	

	wxStaticBoxSizer* sbSizer2;

	wxStaticBoxSizer* sbSizer2;

	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxHORIZONTAL );

	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxHORIZONTAL );
@@ -368,7 +368,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID 
	

	

	sbSizer2->Add( m_MessagesList, 1, wxEXPAND, 5 );

	sbSizer2->Add( m_MessagesList, 1, wxEXPAND, 5 );

	

	

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

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

	

	

	m_sdbButtonsSizer = new wxStdDialogButtonSizer();

	m_sdbButtonsSizer = new wxStdDialogButtonSizer();

	m_sdbButtonsSizerOK = new wxButton( this, wxID_OK );

	m_sdbButtonsSizerOK = new wxButton( this, wxID_OK );
@@ -376,7 +376,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID 
	m_sdbButtonsSizerCancel = new wxButton( this, wxID_CANCEL );

	m_sdbButtonsSizerCancel = new wxButton( this, wxID_CANCEL );

	m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerCancel );

	m_sdbButtonsSizer->AddButton( m_sdbButtonsSizerCancel );

	m_sdbButtonsSizer->Realize();

	m_sdbButtonsSizer->Realize();

	bMainSizer->Add( m_sdbButtonsSizer, 0, wxALL|wxALIGN_RIGHT, 5 );

	bMainSizer->Add( m_sdbButtonsSizer, 0, wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );

	

	

	this->SetSizer( bMainSizer );

	this->SetSizer( bMainSizer );

	this->Layout();

	this->Layout();

pcbnew/dialog_design_rules_base.fbp

+8 −8
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ 
                <property name="permission">none</property>

                <property name="permission">none</property>

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

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

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

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

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

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

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

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

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

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

                        <property name="bg"></property>

                        <property name="bg"></property>
@@ -301,7 +301,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_CENTER_HORIZONTAL|wxALL</property>

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

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

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

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

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

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

                                                    <property name="minimum_size"></property>
@@ -470,7 +470,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">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>

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

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

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

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

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

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

                                            <property name="id">wxID_ANY</property>
@@ -482,7 +482,7 @@ 
                                            <event name="OnUpdateUI"></event>

                                            <event name="OnUpdateUI"></event>

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

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

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

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

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

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

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

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

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

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

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

                                                    <property name="minimum_size"></property>
@@ -553,7 +553,7 @@ 
                                                            <property name="hidden">0</property>

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

                                                            <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">220,300</property>

                                                            <property name="minimum_size">220,200</property>

                                                            <property name="name">m_leftListCtrl</property>

                                                            <property name="name">m_leftListCtrl</property>

                                                            <property name="permission">protected</property>

                                                            <property name="permission">protected</property>

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

                                                            <property name="pos"></property>
@@ -832,7 +832,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">wxALL|wxEXPAND</property>

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

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

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

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

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

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

                                                    <property name="minimum_size"></property>
@@ -2232,7 +2232,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">wxALL|wxEXPAND</property>

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

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

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

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

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

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

                        <property name="id">wxID_ANY</property>
@@ -2298,7 +2298,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">wxALL|wxALIGN_RIGHT</property>

                    <property name="flag">wxALIGN_RIGHT|wxRIGHT|wxLEFT</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>

version.txt

+1 −1
Original line number Original line Diff line number Diff line 
release version:

release version:

2010 feb 09 

2010 feb 09 

files (.zip,.tgz):

files (.zip,.tgz):

kicad-2010-02-09-RC1
 
kicad-2010-02-09-RC2