chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

A couple of import hang fixes, (FPIcon wrong path selected, and double import)

Browse Source
This commit is contained in:
Mark Watkins 2015-12-22 07:33:33 +10:00
parent 20f8ceed71
commit cd7806be59
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -40,11 +40,24 @@ FPIconLoader::~FPIconLoader()
bool FPIconLoader::Detect(const QString & givenpath)
{
QDir dir(givenpath);
QString path = givenpath;
path = path.replace("\\", "/");
if (path.endsWith("/")) {
path.chop(1);
}
if (path.endsWith("/" + FPHCARE)) {
path = path.section("/",0,-2);
}
QDir dir(path);
if (!dir.exists()) {
return false;
}
// F&P Icon have a folder called FPHCARE in the root directory
if (!dir.exists(FPHCARE)) {

10
sleepyhead/mainwindow.cpp
View File

@ -920,10 +920,16 @@ QList<ImportPath> MainWindow::detectCPAPCards()
void MainWindow::on_action_Import_Data_triggered()
{
static bool in_import = false;
if (m_inRecalculation) {
Notify(tr("Access to Import has been blocked while recalculations are in progress."),STR_MessageBox_Busy);
return;
}
if (in_import) {
Notify(tr("Import is already running in the background."),STR_MessageBox_Busy);
return;
}
in_import=true;
QList<ImportPath> datacards = detectCPAPCards();
@ -971,6 +977,7 @@ void MainWindow::on_action_Import_Data_triggered()
if (res == QMessageBox::Cancel) {
// Give the communal progress bar back
ui->statusbar->insertWidget(1,qprogress,1);
in_import=false;
return;
} else if (res == QMessageBox::No) {
waitmsg->setText(tr("Please wait, launching file dialog..."));
@ -1039,6 +1046,7 @@ void MainWindow::on_action_Import_Data_triggered()
if (w.exec() != QDialog::Accepted) {
popup.hide();
ui->statusbar->insertWidget(1,qprogress,1);
in_import=false;
return;
}
@ -1099,6 +1107,8 @@ void MainWindow::on_action_Import_Data_triggered()
finishCPAPImport();
PopulatePurgeMenu();
}
in_import=false;
}
QMenu *MainWindow::CreateMenu(QString title)