Merge pull request #131 from myzinsky/prepare-for-1.6.1

Prepare for 1.6.1

Author: myzinsky

CMakeLists.txt

@@ -100,11 +100,20 @@ if(NOT ANDROID AND NOT IOS)
     target_link_libraries(CloudLogOffline PRIVATE Qt::Widgets) # Cf. main.cpp
 endif()
 
-install(TARGETS CloudLogOffline)
+install(
+    TARGETS CloudLogOffline
+    RUNTIME DESTINATION .
+    BUNDLE DESTINATION ${CMAKE_SOURCE_DIR}
+)
 
 
 option(BUILD_TESTING "Build tests" ON)
 if(BUILD_TESTING)
     enable_testing()
     add_subdirectory(tests)
 endif()
+
+## This is required for localization permissions to work
+if(QT_VERSION_MAJOR EQUAL 6)
+    qt_finalize_executable(${TARGET})
+endif()

CloudLogOffline.pro

@@ -19,6 +19,9 @@ QT += core
 # cf. main.cpp
 !android:!ios: QT += widgets
 
+QMAKE_IOS_DEPLOYMENT_TARGET = 17
+
+
 CONFIG += c++14
 
 DEFINES += QT_DEPRECATED_WARNINGS

ios/Info.plist

@@ -24,10 +24,10 @@
 	<string>${IPHONEOS_DEPLOYMENT_TARGET}</string>
 	<key>NOTE</key>
 	<string>This file was generated by Qt/QMake.</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>The location is utilized to identify repeaters in the Hear-Ham database that are in close proximity to your current position.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-        <string>The location is utilized to identify repeaters in the Hear-Ham database that are in close proximity to your current position.</string>
-        <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-        <string>The location is utilized to identify repeaters in the Hear-Ham database that are in close proximity to your current position.</string>
+	<string>The location is utilized to identify repeaters in the Hear-Ham database that are in close proximity to your current position.</string>
 	<key>UILaunchStoryboardName</key>
 	<string>myLaunchScreen.xib</string>
 	<key>UIRequiresFullScreen</key>

macos/Info.plist

@@ -26,6 +26,8 @@
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
+        <key>CFBundleAllowMixedLocalizations</key>
+        <true/>
         <key>NSLocationWhenInUseUsageDescription</key>
         <string>Locating repeaters near your location</string>
 </dict>

qml/ExportView.qml

@@ -25,6 +25,7 @@ Page {
 
         function onUploadFailed(error) {
             cloudLogMessage.text = error
+            console.log(error)
             cloudLogMessage.open()
         }
     }

qml/Main.qml

@@ -26,7 +26,8 @@ ApplicationWindow {
         onTriggered: {
             console.log("Orientation changed")
             console.log("safe margins =", JSON.stringify(tools.getSafeAreaMargins(window)))
-            notchTop   = tools.getSafeAreaMargins(window)["top"]
+            //notchTop   = tools.getSafeAreaMargins(window)["top"]
+            notchTop = 0
             notchLeft  = tools.getSafeAreaMargins(window)["left"]
             notchRight = tools.getSafeAreaMargins(window)["right"]
             safeWidth  = window.width - tools.getSafeAreaMargins(window)["left"] - tools.getSafeAreaMargins(window)["right"]
@@ -40,7 +41,7 @@ ApplicationWindow {
 
     Component.onCompleted:  {
         tm.switchToLanguage(settings.language)
-        notchTop = tools.getSafeAreaMargins(window)["top"] // iPhoneX workaround
+        //notchTop = tools.getSafeAreaMargins(window)["top"] // iPhoneX workaround
 
         console.log("load settings.language:" + settings.language)
         console.log("safe margins =", JSON.stringify(tools.getSafeAreaMargins(window)))
@@ -116,7 +117,8 @@ ApplicationWindow {
     header: ToolBar {
         contentHeight: toolButton.implicitHeight + notchTop // iPhone X Workaround
 
-        Material.primary: Material.BlueGrey
+        //Material.primary: Material.BlueGrey
+        Material.primary:  Material.color(Material.BlueGrey, Material.Shade500)
 
         ToolButton {
             id: toolButton
@@ -234,6 +236,7 @@ ApplicationWindow {
             }
 
             ListElement {
+                pageCommand: "repeater"
                 pageTitle: qsTr ("Add Repeater QSO")
                 pageIcon: "\uf055"
                 onTriggered: function() {

qml/PageDrawer.qml

@@ -191,6 +191,7 @@ Drawer {
                 model: items
                 width: parent.width
                 pageSelector: listView
+                visible: pageCommand !== "repeater" || settings.rbActive
 
                 onClicked: {
                     if (listView.currentIndex !== index)

qml/QSOItem.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
+import QtQuick.Controls.Material 2.4
 import Qt5Compat.GraphicalEffects
 
 SwipeDelegate {
@@ -45,7 +45,7 @@ SwipeDelegate {
                 anchors.topMargin: 5
                 font.wordSpacing: 0
                 font.capitalization: Font.Capitalize
-                color: "#607D8B"
+                color: Material.color(Material.BlueGrey, Material.Shade400)
                 font.pixelSize: 20
                 font.bold: true
             }