Merge branch 'lan-alpha' of https://gitlab.com/eliggett/wfview into lan-alpha

Info.plist

@@ -0,0 +1,28 @@
+<?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>wfview</string>
+	<key>CFBundleIconFile</key>
+	<string>wfview.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.wfview.wfview</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.13</string>
+	<key>NOTE</key>
+	<string>Open Source interface for Icom transceivers</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+        <key>NSMicrophoneUsageDescription</key>
+        <string>Microphone required for TX audio</string>
+        <key>NSDownloadsFolderUsageDescription</key>
+        <string>Storing temporary files</string>
+</dict>
+</plist>

main.cpp

@@ -28,7 +28,11 @@ int main(int argc, char *argv[])
     QString serialPortCL;
     QString hostCL;
     QString civCL;
+#ifdef Q_OS_MAC
+    QString logFilename= QStandardPaths::standardLocations(QStandardPaths::DownloadLocation)[0] + "/wfview.log";
+#else
     QString logFilename= QStandardPaths::standardLocations(QStandardPaths::TempLocation)[0] + "/wfview.log";
+#endif
 
     QString currentArg;
 

wfmain.cpp

@@ -193,7 +193,11 @@ wfmain::wfmain(const QString serialPortCL, const QString hostCL, QWidget *parent
     }
 #else
     // Provide reasonable names for the symbolic link to the pty device
+#ifdef Q_OS_MAC
+    QString vspName = QStandardPaths::standardLocations(QStandardPaths::DownloadLocation)[0] + "/rig-pty";
+#else
     QString vspName=QDir::homePath()+"/rig-pty";
+#endif
     for (i=1;i<8;i++) {
         ui->vspCombo->addItem(vspName + QString::number(i));
 

wfview.entitlements

@@ -0,0 +1,22 @@
+<?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>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.device.audio-input</key>
+	<true/>
+	<key>com.apple.security.device.bluetooth</key>
+	<true/>
+	<key>com.apple.security.device.usb</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.files.downloads.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>

wfview.pro

@@ -36,8 +36,14 @@ DEFINES += RANDOM_PREFIX=wf
 macx:INCLUDEPATH += /usr/local/include /opt/local/include
 macx:LIBS += -L/usr/local/lib -L/opt/local/lib
 
-macx:ICON = wfview.icns
+macx:ICON = ../wfview/wfview.icns
+
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
+QMAKE_TARGET_BUNDLE_PREFIX = org.wfview
+MY_ENTITLEMENTS.name = CODE_SIGN_ENTITLEMENTS
+MY_ENTITLEMENTS.value = ../wfview/wfview.entitlements
+QMAKE_MAC_XCODE_SETTINGS += MY_ENTITLEMENTS
+QMAKE_INFO_PLIST = ../wfview/Info.plist
 
 !win32:DEFINES += HOST=\\\"`hostname`\\\" UNAME=\\\"`whoami`\\\"