diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 29fa073..aa67130 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ - - + + diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png index 453edb5..c5dc264 100644 Binary files a/android/res/drawable-hdpi/icon.png and b/android/res/drawable-hdpi/icon.png differ diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png index 185039d..a8a447b 100644 Binary files a/android/res/drawable-ldpi/icon.png and b/android/res/drawable-ldpi/icon.png differ diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png index 56a53ec..39fe181 100644 Binary files a/android/res/drawable-mdpi/icon.png and b/android/res/drawable-mdpi/icon.png differ diff --git a/android/res/drawable-xhdpi/icon.png b/android/res/drawable-xhdpi/icon.png index 868a90d..79a2ae2 100644 Binary files a/android/res/drawable-xhdpi/icon.png and b/android/res/drawable-xhdpi/icon.png differ diff --git a/android/res/drawable-xxhdpi/icon.png b/android/res/drawable-xxhdpi/icon.png index 742c683..a8ead3d 100644 Binary files a/android/res/drawable-xxhdpi/icon.png and b/android/res/drawable-xxhdpi/icon.png differ diff --git a/android/res/drawable-xxxhdpi/icon.png b/android/res/drawable-xxxhdpi/icon.png index 4768c54..cd27d5a 100644 Binary files a/android/res/drawable-xxxhdpi/icon.png and b/android/res/drawable-xxxhdpi/icon.png differ diff --git a/ios/Info.plist b/ios/Info.plist index 716d7d9..6153ef4 100644 --- a/ios/Info.plist +++ b/ios/Info.plist @@ -15,19 +15,21 @@ CFBundlePackageType APPL CFBundleShortVersionString - ${QMAKE_SHORT_VERSION} + $(MARKETING_VERSION) CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - ${QMAKE_FULL_VERSION} + $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS MinimumOSVersion ${IPHONEOS_DEPLOYMENT_TARGET} NOTE This file was generated by Qt/QMake. + NSLocationWhenInUseUsageDescription + Locating repeaters near your location UILaunchStoryboardName - myLaunchScreen + myLaunchScreen UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -35,7 +37,5 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - NSLocationWhenInUseUsageDescription - Locating repeaters near your location diff --git a/qml/AboutView.qml b/qml/AboutView.qml index 61080d3..bd522d6 100644 --- a/qml/AboutView.qml +++ b/qml/AboutView.qml @@ -29,7 +29,7 @@ Page { text: "

About

CloudLogApp is developed by Web & App Dr.-Ing. Matthias Jung (DL9MJ), -http://www.webappjung.de/
" +http://www.webappjung.de/
. The repeater list is provided by https://hearham.com
" color: "white" } diff --git a/qml/RepeaterItem.qml b/qml/RepeaterItem.qml index 90ddd42..bbe2648 100644 --- a/qml/RepeaterItem.qml +++ b/qml/RepeaterItem.qml @@ -31,178 +31,160 @@ SwipeDelegate { height: 50 width: parent.width - Rectangle { - id: callcityrect - z: 100 - color: "#555555" - width: call.contentWidth + city.contentWidth + 10 - height: call.contentHeight - anchors.left: parent.left - anchors.leftMargin: 5 - anchors.top: parent.top - anchors.topMargin: 5 - Text { - id: call - text: model.call.replace(/0/g,"\u2205").toUpperCase() - font.underline: false - font.weight: Font.Bold - style: Text.Normal - font.wordSpacing: 0 - font.capitalization: Font.Capitalize - color: "#607D8B" - font.pixelSize: 20 - font.bold: true + MouseArea { + anchors.fill: parent + + Rectangle { + id: callcityrect + z: 100 + color: "#555555" + width: call.contentWidth + city.contentWidth + 10 + height: call.contentHeight + anchors.left: parent.left + anchors.leftMargin: 5 + anchors.top: parent.top + anchors.topMargin: 5 + Text { + id: call + text: model.call.replace(/0/g,"\u2205").toUpperCase() + font.underline: false + font.weight: Font.Bold + style: Text.Normal + font.wordSpacing: 0 + font.capitalization: Font.Capitalize + color: "#607D8B" + font.pixelSize: 20 + font.bold: true + } + + Text { + id: city + anchors.top: parent.top + anchors.left: call.right + anchors.leftMargin: 10 + color: "#ffffff" + text: model.city + font.italic: true + font.bold: false + font.wordSpacing: 0 + opacity: 0.87 + font.pixelSize: 20 + } } - Text { - id: city + Rectangle { + id: gradient + z: 100 + color: "transparent" anchors.top: parent.top - anchors.left: call.right - anchors.leftMargin: 10 + anchors.left: callcityrect.right + anchors.topMargin: 5 + anchors.leftMargin: 0 + height: city.contentHeight + width: 50 + LinearGradient { + anchors.fill: parent + start: Qt.point(0,0) + end: Qt.point(gradient.width,0) + gradient: Gradient { + GradientStop { position: 0.0; color: "#555555" } + GradientStop { position: 0.5; color: "#555555" } + GradientStop { position: 1.0; color: "transparent" } + } + } + } + + Text { + id: modes + z: 50 color: "#ffffff" - text: model.city - font.italic: true + text: model.mode + anchors.rightMargin: 10 + font.italic: false font.bold: false + anchors.top: parent.top + anchors.right: parent.right + anchors.topMargin: 5 font.wordSpacing: 0 opacity: 0.87 font.pixelSize: 20 } - } - Rectangle { - id: gradient - z: 100 - color: "transparent" - anchors.top: parent.top - anchors.left: callcityrect.right - anchors.topMargin: 5 - anchors.leftMargin: 0 - height: city.contentHeight - width: 50 - LinearGradient { - anchors.fill: parent - start: Qt.point(0,0) - end: Qt.point(gradient.width,0) - gradient: Gradient { - GradientStop { position: 0.0; color: "#555555" } - GradientStop { position: 0.5; color: "#555555" } - GradientStop { position: 1.0; color: "transparent" } - } - } - } + Text { + id: freq + text: model.freq + " MHz" + anchors.left: parent.left + anchors.leftMargin: 5 + anchors.top: parent.top + anchors.topMargin:30 + anchors.verticalCenter: parent.verticalCenter + color: "white" + opacity: 0.87 - Text { - id: modes - z: 50 - color: "#ffffff" - text: model.mode - anchors.rightMargin: 10 - font.italic: false - font.bold: false - anchors.top: parent.top - anchors.right: parent.right - anchors.topMargin: 5 - font.wordSpacing: 0 - opacity: 0.87 - font.pixelSize: 20 - } + } - Text { - id: freq - text: model.freq + " MHz" - anchors.left: parent.left - anchors.leftMargin: 5 - anchors.top: parent.top - anchors.topMargin:30 - anchors.verticalCenter: parent.verticalCenter - color: "white" - opacity: 0.87 + Text { + id: shift + text: model.shif + " MHz" + anchors.top: parent.top + anchors.topMargin: 30 + anchors.left: freq.right + anchors.leftMargin: 10 + color: "white" + opacity: 0.87 + } - } + Text { + id: tone + text: model.tone + (model.tone !== "" ? " Hz" : "") + anchors.top: parent.top + anchors.topMargin: 30 + anchors.left: shift.right + anchors.leftMargin: 10 + color: "white" + opacity: 0.87 + } - Text { - id: shift - text: model.shif + " MHz" - anchors.top: parent.top - anchors.topMargin: 30 - anchors.left: freq.right - anchors.leftMargin: 10 - color: "white" - opacity: 0.87 - } + Text { + id: dist + text: Number(model.dist).toFixed(2) + " km" + anchors.top: parent.top + anchors.topMargin: 30 + anchors.right: parent.right + anchors.rightMargin: 10 + color: "white" + opacity: 0.87 + } - Text { - id: tone - text: model.tone + (model.tone !== "" ? " Hz" : "") - anchors.top: parent.top - anchors.topMargin: 30 - anchors.left: shift.right - anchors.leftMargin: 10 - color: "white" - opacity: 0.87 - } - Text { - id: dist - text: Number(model.dist).toFixed(2) + " km" - anchors.top: parent.top - anchors.topMargin: 30 - anchors.right: parent.right - anchors.rightMargin: 10 - color: "white" - opacity: 0.87 - } - } - } + onClicked: { + swipe.close() - swipe.right: Rectangle { - width: 50 - height: 50 - anchors.right: parent.right - anchors.rightMargin: 0 - clip: true - color: Material.color(Material.BlueGrey) - MouseArea { - id: edit - anchors.fill: parent - - Text { - font.family: fontAwesome.name - text: "\uf055" - font.pixelSize: Qt.application.font.pixelSize * 1.6 - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - color: "#ffffff" - opacity: 0.87 - } - onClicked: { - swipe.close() + var strippedMode = "" - var strippedMode = "" + if(mode.includes("FM")) { + strippedMode = "FM"; + } else if(mode.includes("DMR")) { + strippedMode = "DMR"; + } else if(mode.includes("Wires")) { + strippedMode = "C4FM"; + } else if(mode.includes("D-Star")) { + strippedMode = "DSTAR"; + } - if(mode.includes("FM")) { - strippedMode = "FM"; - } else if(mode.includes("DMR")) { - strippedMode = "DMR"; - } else if(mode.includes("Wires")) { - strippedMode = "C4FM"; - } else if(mode.includes("D-Star")) { - strippedMode = "DSTAR"; + stackView.push("QSOViewWrapper.qml", { + "addQSO" : true, + "liveQSO" : true, + "updateQSO" : false, + "mode" : strippedMode, + "freq" : model.freq, + "sent" : "5", + "recv" : "5", + "comm" : "Via Repeater: " + model.call, + }); } - - stackView.push("QSOViewWrapper.qml", { - "addQSO" : true, - "liveQSO" : true, - "updateQSO" : false, - "mode" : strippedMode, - "freq" : model.freq, - "sent" : "5", - "recv" : "5", - "comm" : "Via Repeater: " + model.call, - }); } } } - } diff --git a/qml/SettingsView.qml b/qml/SettingsView.qml index 51f7dce..9cfdc1a 100644 --- a/qml/SettingsView.qml +++ b/qml/SettingsView.qml @@ -435,7 +435,7 @@ Page { SettingsSwitch { id: rbSwitch icon: "\uf519" - text: qsTr("Repeater Book") + text: qsTr("Hear HAM Repeater List") helpText: qsTr("Activate this to see repeaters near to you") Layout.columnSpan: 2 checked: settings.rbActive diff --git a/src/translationmanager.cpp b/src/translationmanager.cpp index 65b2cf9..e048873 100644 --- a/src/translationmanager.cpp +++ b/src/translationmanager.cpp @@ -17,11 +17,11 @@ void translationManager::switchToLanguage(const QString &language) bool success = translator->load(language); if(success == true) { // Search for iOS: - qDebug() << "Language Switched: " << language; + qDebug() << "Language Switched iOS: " << language; } else { // Search for Android again: success = translator->load(":/translations/"+language+".qm"); if(success == true) { - qDebug() << "Language Switched: " << language; + qDebug() << "Language Switched Android: " << language; } else { qDebug() << "Language File Not Found: " << language; } diff --git a/translations/English.ts b/translations/English.ts index e7265aa..22e7655 100644 --- a/translations/English.ts +++ b/translations/English.ts @@ -372,11 +372,11 @@ RepeaterListView - Repeater Book + No repeaters found: No GPS or no radius defined in settings! - No repeaters found: No GPS or no radius defined in settings! + Hear HAM Repeater List @@ -507,15 +507,15 @@ - Repeater Book + Activate this to see repeaters near to you - Activate this to see repeaters near to you + Radius - Radius + Hear HAM Repeater List diff --git a/translations/German.qm b/translations/German.qm index 771f786..9a73f20 100644 Binary files a/translations/German.qm and b/translations/German.qm differ diff --git a/translations/German.ts b/translations/German.ts index 487ce90..73e25ac 100644 --- a/translations/German.ts +++ b/translations/German.ts @@ -367,11 +367,11 @@ WWFF (S) - + WWFF (S) WWFF (R) - + WWFF (R) @@ -389,12 +389,16 @@ RepeaterListView Repeater Book - Repeater Book + Repeater Book No repeaters found: No GPS or no radius defined in settings! Keine Repeater gefunden: Kein GPS oder kein Radius in den Einstellungen konfiguriert! + + Hear HAM Repeater List + + SettingsView @@ -524,7 +528,7 @@ Repeater Book - Repeater Book + Repeater Book Activate this to see repeaters near to you @@ -540,10 +544,14 @@ World Wide Flora & Fauna (WWFF) - + World Wide Flora & Fauna (WWFF) Insert here youre WWFF reference + Bitte hier die WWFF Referenz hinzufügen + + + Hear HAM Repeater List