Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be configurable.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updating the linux packages at https://build.opensuse.org/package/show/home:dg0yt/cloudlogoffline was unaffected because these packages are still built with qmake...

BUNDLE DESTINATION ${CMAKE_SOURCE_DIR}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be configurable.
Source dirs should be considered immutable.

)


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()
3 changes: 3 additions & 0 deletions CloudLogOffline.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ios/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions macos/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions qml/ExportView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Page {

function onUploadFailed(error) {
cloudLogMessage.text = error
console.log(error)
cloudLogMessage.open()
}
}
Expand Down
9 changes: 6 additions & 3 deletions qml/Main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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)))
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -234,6 +236,7 @@ ApplicationWindow {
}

ListElement {
pageCommand: "repeater"
pageTitle: qsTr ("Add Repeater QSO")
pageIcon: "\uf055"
onTriggered: function() {
Expand Down
1 change: 1 addition & 0 deletions qml/PageDrawer.qml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ Drawer {
model: items
width: parent.width
pageSelector: listView
visible: pageCommand !== "repeater" || settings.rbActive

onClicked: {
if (listView.currentIndex !== index)
Expand Down
4 changes: 2 additions & 2 deletions qml/QSOItem.qml
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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
}
Expand Down
Loading