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

Change the migrate settings path box to proportion rather than fixed min width

This commit is contained in:
Marek Roszko 2024-01-22 22:03:42 -05:00
parent d47a000564
commit 5f063dd458
4 changed files with 654 additions and 646 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/dialogs/dialog_migrate_settings.cpp
View File

@ -29,6 +29,7 @@
DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) : DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) :
DIALOG_MIGRATE_SETTINGS_BASE( nullptr ), m_manager( aManager ) DIALOG_MIGRATE_SETTINGS_BASE( nullptr ), m_manager( aManager )
{ {
SetMinSize( FromDIP( GetMinSize() ) );
m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) ); m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) );
m_btnCustomPath->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) ); m_btnCustomPath->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) );
@ -60,7 +61,7 @@ bool DIALOG_MIGRATE_SETTINGS::TransferDataToWindow()
std::vector<wxString> paths; std::vector<wxString> paths;
m_btnUseDefaults->SetValue( true ); m_btnUseDefaults->SetValue( true );
if( !m_manager->GetPreviousVersionPaths( &paths ) ) if( !m_manager->GetPreviousVersionPaths( &paths ) )
{ {
m_btnPrevVer->SetLabelText( _( "Import settings from a previous version (none found)" ) ); m_btnPrevVer->SetLabelText( _( "Import settings from a previous version (none found)" ) );
@ -104,7 +105,7 @@ bool DIALOG_MIGRATE_SETTINGS::TransferDataFromWindow()
m_manager->SetMigrationSource( wxEmptyString ); m_manager->SetMigrationSource( wxEmptyString );
} }
return true; return true;
} }

8
common/dialogs/dialog_migrate_settings_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -13,7 +13,7 @@
DIALOG_MIGRATE_SETTINGS_BASE::DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) DIALOG_MIGRATE_SETTINGS_BASE::DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxSize( 480,-1 ), wxDefaultSize );
m_sizer = new wxBoxSizer( wxVERTICAL ); m_sizer = new wxBoxSizer( wxVERTICAL );
@ -43,9 +43,7 @@ DIALOG_MIGRATE_SETTINGS_BASE::DIALOG_MIGRATE_SETTINGS_BASE( wxWindow* parent, wx
bSizer5->Add( 20, 0, 0, wxEXPAND, 5 ); bSizer5->Add( 20, 0, 0, wxEXPAND, 5 );
m_cbPath = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); m_cbPath = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
m_cbPath->SetMinSize( wxSize( 480,-1 ) ); bSizer5->Add( m_cbPath, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
bSizer5->Add( m_cbPath, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_btnCustomPath = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnCustomPath = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_btnCustomPath->SetToolTip( _("Choose a different path") ); m_btnCustomPath->SetToolTip( _("Choose a different path") );

1285
common/dialogs/dialog_migrate_settings_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
common/dialogs/dialog_migrate_settings_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!