wizard_3DShape_Libs_downloader : show/hide warning message when the target local folder name is modified by hand.
This commit is contained in:
parent
d957ef9f71
commit
68bca14e64
|
@ -71,8 +71,9 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER::WIZARD_3DSHAPE_LIBS_DOWNLOADER( wxWindow* aParen
|
||||||
wxGetEnv( KISYS3DMOD, &default_path );
|
wxGetEnv( KISYS3DMOD, &default_path );
|
||||||
|
|
||||||
wxConfigBase* cfg = Pgm().CommonSettings();
|
wxConfigBase* cfg = Pgm().CommonSettings();
|
||||||
cfg->Read( KICAD_3DLIBS_LAST_DOWNLOAD_DIR, &m_lastGithubDownloadDirectory, default_path );
|
wxString tmp;
|
||||||
setDownloadDir( m_lastGithubDownloadDirectory );
|
cfg->Read( KICAD_3DLIBS_LAST_DOWNLOAD_DIR, &tmp, default_path );
|
||||||
|
setDownloadDir( tmp );
|
||||||
|
|
||||||
// Restore the Github 3D shapes libs url
|
// Restore the Github 3D shapes libs url
|
||||||
wxString githubUrl;
|
wxString githubUrl;
|
||||||
|
@ -411,7 +412,7 @@ bool WIZARD_3DSHAPE_LIBS_DOWNLOADER::downloadOneLib( const wxString& aLibURL,
|
||||||
|
|
||||||
// Github gives the current url of files inside .3dshapes folders like:
|
// Github gives the current url of files inside .3dshapes folders like:
|
||||||
// "https://github.com/KiCad/kicad-library/blob/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
// "https://github.com/KiCad/kicad-library/blob/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
||||||
// which displays a html page showing the file in htmp form.
|
// which displays a html page showing the file in html form.
|
||||||
//
|
//
|
||||||
// the URL of the corresponding raw file is
|
// the URL of the corresponding raw file is
|
||||||
// "https://github.com/KiCad/kicad-library/raw/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
// "https://github.com/KiCad/kicad-library/raw/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
||||||
|
@ -420,7 +421,7 @@ bool WIZARD_3DSHAPE_LIBS_DOWNLOADER::downloadOneLib( const wxString& aLibURL,
|
||||||
// when trying to download raw files.
|
// when trying to download raw files.
|
||||||
// "https://github.com/KiCad/kicad-library/raw/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
// "https://github.com/KiCad/kicad-library/raw/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
||||||
// would be redirected to:
|
// would be redirected to:
|
||||||
// "https://codeload.github.com/KiCad/kicad-library/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
// "https://raw.githubusercontent.com/KiCad/kicad-library/master/modules/packages3d/Capacitors_SMD.3dshapes/C_0402.wrl"
|
||||||
// So use raw.githubusercontent.com instead of github.com
|
// So use raw.githubusercontent.com instead of github.com
|
||||||
// (and removes the "/raw" in path) speed up the downloads (x2 faster).
|
// (and removes the "/raw" in path) speed up the downloads (x2 faster).
|
||||||
//
|
//
|
||||||
|
@ -506,11 +507,31 @@ void WIZARD_3DSHAPE_LIBS_DOWNLOADER::updateGithubControls()
|
||||||
{
|
{
|
||||||
bool valid = wxFileName::IsDirWritable( getDownloadDir() );
|
bool valid = wxFileName::IsDirWritable( getDownloadDir() );
|
||||||
|
|
||||||
// Do not allow to go further unless there is a valid directory selected
|
// Shows or not the warning text if the target 3d folder does not exist, or is not
|
||||||
m_invalidDir->Show( !valid );
|
// writable.
|
||||||
|
m_invalidDirWarningText->Show( !valid );
|
||||||
|
m_bitmapDirWarn->Show( !valid );
|
||||||
|
|
||||||
|
// If the dialog starts with m_invalidDirWarningText and m_bitmapDirWarn not shown
|
||||||
|
// the size and position of the sizer containing these widgets can be incorrect,
|
||||||
|
// until a wxSizeEvent is fired, and the widgets are not shown, or truncated,
|
||||||
|
// at least on Windows. So fire a dummy wxSizeEvent if the size looks bad
|
||||||
|
if( m_invalidDirWarningText->IsShown() && m_invalidDirWarningText->GetSize().x < 2 )
|
||||||
|
{
|
||||||
|
wxSizeEvent event( GetSize() );
|
||||||
|
wxPostEvent( this, event );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allow to go further only if there is a valid target directory selected
|
||||||
enableNext( valid );
|
enableNext( valid );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Called when the local folder name is edited.
|
||||||
|
void WIZARD_3DSHAPE_LIBS_DOWNLOADER::OnLocalFolderChange( wxCommandEvent& event )
|
||||||
|
{
|
||||||
|
updateGithubControls();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void WIZARD_3DSHAPE_LIBS_DOWNLOADER::setupDialogOrder()
|
void WIZARD_3DSHAPE_LIBS_DOWNLOADER::setupDialogOrder()
|
||||||
{
|
{
|
||||||
|
|
|
@ -74,6 +74,7 @@ public:
|
||||||
void OnCheckSaveCopy( wxCommandEvent& aEvent );
|
void OnCheckSaveCopy( wxCommandEvent& aEvent );
|
||||||
void OnDefault3DPathButtonClick( wxCommandEvent& event );
|
void OnDefault3DPathButtonClick( wxCommandEvent& event );
|
||||||
void OnGridLibReviewSize( wxSizeEvent& event );
|
void OnGridLibReviewSize( wxSizeEvent& event );
|
||||||
|
void OnLocalFolderChange( wxCommandEvent& event );
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// Initialization of wizard pages
|
// Initialization of wizard pages
|
||||||
|
@ -140,7 +141,4 @@ protected:
|
||||||
wxWizardPageSimple* m_welcomeDlg;
|
wxWizardPageSimple* m_welcomeDlg;
|
||||||
wxWizardPageSimple* m_githubListDlg;
|
wxWizardPageSimple* m_githubListDlg;
|
||||||
wxWizardPageSimple* m_reviewDlg;
|
wxWizardPageSimple* m_reviewDlg;
|
||||||
|
|
||||||
// path to the most recently used download directory from Github.
|
|
||||||
wxString m_lastGithubDownloadDirectory;
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,9 +22,9 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind
|
||||||
wxBoxSizer* bSizer1;
|
wxBoxSizer* bSizer1;
|
||||||
bSizer1 = new wxBoxSizer( wxVERTICAL );
|
bSizer1 = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, _("Welcome to the 3D shape Libraries downloader Wizard!"), wxDefaultPosition, wxDefaultSize, 0 );
|
m_staticTextWelcome = new wxStaticText( m_wizPage1, wxID_ANY, _("Welcome to the 3D shape Libraries downloader Wizard!"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
m_staticText1->Wrap( -1 );
|
m_staticTextWelcome->Wrap( -1 );
|
||||||
bSizer1->Add( m_staticText1, 0, wxALL|wxEXPAND, 5 );
|
bSizer1->Add( m_staticTextWelcome, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizer1->Add( 0, 20, 0, 0, 5 );
|
bSizer1->Add( 0, 20, 0, 0, 5 );
|
||||||
|
@ -44,8 +44,11 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind
|
||||||
|
|
||||||
bSizer19->Add( 0, 10, 0, 0, 5 );
|
bSizer19->Add( 0, 10, 0, 0, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizerLocalFolder;
|
wxFlexGridSizer* fgSizerLocalFolder;
|
||||||
bSizerLocalFolder = new wxBoxSizer( wxHORIZONTAL );
|
fgSizerLocalFolder = new wxFlexGridSizer( 0, 2, 0, 0 );
|
||||||
|
fgSizerLocalFolder->AddGrowableCol( 0 );
|
||||||
|
fgSizerLocalFolder->SetFlexibleDirection( wxBOTH );
|
||||||
|
fgSizerLocalFolder->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
||||||
wxBoxSizer* bSizerDinname;
|
wxBoxSizer* bSizerDinname;
|
||||||
bSizerDinname = new wxBoxSizer( wxVERTICAL );
|
bSizerDinname = new wxBoxSizer( wxVERTICAL );
|
||||||
|
@ -58,7 +61,7 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind
|
||||||
bSizerDinname->Add( m_downloadDir, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
bSizerDinname->Add( m_downloadDir, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizerLocalFolder->Add( bSizerDinname, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
|
fgSizerLocalFolder->Add( bSizerDinname, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
wxBoxSizer* bSizerButts;
|
wxBoxSizer* bSizerButts;
|
||||||
bSizerButts = new wxBoxSizer( wxVERTICAL );
|
bSizerButts = new wxBoxSizer( wxVERTICAL );
|
||||||
|
@ -70,19 +73,28 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind
|
||||||
bSizerButts->Add( m_buttonDefault3DPath, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
bSizerButts->Add( m_buttonDefault3DPath, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizerLocalFolder->Add( bSizerButts, 0, wxEXPAND, 5 );
|
fgSizerLocalFolder->Add( bSizerButts, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
wxBoxSizer* bSizerWarnMsg;
|
||||||
|
bSizerWarnMsg = new wxBoxSizer( wxHORIZONTAL );
|
||||||
|
|
||||||
|
m_bitmapDirWarn = new wxStaticBitmap( m_wizPage1, wxID_ANY, wxArtProvider::GetBitmap( wxART_ERROR, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
bSizerWarnMsg->Add( m_bitmapDirWarn, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
|
||||||
|
|
||||||
|
m_invalidDirWarningText = new wxStaticText( m_wizPage1, wxID_ANY, _("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
|
||||||
|
m_invalidDirWarningText->Wrap( -1 );
|
||||||
|
m_invalidDirWarningText->SetForegroundColour( wxColour( 255, 0, 0 ) );
|
||||||
|
|
||||||
|
bSizerWarnMsg->Add( m_invalidDirWarningText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizer19->Add( bSizerLocalFolder, 0, wxEXPAND, 5 );
|
fgSizerLocalFolder->Add( bSizerWarnMsg, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizer19->Add( 0, 10, 0, 0, 5 );
|
fgSizerLocalFolder->Add( 10, 40, 0, 0, 5 );
|
||||||
|
|
||||||
m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, _("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 );
|
|
||||||
m_invalidDir->Wrap( -1 );
|
|
||||||
m_invalidDir->SetForegroundColour( wxColour( 255, 0, 0 ) );
|
|
||||||
|
|
||||||
bSizer19->Add( m_invalidDir, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
|
bSizer19->Add( fgSizerLocalFolder, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
bSizer1->Add( bSizer19, 1, wxEXPAND, 5 );
|
bSizer1->Add( bSizer19, 1, wxEXPAND, 5 );
|
||||||
|
@ -210,6 +222,7 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind
|
||||||
this->Connect( wxID_ANY, wxEVT_WIZARD_FINISHED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnWizardFinished ) );
|
this->Connect( wxID_ANY, wxEVT_WIZARD_FINISHED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnWizardFinished ) );
|
||||||
this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanged ) );
|
this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanged ) );
|
||||||
this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanging ) );
|
this->Connect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanging ) );
|
||||||
|
m_downloadDir->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnLocalFolderChange ), NULL, this );
|
||||||
m_btnBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnBrowseButtonClick ), NULL, this );
|
m_btnBrowse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnBrowseButtonClick ), NULL, this );
|
||||||
m_buttonDefault3DPath->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnDefault3DPathButtonClick ), NULL, this );
|
m_buttonDefault3DPath->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnDefault3DPathButtonClick ), NULL, this );
|
||||||
m_btnSelectAll3Dlibs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnSelectAll3Dlibs ), NULL, this );
|
m_btnSelectAll3Dlibs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnSelectAll3Dlibs ), NULL, this );
|
||||||
|
@ -224,6 +237,7 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::~WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE()
|
||||||
this->Disconnect( wxID_ANY, wxEVT_WIZARD_FINISHED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnWizardFinished ) );
|
this->Disconnect( wxID_ANY, wxEVT_WIZARD_FINISHED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnWizardFinished ) );
|
||||||
this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanged ) );
|
this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGED, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanged ) );
|
||||||
this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanging ) );
|
this->Disconnect( wxID_ANY, wxEVT_WIZARD_PAGE_CHANGING, wxWizardEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnPageChanging ) );
|
||||||
|
m_downloadDir->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnLocalFolderChange ), NULL, this );
|
||||||
m_btnBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnBrowseButtonClick ), NULL, this );
|
m_btnBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnBrowseButtonClick ), NULL, this );
|
||||||
m_buttonDefault3DPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnDefault3DPathButtonClick ), NULL, this );
|
m_buttonDefault3DPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnDefault3DPathButtonClick ), NULL, this );
|
||||||
m_btnSelectAll3Dlibs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnSelectAll3Dlibs ), NULL, this );
|
m_btnSelectAll3Dlibs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::OnSelectAll3Dlibs ), NULL, this );
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
<property name="minimum_size">-1,-1</property>
|
<property name="minimum_size">-1,-1</property>
|
||||||
<property name="name">WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE</property>
|
<property name="name">WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE</property>
|
||||||
<property name="pos"></property>
|
<property name="pos"></property>
|
||||||
<property name="size">591,405</property>
|
<property name="size">591,386</property>
|
||||||
<property name="style">wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER</property>
|
<property name="style">wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER</property>
|
||||||
<property name="subclass">; </property>
|
<property name="subclass">; </property>
|
||||||
<property name="title">Add 3D Shape Libraries Wizard</property>
|
<property name="title">Add 3D Shape Libraries Wizard</property>
|
||||||
|
@ -175,7 +175,7 @@
|
||||||
<property name="minimize_button">0</property>
|
<property name="minimize_button">0</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="moveable">1</property>
|
<property name="moveable">1</property>
|
||||||
<property name="name">m_staticText1</property>
|
<property name="name">m_staticTextWelcome</property>
|
||||||
<property name="pane_border">1</property>
|
<property name="pane_border">1</property>
|
||||||
<property name="pane_position"></property>
|
<property name="pane_position"></property>
|
||||||
<property name="pane_size"></property>
|
<property name="pane_size"></property>
|
||||||
|
@ -424,12 +424,19 @@
|
||||||
<object class="sizeritem" expanded="1">
|
<object class="sizeritem" expanded="1">
|
||||||
<property name="border">5</property>
|
<property name="border">5</property>
|
||||||
<property name="flag">wxEXPAND</property>
|
<property name="flag">wxEXPAND</property>
|
||||||
<property name="proportion">0</property>
|
<property name="proportion">1</property>
|
||||||
<object class="wxBoxSizer" expanded="1">
|
<object class="wxFlexGridSizer" expanded="1">
|
||||||
|
<property name="cols">2</property>
|
||||||
|
<property name="flexible_direction">wxBOTH</property>
|
||||||
|
<property name="growablecols">0</property>
|
||||||
|
<property name="growablerows"></property>
|
||||||
|
<property name="hgap">0</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="name">bSizerLocalFolder</property>
|
<property name="name">fgSizerLocalFolder</property>
|
||||||
<property name="orient">wxHORIZONTAL</property>
|
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||||
<property name="permission">none</property>
|
<property name="permission">none</property>
|
||||||
|
<property name="rows">0</property>
|
||||||
|
<property name="vgap">0</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|wxALIGN_CENTER_VERTICAL</property>
|
<property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
|
||||||
|
@ -606,7 +613,7 @@
|
||||||
<event name="OnRightUp"></event>
|
<event name="OnRightUp"></event>
|
||||||
<event name="OnSetFocus"></event>
|
<event name="OnSetFocus"></event>
|
||||||
<event name="OnSize"></event>
|
<event name="OnSize"></event>
|
||||||
<event name="OnText"></event>
|
<event name="OnText">OnLocalFolderChange</event>
|
||||||
<event name="OnTextEnter"></event>
|
<event name="OnTextEnter"></event>
|
||||||
<event name="OnTextMaxLen"></event>
|
<event name="OnTextMaxLen"></event>
|
||||||
<event name="OnTextURL"></event>
|
<event name="OnTextURL"></event>
|
||||||
|
@ -802,99 +809,191 @@
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
<object class="sizeritem" expanded="1">
|
||||||
</object>
|
<property name="border">5</property>
|
||||||
<object class="sizeritem" expanded="1">
|
<property name="flag">wxEXPAND</property>
|
||||||
<property name="border">5</property>
|
<property name="proportion">1</property>
|
||||||
<property name="flag"></property>
|
<object class="wxBoxSizer" expanded="1">
|
||||||
<property name="proportion">0</property>
|
<property name="minimum_size"></property>
|
||||||
<object class="spacer" expanded="1">
|
<property name="name">bSizerWarnMsg</property>
|
||||||
<property name="height">10</property>
|
<property name="orient">wxHORIZONTAL</property>
|
||||||
<property name="permission">protected</property>
|
<property name="permission">none</property>
|
||||||
<property name="width">0</property>
|
<object class="sizeritem" expanded="1">
|
||||||
</object>
|
<property name="border">5</property>
|
||||||
</object>
|
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL</property>
|
||||||
<object class="sizeritem" expanded="1">
|
<property name="proportion">0</property>
|
||||||
<property name="border">5</property>
|
<object class="wxStaticBitmap" expanded="1">
|
||||||
<property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
|
<property name="BottomDockable">1</property>
|
||||||
<property name="proportion">0</property>
|
<property name="LeftDockable">1</property>
|
||||||
<object class="wxStaticText" expanded="1">
|
<property name="RightDockable">1</property>
|
||||||
<property name="BottomDockable">1</property>
|
<property name="TopDockable">1</property>
|
||||||
<property name="LeftDockable">1</property>
|
<property name="aui_layer"></property>
|
||||||
<property name="RightDockable">1</property>
|
<property name="aui_name"></property>
|
||||||
<property name="TopDockable">1</property>
|
<property name="aui_position"></property>
|
||||||
<property name="aui_layer"></property>
|
<property name="aui_row"></property>
|
||||||
<property name="aui_name"></property>
|
<property name="best_size"></property>
|
||||||
<property name="aui_position"></property>
|
<property name="bg"></property>
|
||||||
<property name="aui_row"></property>
|
<property name="bitmap">Load From Art Provider; wxART_ERROR; wxART_OTHER</property>
|
||||||
<property name="best_size"></property>
|
<property name="caption"></property>
|
||||||
<property name="bg"></property>
|
<property name="caption_visible">1</property>
|
||||||
<property name="caption"></property>
|
<property name="center_pane">0</property>
|
||||||
<property name="caption_visible">1</property>
|
<property name="close_button">1</property>
|
||||||
<property name="center_pane">0</property>
|
<property name="context_help"></property>
|
||||||
<property name="close_button">1</property>
|
<property name="context_menu">1</property>
|
||||||
<property name="context_help"></property>
|
<property name="default_pane">0</property>
|
||||||
<property name="context_menu">1</property>
|
<property name="dock">Dock</property>
|
||||||
<property name="default_pane">0</property>
|
<property name="dock_fixed">0</property>
|
||||||
<property name="dock">Dock</property>
|
<property name="docking">Left</property>
|
||||||
<property name="dock_fixed">0</property>
|
<property name="enabled">1</property>
|
||||||
<property name="docking">Left</property>
|
<property name="fg"></property>
|
||||||
<property name="enabled">1</property>
|
<property name="floatable">1</property>
|
||||||
<property name="fg">255,0,0</property>
|
<property name="font"></property>
|
||||||
<property name="floatable">1</property>
|
<property name="gripper">0</property>
|
||||||
<property name="font"></property>
|
<property name="hidden">0</property>
|
||||||
<property name="gripper">0</property>
|
<property name="id">wxID_ANY</property>
|
||||||
<property name="hidden">0</property>
|
<property name="max_size"></property>
|
||||||
<property name="id">wxID_ANY</property>
|
<property name="maximize_button">0</property>
|
||||||
<property name="label">It is not possible to write in the selected directory.
Please choose another one.</property>
|
<property name="maximum_size"></property>
|
||||||
<property name="max_size"></property>
|
<property name="min_size"></property>
|
||||||
<property name="maximize_button">0</property>
|
<property name="minimize_button">0</property>
|
||||||
<property name="maximum_size"></property>
|
<property name="minimum_size"></property>
|
||||||
<property name="min_size"></property>
|
<property name="moveable">1</property>
|
||||||
<property name="minimize_button">0</property>
|
<property name="name">m_bitmapDirWarn</property>
|
||||||
<property name="minimum_size"></property>
|
<property name="pane_border">1</property>
|
||||||
<property name="moveable">1</property>
|
<property name="pane_position"></property>
|
||||||
<property name="name">m_invalidDir</property>
|
<property name="pane_size"></property>
|
||||||
<property name="pane_border">1</property>
|
<property name="permission">protected</property>
|
||||||
<property name="pane_position"></property>
|
<property name="pin_button">1</property>
|
||||||
<property name="pane_size"></property>
|
<property name="pos"></property>
|
||||||
<property name="permission">protected</property>
|
<property name="resize">Resizable</property>
|
||||||
<property name="pin_button">1</property>
|
<property name="show">1</property>
|
||||||
<property name="pos"></property>
|
<property name="size"></property>
|
||||||
<property name="resize">Resizable</property>
|
<property name="subclass"></property>
|
||||||
<property name="show">1</property>
|
<property name="toolbar_pane">0</property>
|
||||||
<property name="size"></property>
|
<property name="tooltip"></property>
|
||||||
<property name="style"></property>
|
<property name="window_extra_style"></property>
|
||||||
<property name="subclass"></property>
|
<property name="window_name"></property>
|
||||||
<property name="toolbar_pane">0</property>
|
<property name="window_style"></property>
|
||||||
<property name="tooltip"></property>
|
<event name="OnChar"></event>
|
||||||
<property name="window_extra_style"></property>
|
<event name="OnEnterWindow"></event>
|
||||||
<property name="window_name"></property>
|
<event name="OnEraseBackground"></event>
|
||||||
<property name="window_style"></property>
|
<event name="OnKeyDown"></event>
|
||||||
<property name="wrap">-1</property>
|
<event name="OnKeyUp"></event>
|
||||||
<event name="OnChar"></event>
|
<event name="OnKillFocus"></event>
|
||||||
<event name="OnEnterWindow"></event>
|
<event name="OnLeaveWindow"></event>
|
||||||
<event name="OnEraseBackground"></event>
|
<event name="OnLeftDClick"></event>
|
||||||
<event name="OnKeyDown"></event>
|
<event name="OnLeftDown"></event>
|
||||||
<event name="OnKeyUp"></event>
|
<event name="OnLeftUp"></event>
|
||||||
<event name="OnKillFocus"></event>
|
<event name="OnMiddleDClick"></event>
|
||||||
<event name="OnLeaveWindow"></event>
|
<event name="OnMiddleDown"></event>
|
||||||
<event name="OnLeftDClick"></event>
|
<event name="OnMiddleUp"></event>
|
||||||
<event name="OnLeftDown"></event>
|
<event name="OnMotion"></event>
|
||||||
<event name="OnLeftUp"></event>
|
<event name="OnMouseEvents"></event>
|
||||||
<event name="OnMiddleDClick"></event>
|
<event name="OnMouseWheel"></event>
|
||||||
<event name="OnMiddleDown"></event>
|
<event name="OnPaint"></event>
|
||||||
<event name="OnMiddleUp"></event>
|
<event name="OnRightDClick"></event>
|
||||||
<event name="OnMotion"></event>
|
<event name="OnRightDown"></event>
|
||||||
<event name="OnMouseEvents"></event>
|
<event name="OnRightUp"></event>
|
||||||
<event name="OnMouseWheel"></event>
|
<event name="OnSetFocus"></event>
|
||||||
<event name="OnPaint"></event>
|
<event name="OnSize"></event>
|
||||||
<event name="OnRightDClick"></event>
|
<event name="OnUpdateUI"></event>
|
||||||
<event name="OnRightDown"></event>
|
</object>
|
||||||
<event name="OnRightUp"></event>
|
</object>
|
||||||
<event name="OnSetFocus"></event>
|
<object class="sizeritem" expanded="1">
|
||||||
<event name="OnSize"></event>
|
<property name="border">5</property>
|
||||||
<event name="OnUpdateUI"></event>
|
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="wxStaticText" expanded="1">
|
||||||
|
<property name="BottomDockable">1</property>
|
||||||
|
<property name="LeftDockable">1</property>
|
||||||
|
<property name="RightDockable">1</property>
|
||||||
|
<property name="TopDockable">1</property>
|
||||||
|
<property name="aui_layer"></property>
|
||||||
|
<property name="aui_name"></property>
|
||||||
|
<property name="aui_position"></property>
|
||||||
|
<property name="aui_row"></property>
|
||||||
|
<property name="best_size"></property>
|
||||||
|
<property name="bg"></property>
|
||||||
|
<property name="caption"></property>
|
||||||
|
<property name="caption_visible">1</property>
|
||||||
|
<property name="center_pane">0</property>
|
||||||
|
<property name="close_button">1</property>
|
||||||
|
<property name="context_help"></property>
|
||||||
|
<property name="context_menu">1</property>
|
||||||
|
<property name="default_pane">0</property>
|
||||||
|
<property name="dock">Dock</property>
|
||||||
|
<property name="dock_fixed">0</property>
|
||||||
|
<property name="docking">Left</property>
|
||||||
|
<property name="enabled">1</property>
|
||||||
|
<property name="fg">255,0,0</property>
|
||||||
|
<property name="floatable">1</property>
|
||||||
|
<property name="font"></property>
|
||||||
|
<property name="gripper">0</property>
|
||||||
|
<property name="hidden">0</property>
|
||||||
|
<property name="id">wxID_ANY</property>
|
||||||
|
<property name="label">It is not possible to write in the selected directory.
Please choose another one.</property>
|
||||||
|
<property name="max_size"></property>
|
||||||
|
<property name="maximize_button">0</property>
|
||||||
|
<property name="maximum_size"></property>
|
||||||
|
<property name="min_size"></property>
|
||||||
|
<property name="minimize_button">0</property>
|
||||||
|
<property name="minimum_size">-1,-1</property>
|
||||||
|
<property name="moveable">1</property>
|
||||||
|
<property name="name">m_invalidDirWarningText</property>
|
||||||
|
<property name="pane_border">1</property>
|
||||||
|
<property name="pane_position"></property>
|
||||||
|
<property name="pane_size"></property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="pin_button">1</property>
|
||||||
|
<property name="pos"></property>
|
||||||
|
<property name="resize">Resizable</property>
|
||||||
|
<property name="show">1</property>
|
||||||
|
<property name="size"></property>
|
||||||
|
<property name="style">wxALIGN_CENTRE</property>
|
||||||
|
<property name="subclass"></property>
|
||||||
|
<property name="toolbar_pane">0</property>
|
||||||
|
<property name="tooltip"></property>
|
||||||
|
<property name="window_extra_style"></property>
|
||||||
|
<property name="window_name"></property>
|
||||||
|
<property name="window_style"></property>
|
||||||
|
<property name="wrap">-1</property>
|
||||||
|
<event name="OnChar"></event>
|
||||||
|
<event name="OnEnterWindow"></event>
|
||||||
|
<event name="OnEraseBackground"></event>
|
||||||
|
<event name="OnKeyDown"></event>
|
||||||
|
<event name="OnKeyUp"></event>
|
||||||
|
<event name="OnKillFocus"></event>
|
||||||
|
<event name="OnLeaveWindow"></event>
|
||||||
|
<event name="OnLeftDClick"></event>
|
||||||
|
<event name="OnLeftDown"></event>
|
||||||
|
<event name="OnLeftUp"></event>
|
||||||
|
<event name="OnMiddleDClick"></event>
|
||||||
|
<event name="OnMiddleDown"></event>
|
||||||
|
<event name="OnMiddleUp"></event>
|
||||||
|
<event name="OnMotion"></event>
|
||||||
|
<event name="OnMouseEvents"></event>
|
||||||
|
<event name="OnMouseWheel"></event>
|
||||||
|
<event name="OnPaint"></event>
|
||||||
|
<event name="OnRightDClick"></event>
|
||||||
|
<event name="OnRightDown"></event>
|
||||||
|
<event name="OnRightUp"></event>
|
||||||
|
<event name="OnSetFocus"></event>
|
||||||
|
<event name="OnSize"></event>
|
||||||
|
<event name="OnUpdateUI"></event>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
|
<object class="sizeritem" expanded="1">
|
||||||
|
<property name="border">5</property>
|
||||||
|
<property name="flag"></property>
|
||||||
|
<property name="proportion">0</property>
|
||||||
|
<object class="spacer" expanded="1">
|
||||||
|
<property name="height">40</property>
|
||||||
|
<property name="permission">protected</property>
|
||||||
|
<property name="width">10</property>
|
||||||
|
</object>
|
||||||
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
|
@ -43,14 +43,15 @@ class WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE : public wxWizard
|
||||||
private:
|
private:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
wxStaticText* m_staticText1;
|
wxStaticText* m_staticTextWelcome;
|
||||||
wxStaticText* m_staticText8;
|
wxStaticText* m_staticText8;
|
||||||
wxTextCtrl* m_textCtrlGithubURL;
|
wxTextCtrl* m_textCtrlGithubURL;
|
||||||
wxStaticText* m_staticText9;
|
wxStaticText* m_staticText9;
|
||||||
wxTextCtrl* m_downloadDir;
|
wxTextCtrl* m_downloadDir;
|
||||||
wxButton* m_btnBrowse;
|
wxButton* m_btnBrowse;
|
||||||
wxButton* m_buttonDefault3DPath;
|
wxButton* m_buttonDefault3DPath;
|
||||||
wxStaticText* m_invalidDir;
|
wxStaticBitmap* m_bitmapDirWarn;
|
||||||
|
wxStaticText* m_invalidDirWarningText;
|
||||||
wxStaticBitmap* m_bitmapRepo;
|
wxStaticBitmap* m_bitmapRepo;
|
||||||
wxHyperlinkCtrl* m_hyperlinkGithubKicad;
|
wxHyperlinkCtrl* m_hyperlinkGithubKicad;
|
||||||
wxStaticText* m_staticText112;
|
wxStaticText* m_staticText112;
|
||||||
|
@ -67,6 +68,7 @@ class WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE : public wxWizard
|
||||||
virtual void OnWizardFinished( wxWizardEvent& event ) { event.Skip(); }
|
virtual void OnWizardFinished( wxWizardEvent& event ) { event.Skip(); }
|
||||||
virtual void OnPageChanged( wxWizardEvent& event ) { event.Skip(); }
|
virtual void OnPageChanged( wxWizardEvent& event ) { event.Skip(); }
|
||||||
virtual void OnPageChanging( wxWizardEvent& event ) { event.Skip(); }
|
virtual void OnPageChanging( wxWizardEvent& event ) { event.Skip(); }
|
||||||
|
virtual void OnLocalFolderChange( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnBrowseButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnBrowseButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnDefault3DPathButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnDefault3DPathButtonClick( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnSelectAll3Dlibs( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnSelectAll3Dlibs( wxCommandEvent& event ) { event.Skip(); }
|
||||||
|
|
Loading…
Reference in New Issue