diff --git a/common/dialogs/dialog_migrate_settings.cpp b/common/dialogs/dialog_migrate_settings.cpp index ee174a4218..15effa13c9 100644 --- a/common/dialogs/dialog_migrate_settings.cpp +++ b/common/dialogs/dialog_migrate_settings.cpp @@ -29,6 +29,7 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) : DIALOG_MIGRATE_SETTINGS_BASE( nullptr ), m_manager( aManager ) { + SetMinSize( FromDIP( GetMinSize() ) ); m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) ); m_btnCustomPath->SetBitmap( KiBitmapBundle( BITMAPS::small_folder ) ); @@ -60,7 +61,7 @@ bool DIALOG_MIGRATE_SETTINGS::TransferDataToWindow() std::vector paths; m_btnUseDefaults->SetValue( true ); - + if( !m_manager->GetPreviousVersionPaths( &paths ) ) { m_btnPrevVer->SetLabelText( _( "Import settings from a previous version (none found)" ) ); @@ -104,7 +105,7 @@ bool DIALOG_MIGRATE_SETTINGS::TransferDataFromWindow() m_manager->SetMigrationSource( wxEmptyString ); } - + return true; } diff --git a/common/dialogs/dialog_migrate_settings_base.cpp b/common/dialogs/dialog_migrate_settings_base.cpp index f03b12d8a2..a5893dfcb9 100644 --- a/common/dialogs/dialog_migrate_settings_base.cpp +++ b/common/dialogs/dialog_migrate_settings_base.cpp @@ -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/ // // 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 ) { - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + this->SetSizeHints( wxSize( 480,-1 ), wxDefaultSize ); 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 ); m_cbPath = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - m_cbPath->SetMinSize( wxSize( 480,-1 ) ); - - bSizer5->Add( m_cbPath, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + bSizer5->Add( m_cbPath, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_btnCustomPath = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_btnCustomPath->SetToolTip( _("Choose a different path") ); diff --git a/common/dialogs/dialog_migrate_settings_base.fbp b/common/dialogs/dialog_migrate_settings_base.fbp index a131c7b2fb..6c2ecdc229 100644 --- a/common/dialogs/dialog_migrate_settings_base.fbp +++ b/common/dialogs/dialog_migrate_settings_base.fbp @@ -1,646 +1,655 @@ - + - - - ; - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_migrate_settings_base - 1000 - none - - - 1 - DIALOG_MIGRATE_SETTINGS - - . - - 1 - 1 - 1 - 1 - UI - 0 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - + + + ; + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_migrate_settings_base + 1000 + none + + + 1 + DIALOG_MIGRATE_SETTINGS + + . + + 1 + 1 + 1 + 1 + UI + 0 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 0 + 1 + impl_virtual + + + + 0 + wxID_ANY + + 480,-1 + DIALOG_MIGRATE_SETTINGS_BASE + + + wxCAPTION + DIALOG_SHIM; dialog_shim.h; forward_declare + Configure KiCad Settings Path + + 0 + + + + + -1,-1 + m_sizer + wxVERTICAL + protected + + 10 + wxEXPAND|wxLEFT|wxRIGHT|wxTOP + 0 + - DIALOG_MIGRATE_SETTINGS_BASE - - - wxCAPTION - DIALOG_SHIM; dialog_shim.h; forward_declare - Configure KiCad Settings Path - - 0 - - - - + bSizer6 + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + ,90,92,-1,70,0 + 0 + 0 + wxID_ANY + Welcome to KiCad %s! + 0 + + 0 + + + 0 -1,-1 - m_sizer - wxVERTICAL + 1 + m_lblWelcome + 1 + + protected - - 10 - wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 0 - - - bSizer6 - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,92,-1,70,0 - 0 - 0 - wxID_ANY - Welcome to KiCad %s! - 0 - - 0 - - - 0 - -1,-1 - 1 - m_lblWelcome - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM - 0 - - 0 - protected - 0 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - How would you like to configure KiCad? - 0 - - 0 - - - 0 - - 1 - m_staticText2 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Import settings from a previous version at: - - 0 - - - 0 - - 1 - m_btnPrevVer - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnPrevVerSelected - - - - 5 - wxEXPAND - 1 - - - bSizer5 - wxHORIZONTAL - none - - 5 - wxEXPAND - 0 - - 0 - protected - 20 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 480,-1 - 1 - m_cbPath - 1 - - - protected - 1 - - Resizable - -1 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPathChanged - OnPathDefocused - OnPathChanged - - - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - 0 - - - - - 1 - 0 - 1 - - 1 - - 0 - 0 - - Dock - 0 - Left - 1 - - 1 - - - 0 - 0 - wxID_ANY - Choose Path - - 0 - - 0 - - - 0 - -1,-1 - 1 - m_btnCustomPath - 1 - - - protected - 1 - - - - Resizable - 1 - - - STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare - 0 - Choose a different path - - wxFILTER_NONE - wxDefaultValidator - - - - - OnChoosePath - - - - - - 5 - wxALIGN_CENTER_HORIZONTAL|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - 255,43,0 - 1 - - 0 - 1 - wxID_ANY - The selected path does not contain valid KiCad settings! - 0 - - 0 - - - 0 - - 1 - m_lblPathError - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 23 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Import library configuration from previous version - - 0 - - - 0 - - 1 - m_cbCopyLibraryTables - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - When checked, the symbol and footprint library tables from the previous version will be imported into this version - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Start with default settings - - 0 - - - 0 - - 1 - m_btnUseDefaults - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - OnDefaultSelected - - - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - -1,50 - m_standardButtons - protected - - + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + 5 + wxEXPAND|wxTOP|wxBOTTOM + 0 + + 0 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + How would you like to configure KiCad? + 0 + + 0 + + + 0 + + 1 + m_staticText2 + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Import settings from a previous version at: + + 0 + + + 0 + + 1 + m_btnPrevVer + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnPrevVerSelected + + + + 5 + wxEXPAND + 1 + + + bSizer5 + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + 0 + protected + 20 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_cbPath + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPathChanged + OnPathDefocused + OnPathChanged + + + + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + 0 + + + + + 1 + 0 + 1 + + 1 + + 0 + 0 + + Dock + 0 + Left + 0 + 1 + + 1 + + + 0 + 0 + wxID_ANY + Choose Path + + 0 + + 0 + + + 0 + -1,-1 + 1 + m_btnCustomPath + 1 + + + protected + 1 + + + + Resizable + 1 + + + STD_BITMAP_BUTTON; widgets/std_bitmap_button.h; forward_declare + 0 + Choose a different path + + wxFILTER_NONE + wxDefaultValidator + + + + + OnChoosePath + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + 255,43,0 + 1 + + 0 + 1 + wxID_ANY + The selected path does not contain valid KiCad settings! + 0 + + 0 + + + 0 + + 1 + m_lblPathError + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 23 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Import library configuration from previous version + + 0 + + + 0 + + 1 + m_cbCopyLibraryTables + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + When checked, the symbol and footprint library tables from the previous version will be imported into this version + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Start with default settings + + 0 + + + 0 + + 1 + m_btnUseDefaults + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + OnDefaultSelected + + + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + -1,50 + m_standardButtons + protected + + + + diff --git a/common/dialogs/dialog_migrate_settings_base.h b/common/dialogs/dialog_migrate_settings_base.h index 31eac85d82..252f3f439d 100644 --- a/common/dialogs/dialog_migrate_settings_base.h +++ b/common/dialogs/dialog_migrate_settings_base.h @@ -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/ // // PLEASE DO *NOT* EDIT THIS FILE!