Mercurial > hg > syntilista

comparison src/main.cpp @ 151:753ae3569cb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Actually save the backup mode setting to configuration, and add some error checks.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 28 Aug 2017 11:51:03 +0300
parents 2a8c97753381
children 0a7aff5dce3b
comparison
equal deleted inserted replaced
150:2a8c97753381 151:753ae3569cb7
247 247
248 // Read configuration settings 248 // Read configuration settings
249 settings.uiPos = tmpst.value("pos", QPoint(100, 100)).toPoint(); 249 settings.uiPos = tmpst.value("pos", QPoint(100, 100)).toPoint();
250 settings.uiSize = tmpst.value("size", QSize(1000, 600)).toSize(); 250 settings.uiSize = tmpst.value("size", QSize(1000, 600)).toSize();
251 settings.uiScale = tmpst.value("scale", 1.0f).toDouble(); 251 settings.uiScale = tmpst.value("scale", 1.0f).toDouble();
252 settings.dbBackupMode = BACKUP_NONE; 252 settings.dbBackupMode = tmpst.value("dbBackupMode", BACKUP_NONE).toInt();
253 settings.dbBackupURL = tmpst.value("dbBackupURL", QString()).toString(); 253 settings.dbBackupURL = tmpst.value("dbBackupURL", QString()).toString();
254 settings.dbBackupSecret = tmpst.value("dbBackupSecret", QString()).toString(); 254 settings.dbBackupSecret = tmpst.value("dbBackupSecret", QString()).toString();
255 255
256 // Check commandline arguments for configuring backup settings 256 // Check commandline arguments for configuring backup settings
257 if (argc >= 5 && strcmp(argv[1], "config") == 0) 257 if (argc >= 5 && strcmp(argv[1], "config") == 0)
437 tmpst.setValue("pos", pos()); 437 tmpst.setValue("pos", pos());
438 tmpst.setValue("size", size()); 438 tmpst.setValue("size", size());
439 439
440 // Other settings 440 // Other settings
441 tmpst.setValue("scale", settings.uiScale); 441 tmpst.setValue("scale", settings.uiScale);
442 tmpst.setValue("dbBackupMode", settings.dbBackupMode);
442 tmpst.setValue("dbBackupURL", settings.dbBackupURL); 443 tmpst.setValue("dbBackupURL", settings.dbBackupURL);
443 tmpst.setValue("dbBackupSecret", settings.dbBackupSecret); 444 tmpst.setValue("dbBackupSecret", settings.dbBackupSecret);
444 445
445 // Free resources 446 // Free resources
446 delete ui; 447 delete ui;
452 QSqlDatabase::database().close(); 453 QSqlDatabase::database().close();
453 454
454 // Back up the database 455 // Back up the database
455 if (settings.dbBackupMode != BACKUP_NONE) 456 if (settings.dbBackupMode != BACKUP_NONE)
456 backupDatabase(); 457 backupDatabase();
458 else
459 slLog("INFO", QStringLiteral("Database backup mode is NONE, not performing backup."));
457 } 460 }
458 461
459 462
460 void SyntilistaMainWindow::backupDatabase() 463 void SyntilistaMainWindow::backupDatabase()
461 { 464 {
558 #ifdef USE_LIBCURL 561 #ifdef USE_LIBCURL
559 #else 562 #else
560 slLog("ERROR", QStringLiteral("Backup method is SFTP via libcurl, but support is not compiled in!")); 563 slLog("ERROR", QStringLiteral("Backup method is SFTP via libcurl, but support is not compiled in!"));
561 return; 564 return;
562 #endif 565 #endif
566 }
567 else
568 {
569 slLog("ERROR", QStringLiteral("Database backup mode is INVALID! Not performing backup!"));
570 return;
563 } 571 }
564 572
565 // Create progress dialog 573 // Create progress dialog
566 backupDialog = new QProgressDialog( 574 backupDialog = new QProgressDialog(
567 tr("Varmuuskopioidaan tietokantaa ..."), 575 tr("Varmuuskopioidaan tietokantaa ..."),