Merge branch 'master' into prs1-overhaul

Building/Icons/README

@@ -1,7 +1,13 @@
+All icon and other PNG files are derived from a Photoshop file.  The Photoshop
+file has multiple layers, which need to be enabled or disabled when producing
+the various PNG files.  A full description of which layers need to be adjusted
+is in Photshop Notes.xlsm, an Excel worksheet.
 
+Smaller icons require manual editing for best appearance.
 
-
-Windows .ico file should contain 16x16, 32x32, 48x48, and 256x256 images.
+Windows .ico file should contain 16x16, 32x32, 48x48, and 256x256 images.  We
+also include 24x24 for Windows XP compatibility.
+A .ico file can be built at the website icoconvert.com.
 
 MacOS .icns file should contain:
 
@@ -10,4 +16,6 @@ MacOS .icns file should contain:
     256px в 256px (256pt в 256pt @1x) 	512px в 512px (256pt в 256pt @2x)
     128px в 128px (128pt в 128pt @1x) 	256px в 256px (128pt в 128pt @2x)
     32px в 32px (32pt в 32pt @1x) 	    64px в 64px (32pt в 32pt @2x)
-    16px × 16px (16pt × 16pt @1x) 	    32px × 32px (16pt × 16pt @2x)
+    16px × 16px (16pt × 16pt @1x) 	    32px × 32px (16pt × 16pt @2x)
+	
+The .icns file can be edited on Windows using the Greenfish Icon Editor.

Building/MacOS/Info.plist.in

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>OSCAR</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Created by Qt/QMake</string>
+	<key>CFBundleIconFile</key>
+  <string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
+	<key>CFBundleIdentifier</key>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSMinimumSystemVersion</key>
+  <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+	<key>NSRequiresAquaSystemAppearance</key>
+	<true/>
+</dict>
+</plist>

OSCAR_QT.pro

@@ -10,3 +10,7 @@ TEMPLATE = subdirs
 SUBDIRS += oscar
 
 CONFIG += ordered
+
+macx: {
+    QMAKE_INFO_PLIST = Building/MacOS/Info.plist.in
+}

oscar/mainwindow.cpp

@@ -117,10 +117,9 @@ void MainWindow::SetupGUI()
     setWindowTitle(STR_TR_OSCAR + QString(" %1").arg(version));
 
 #ifdef Q_OS_MAC
-
     ui->action_About->setMenuRole(QAction::ApplicationSpecificRole);
     ui->action_Preferences->setMenuRole(QAction::ApplicationSpecificRole);
-    ui->action_Exit->setMenuRole(QAction::ApplicationSpecificRole);
+    ui->action_Preferences->setShortcuts(QKeySequence::Preferences);
 #endif
 
     ui->actionToggle_Line_Cursor->setChecked(AppSetting->lineCursorMode());
@@ -1346,37 +1345,25 @@ void MainWindow::on_actionCheck_for_Updates_triggered()
 bool toolbox_visible = false;
 void MainWindow::on_action_Screenshot_triggered()
 {
-    daily->hideSpaceHogs();
+    if (daily)
+        daily->hideSpaceHogs();
     toolbox_visible = ui->toolBox->isVisible();
     ui->toolBox->hide();
     QTimer::singleShot(250, this, SLOT(DelayedScreenshot()));
 }
+
 void MainWindow::DelayedScreenshot()
 {
     // Make sure to scale for high resolution displays (like Retina)
    // qreal pr = devicePixelRatio();
 
-
-    QScreen * screen = QApplication::primaryScreen();
-
-
-    int titleBarHeight = -QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight);
-#ifdef Q_OS_WIN
-    titleBarHeight += 6;
-#endif
-
-    QPixmap pixmap = screen->grabWindow(winId(),0,titleBarHeight);
-
-/*#if defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_HAIKU)
-     // grab the whole screen
-    grab()
-     QPixmap desktop = QPixmap::grabWindow(QApplication::desktop()->winId());
-
-     QPixmap pixmap = desktop.copy(x() * pr, y() * pr, (width()+6) * pr, (height()+22) * pr);
-
-#elif defined(Q_OS_MAC)
-    QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), width() / pr, (height() / pr) + 10);
-#endif */
+    auto screenshotRect = geometry();
+    auto titleBarHeight = QApplication::style()->pixelMetric(QStyle::PM_TitleBarHeight);
+    auto pixmap = QApplication::primaryScreen()->grabWindow(QDesktopWidget().winId(),
+                                                            screenshotRect.left(),
+                                                            screenshotRect.top() - titleBarHeight,
+                                                            screenshotRect.width(),
+                                                            screenshotRect.height() + titleBarHeight);
 
     QString a = p_pref->Get("{home}/Screenshots");
     QDir dir(a);
@@ -1394,7 +1381,8 @@ void MainWindow::DelayedScreenshot()
     } else {
         Notify(tr("Screenshot saved to file \"%1\"").arg(QDir::toNativeSeparators(a)));
     }
-    daily->showSpaceHogs();
+    if (daily)
+        daily->showSpaceHogs();
     ui->toolBox->setVisible(toolbox_visible);
 
 }

oscar/preferencesdialog.ui

@@ -797,7 +797,7 @@ If you use a few different masks, pick average values instead. It should still b
                <string>Your masks vent rate at 20 cmH2O pressure</string>
               </property>
               <property name="minimum">
-               <number>400</number>
+               <number>300</number>
               </property>
               <property name="maximum">
                <number>550</number>
@@ -853,7 +853,7 @@ If you use a few different masks, pick average values instead. It should still b
                <string>Your masks vent rate at 4 cmH2O pressure</string>
               </property>
               <property name="minimum">
-               <number>170</number>
+               <number>120</number>
               </property>
               <property name="maximum">
                <number>240</number>