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

Restored wxPD_APP_MODAL flag for progress dialogs 

The flag is required on Linux, otherwise applications hang right after a
progress dialog disappears.
This commit is contained in:
Maciej Suminski 2018-04-20 22:55:37 +02:00
parent 4302394990
commit a93da4aba6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp
View File

@ -359,6 +359,9 @@ bool WIZARD_3DSHAPE_LIBS_DOWNLOADER::downloadGithubLibsFromList( wxArrayString&
// for OSX do not enable wPD_APP_MODAL, keep wxPD_AUTO_HIDE // for OSX do not enable wPD_APP_MODAL, keep wxPD_AUTO_HIDE
wxProgressDialog pdlg( _( "Downloading 3D libraries" ), wxEmptyString, wxProgressDialog pdlg( _( "Downloading 3D libraries" ), wxEmptyString,
aUrlList.GetCount(), this, aUrlList.GetCount(), this,
#ifndef __WXMAC__
wxPD_APP_MODAL |
#endif
wxPD_CAN_ABORT | wxPD_AUTO_HIDE ); wxPD_CAN_ABORT | wxPD_AUTO_HIDE );
// Built the full server name string: // Built the full server name string:

12
pcbnew/dialogs/wizard_add_fplib.cpp
View File

@ -608,7 +608,11 @@ bool WIZARD_FPLIB_TABLE::downloadGithubLibsFromList( wxArrayString& aUrlList,
// Display a progress bar to show the downlaod state // Display a progress bar to show the downlaod state
// for OSX do not enable wPD_APP_MODAL, keep wxPD_AUTO_HIDE // for OSX do not enable wPD_APP_MODAL, keep wxPD_AUTO_HIDE
wxProgressDialog pdlg( _( "Downloading libraries" ), wxEmptyString, aUrlList.GetCount(), wxProgressDialog pdlg( _( "Downloading libraries" ), wxEmptyString, aUrlList.GetCount(),
this, wxPD_CAN_ABORT | wxPD_AUTO_HIDE ); this,
#ifndef __WXMAC__
wxPD_APP_MODAL |
#endif
wxPD_CAN_ABORT | wxPD_AUTO_HIDE );
// Download libs: // Download libs:
for( unsigned ii = 0; ii < aUrlList.GetCount(); ii++ ) for( unsigned ii = 0; ii < aUrlList.GetCount(); ii++ )
@ -793,7 +797,11 @@ void WIZARD_FPLIB_TABLE::setupReview()
bool validate = true; bool validate = true;
// for OSX do not enable wPD_APP_MODAL, keep wxPD_AUTO_HIDE // for OSX do not enable wPD_APP_MODAL, keep wxPD_AUTO_HIDE
wxProgressDialog progressDlg( _( "Please wait..." ), _( "Validating libraries" ), wxProgressDialog progressDlg( _( "Please wait..." ), _( "Validating libraries" ),
libTotalCount, this, wxPD_CAN_ABORT | wxPD_AUTO_HIDE ); libTotalCount, this,
#ifndef __WXMAC__
wxPD_APP_MODAL |
#endif
wxPD_CAN_ABORT | wxPD_AUTO_HIDE );
m_dvLibName->SetWidth( 280 ); m_dvLibName->SetWidth( 280 );