Ask the user where to save screenshots (by default).

There's a new preference to turn this off.

Also update the release notes post-beta-1.

oscar/SleepLib/appsettings.cpp

@@ -44,6 +44,7 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
     initPref(STR_US_AutoLaunchImport, false);
     m_cacheSessions = initPref(STR_IS_CacheSessions, false).toBool();
     initPref(STR_US_RemoveCardReminder, true);
+    initPref(STR_US_DontAskWhenSavingScreenshots, false);
     m_profileName = initPref(STR_GEN_Profile, "").toString();
     initPref(STR_GEN_AutoOpenLastUsed, true);
 

oscar/SleepLib/appsettings.h

@@ -51,6 +51,7 @@ const QString STR_US_OpenTabAtStart = "OpenTabAtStart";
 const QString STR_US_OpenTabAfterImport = "OpenTabAfterImport";
 const QString STR_US_AutoLaunchImport = "AutoLaunchImport";
 const QString STR_US_RemoveCardReminder = "RemoveCardReminder";
+const QString STR_US_DontAskWhenSavingScreenshots = "DontAskWhenSavingScreenshots";
 const QString STR_IS_CacheSessions = "MemoryHog";
 
 const QString STR_GEN_AutoOpenLastUsed = "AutoOpenLastUsed";
@@ -137,6 +138,7 @@ public:
   int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); }
   int openTabAfterImport() const { return getPref(STR_US_OpenTabAfterImport).toInt(); }
   bool removeCardReminder() const { return getPref(STR_US_RemoveCardReminder).toBool(); }
+  bool dontAskWhenSavingScreenshots() const { return getPref(STR_US_DontAskWhenSavingScreenshots).toBool(); }
   bool autoOpenLastUsed() const { return getPref(STR_GEN_AutoOpenLastUsed).toBool(); }
   inline const QString & language() const { return m_language; }
 
@@ -188,6 +190,7 @@ public:
   void setOpenTabAtStart(int idx) { setPref(STR_US_OpenTabAtStart, idx); }
   void setOpenTabAfterImport(int idx) { setPref(STR_US_OpenTabAfterImport, idx); }
   void setRemoveCardReminder(bool b) { setPref(STR_US_RemoveCardReminder, b); }
+  void setDontAskWhenSavingScreenshots(bool b) { setPref(STR_US_DontAskWhenSavingScreenshots, b); }
 
   void setVersionString(QString version) { setPref(STR_PREF_VersionString, version); }
 #ifndef NO_UPDATER

oscar/docs/release_notes.html

@@ -6,6 +6,16 @@
 Which was written and copyright 2011-2018 © Mark Watkins
 </p>
 
+<p>
+<b>Changes and fixes in OSCAR v1.1.0-beta-2</b>
+<ul>
+<li>Portions of OSCAR are &copy; 2019-2020 by The OSCAR Team</li>
+<li>[new] Add preliminary support for Viatom/Wellue pulse oximeters</li>
+<li>[new] Ask where to save screenshots</li>
+<li>[fix] Improved import of Philips Respironics flex and humidification settings</li>
+</ul>
+</b>
+
 <p>
 <b>Changes and fixes in OSCAR v1.1.0-beta-1</b>
 <ul>

oscar/mainwindow.cpp

@@ -1462,21 +1462,32 @@ void MainWindow::DelayedScreenshot()
                                                             screenshotRect.width(),
                                                             screenshotRect.height() + titleBarHeight);
 
-    QString a = p_pref->Get("{home}/Screenshots");
-    QDir dir(a);
+    QString default_filename = "/screenshot-" + QDateTime::currentDateTime().toString("yyyyMMdd-hhmmss") + ".png";
 
+    QString png_filepath;
+    if (AppSetting->dontAskWhenSavingScreenshots()) {
+        png_filepath = p_pref->Get("{home}/Screenshots");
+        QDir dir(png_filepath);
         if (!dir.exists()) {
-        dir.mkdir(a);
+            dir.mkdir(png_filepath);
+        }
+        png_filepath += default_filename;
+    } else {
+        QString folder = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation) + default_filename;
+        png_filepath = QFileDialog::getSaveFileName(this, tr("Choose where to save screenshot"), folder, tr("Image files (*.png)"));
+        if (png_filepath.isEmpty() == false && png_filepath.toLower().endsWith(".png") == false) {
+            png_filepath += ".png";
+        }
     }
 
-    a += "/screenshot-" + QDateTime::currentDateTime().toString("yyyyMMdd-hhmmss") + ".png";
-
-    qDebug() << "Saving screenshot to" << a;
-
-    if (!pixmap.save(a)) {
-        Notify(tr("There was an error saving screenshot to file \"%1\"").arg(QDir::toNativeSeparators(a)));
+    // png_filepath will be empty if the user canceled the file selection above.
+    if (png_filepath.isEmpty() == false) {
+        qDebug() << "Saving screenshot to" << png_filepath;
+        if (!pixmap.save(png_filepath)) {
+            Notify(tr("There was an error saving screenshot to file \"%1\"").arg(QDir::toNativeSeparators(png_filepath)));
         } else {
-        Notify(tr("Screenshot saved to file \"%1\"").arg(QDir::toNativeSeparators(a)));
+            Notify(tr("Screenshot saved to file \"%1\"").arg(QDir::toNativeSeparators(png_filepath)));
+        }
     }
 
     setUpdatesEnabled(false);

oscar/preferencesdialog.cpp

@@ -237,6 +237,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
 //  ui->enableMultithreading->setChecked(AppSetting->multithreading());
     ui->enableMultithreading->setVisible(false);
     ui->removeCardNotificationCheckbox->setChecked(AppSetting->removeCardReminder());
+    ui->dontAskWhenSavingScreenshotsCheckbox->setChecked(AppSetting->dontAskWhenSavingScreenshots());
     ui->cacheSessionData->setChecked(AppSetting->cacheSessions());
     ui->preloadSummaries->setChecked(profile->session->preloadSummaries());
     ui->animationsAndTransitionsCheckbox->setChecked(AppSetting->animations());
@@ -825,6 +826,7 @@ bool PreferencesDialog::Save()
     profile->general->setShowUnknownFlags(ui->showUnknownFlags->isChecked());
     AppSetting->setMultithreading(ui->enableMultithreading->isChecked());
     AppSetting->setRemoveCardReminder(ui->removeCardNotificationCheckbox->isChecked());
+    AppSetting->setDontAskWhenSavingScreenshots(ui->dontAskWhenSavingScreenshotsCheckbox->isChecked());
 
     AppSetting->setCacheSessions(ui->cacheSessionData->isChecked());
     profile->session->setPreloadSummaries(ui->preloadSummaries->isChecked());

oscar/preferencesdialog.ui

@@ -2003,6 +2003,13 @@ Mainly affects the importer.</string>
               </property>
              </widget>
             </item>
+            <item row="3" column="1">
+             <widget class="QCheckBox" name="dontAskWhenSavingScreenshotsCheckbox">
+              <property name="text">
+               <string>Always save screenshots in the OSCAR Data folder</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>