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

Avoid fixed min or max size of widgets in dialog

This commit is contained in:
jean-pierre charras 2018-01-26 16:21:00 +01:00
parent b547c5cdf0
commit 06dddb50e6
3 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/dialogs/dialog_exchange_modules_base.cpp
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "wx_html_report_panel.h"
@ -71,13 +71,10 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi
m_specifiedRefSizer->Add( m_matchSpecifiedRef, 0, wxALL, 2 );
m_specifiedRef = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_specifiedRef->SetMinSize( wxSize( -1,24 ) );
m_specifiedRef->SetMaxSize( wxSize( 80,-1 ) );
m_specifiedRefSizer->Add( m_specifiedRef, 0, wxALL, 3 );
m_specifiedRefSizer->Add( m_specifiedRef, 1, wxALL, 3 );
bUpperSizer->Add( m_specifiedRefSizer, 29, wxEXPAND, 5 );
bUpperSizer->Add( m_specifiedRefSizer, 0, wxEXPAND, 5 );
m_currentValueSizer = new wxBoxSizer( wxHORIZONTAL );
@ -97,9 +94,7 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi
m_specifiedValueSizer->Add( m_matchSpecifiedValue, 0, wxALL, 2 );
m_specifiedValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_specifiedValue->SetMinSize( wxSize( 160,24 ) );
m_specifiedValueSizer->Add( m_specifiedValue, 0, wxALL, 3 );
m_specifiedValueSizer->Add( m_specifiedValue, 1, wxALL, 3 );
bUpperSizer->Add( m_specifiedValueSizer, 31, wxEXPAND, 5 );
@ -113,12 +108,10 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi
specifiedIDSizer = new wxBoxSizer( wxHORIZONTAL );
m_specifiedID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_specifiedID->SetMinSize( wxSize( 500,24 ) );
specifiedIDSizer->Add( m_specifiedID, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
m_specifiedIDBrowseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
specifiedIDSizer->Add( m_specifiedIDBrowseButton, 0, wxALL, 0 );
specifiedIDSizer->Add( m_specifiedIDBrowseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
m_specifiedIDSizer->Add( specifiedIDSizer, 0, wxALIGN_TOP|wxEXPAND, 0 );
@ -144,12 +137,10 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi
newIDSizer = new wxBoxSizer( wxHORIZONTAL );
m_newID = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_newID->SetMinSize( wxSize( 500,24 ) );
newIDSizer->Add( m_newID, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
m_newIDBrowseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
newIDSizer->Add( m_newIDBrowseButton, 0, wxALL, 0 );
newIDSizer->Add( m_newIDBrowseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
m_middleSizer->Add( newIDSizer, 0, wxEXPAND, 0 );
@ -195,7 +186,6 @@ DIALOG_EXCHANGE_MODULE_BASE::DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWi
this->SetSizer( mainSizer );
this->Layout();
mainSizer->Fit( this );
// Connect Events
m_matchAll->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( DIALOG_EXCHANGE_MODULE_BASE::OnMatchAllClicked ), NULL, this );

24
pcbnew/dialogs/dialog_exchange_modules_base.fbp
View File

@ -44,10 +44,10 @@
<property name="minimum_size"></property>
<property name="name">DIALOG_EXCHANGE_MODULE_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="size">550,523</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">%s</property>
<property name="title">dummy</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
@ -646,7 +646,7 @@
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">29</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">m_specifiedRefSizer</property>
@ -743,7 +743,7 @@
<object class="sizeritem" expanded="0">
<property name="border">3</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
@ -774,11 +774,11 @@
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size">80,-1</property>
<property name="maximum_size">-1,-1</property>
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">-1,24</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_specifiedRef</property>
<property name="pane_border">1</property>
@ -1032,7 +1032,7 @@
<object class="sizeritem" expanded="0">
<property name="border">3</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
@ -1067,7 +1067,7 @@
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">160,24</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_specifiedValue</property>
<property name="pane_border">1</property>
@ -1266,7 +1266,7 @@
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">500,24</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_specifiedID</property>
<property name="pane_border">1</property>
@ -1321,7 +1321,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">0</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxBitmapButton" expanded="0">
<property name="BottomDockable">1</property>
@ -1638,7 +1638,7 @@
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">500,24</property>
<property name="minimum_size">-1,-1</property>
<property name="moveable">1</property>
<property name="name">m_newID</property>
<property name="pane_border">1</property>
@ -1693,7 +1693,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxBitmapButton" expanded="1">
<property name="BottomDockable">1</property>

7
pcbnew/dialogs/dialog_exchange_modules_base.h
View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// C++ code generated with wxFormBuilder (version Aug 4 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_EXCHANGE_MODULES_BASE_H__
@ -11,6 +11,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class DIALOG_SHIM;
class WX_HTML_REPORT_PANEL;
#include "dialog_shim.h"
@ -89,7 +90,7 @@ class DIALOG_EXCHANGE_MODULE_BASE : public DIALOG_SHIM
public:
DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
DIALOG_EXCHANGE_MODULE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,523 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_EXCHANGE_MODULE_BASE();
};