harbour-allradio.pro

@@ -29,7 +29,6 @@ DISTFILES += qml/harbour-allradio.qml \
     qml/pages/SearchStationsPage.qml \
     qml/pages/SecondPage.qml \
     qml/pages/SettingsPage.qml \
-    qml/pages/SettingsPage__.qml \
     qml/pages/TagListPage.qml \
     rpm/harbour-allradio.spec \
     translations/*.ts \

qml/harbour-allradio.qml

@@ -9,7 +9,7 @@ import "helpers"
 ApplicationWindow
 {
     id: allRadio
-    property string _version: "2.0.18"
+    property string _version: "2.0.17"
     property string _language: Qt.locale().name.slice(0,2)
     property string _country: Qt.locale().name.slice(-2)
     property int sleepTime: 0

qml/items/RadioPlayer.qml

@@ -229,7 +229,6 @@ MediaPlayer {
         isPaused = false
         qdTimer.start()
         if (_favorite) Favorites.setSetting("playlistIndex",playlistIndex)
-        //appStartPlay = false
     }
 
     function tryagain() {

qml/items/Splash.qml

@@ -6,6 +6,7 @@ import QtGraphicalEffects 1.0
 Column {
     id: column
     spacing: Theme.paddingMedium
+    //property alias busy: busyIndicator.running
     anchors.centerIn: parent
 
     Image {
@@ -20,32 +21,27 @@ Column {
             source: parent
             color: Theme.highlightColor
         }
+     //   BusyIndicator {
+     //       size: BusyIndicatorSize.Large
+     //       anchors.centerIn: parent
+     //       running: parent.visible
+     //   }
     }
 
-    BusyLabel {
+    Label {
-        text: radioBrowser.serversModel.count > 0 ? qsTr("Found")+": "+radioBrowser.serversModel.count + " "+qsTr("servers") : qsTr("Searching servers")
+        text: radioBrowser.serversModel.count > 0 ? qsTr("Found")+": "+radioBrowser.serversModel.count + " "+qsTr("servers") : qsTr("Searching for servers...")
-        running: radioBrowser.serversModel.count < 1
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-    BusyLabel {
-        visible: radioBrowser.serversModel.count > 0
-        running: visible
-        text: qsTr("Connecting to:")
         anchors.horizontalCenter: parent.horizontalCenter
     }
     Label {
         visible: radioBrowser.serversModel.count > 0
+        text: qsTr("Connecting to:")
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+    Label {
         text: radioBrowser.server
         font.pixelSize: Theme.fontSizeSmall
         color: Theme.highlightColor
         anchors.horizontalCenter: parent.horizontalCenter
     }
-    Button {
-        visible: radioBrowser.serversModel.count > 1
-        anchors.topMargin: Theme.paddingLarge
-        text: "Try another server"
-        onClicked: radioBrowser.getRandom()
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
 
 }

qml/pages/AllRadio.qml

@@ -14,10 +14,8 @@ Page {
     anchors.fill: parent
     anchors.bottomMargin: mediaPlayerPanel.visibleSize
 
-    property int _appStart: Favorites.getSetting("appStart",0)
     property bool stationOk: radioPlayer.stationOk
     property bool online: radioBrowser.online
-    property bool _loading: radioBrowser.loading
     property GetCountryStations getTrending1: GetCountryStations {id: getTrending1}
     property GetCountryStations getTrending2: GetCountryStations {id: getTrending2}
     property GetCountryStations getTrendingWorld: GetCountryStations {id: getTrendingWorld}
@@ -30,12 +28,6 @@ Page {
 
     onOnlineChanged: if (online) reloadDbData()
     onStationOkChanged: if (stationOk) reloadDbData()
-    on_LoadingChanged: {
-        if (!_loading) {
-            appAutoPlay()
-            console.log(" *** AUTOPLAY")
-        } else console.log(" *** INTE AUTOPLAY")
-    }
 
     Splash {
         id: splashItem
@@ -396,24 +388,6 @@ Page {
         }
     }
 
-    function appAutoPlay() {
-        console.log( "*** appStart: "+_appStart )
-        switch (_appStart) {
-            case 0:
-                break;
-            case 1:
-                radioPlayer.loadRecentPlay()
-                radioPlayer.playStream()
-                break;
-            case 2:
-                radioPlayer.loadRandomPlay()
-                radioPlayer.playStream()
-                break;
-            default:
-                break;
-        }
-    }
-
     function reloadDbData() {
         Favorites.getTagsRecentClicked(playedTags,15)
         Favorites.getFavorites(favorites,"myclickcount",15)

qml/pages/RadioPlayerPage.qml

@@ -7,7 +7,7 @@ import "../helpers/jsFunctions.js" as JSfunctions
 
 Page {
     id: page
-    property bool keepScreenOn: Qt.application.active && radioPlayer.isPlaying && radioPlayer.radioVideo ? true : false
+    property bool keepScreenOn: Qt.application.active && radioPlayer.isPlaying ? true : false
 
     allowedOrientations: radioPlayer.isPlaying && radioPlayer.radioVideo ? Orientation.All : Orientation.Portrait
 

qml/pages/SearchStationsPage.qml

@@ -197,7 +197,7 @@ Page {
                 if (model.url_resolved !== radioPlayer._url_resolved) {
                     radioPlayer._favicon = model.favicon
                     radioPlayer._name = model.name
-                    radioPlayer._cc = model.countrycode
+                    radioPlayer._countrycode = model.countrycode
                     radioPlayer._tags = model.tags
                     radioPlayer._codec = model.codec//getCodec(model.codec)
                     radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)

qml/pages/SettingsPage.qml

@@ -1,62 +1,56 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
 import QtQuick.LocalStorage 2.0
-import QtGraphicalEffects 1.0
 import "../helpers/db.js" as Favorites
 
-Dialog {
+Page {
-    id: settingsDialog
+    Flickable {
- //   property bool aComp
+        id: flick
-  //  property bool aMag
+        width:parent.width
-  //  property int aR: anchorRadius
+        height: parent.height - Theme.paddingLarge * 3
+        anchors.top: parent.top
+        anchors.topMargin: Theme.paddingLarge * 3
+        contentHeight: column1.height
 
-    Column {
+        Column{
-        //id: col1
+            id: column1
-        anchors.left: parent.left
-        anchors.right: parent.right
-        spacing: Theme.paddingMedium
-
-        DialogHeader {}
-
-        Label {
-            anchors.right: parent.right
-            anchors.rightMargin: Theme.paddingLarge
-            color: Theme.highlightColor
-            font.pixelSize: Theme.fontSizeLarge
-            text: qsTr("App settings")
-        }
-
-        Separator {
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: Theme.paddingMedium
-            color: Theme.highlightColor
-        }
-
-        ComboBox {
-            id: appStart
             width: parent.width
-            label: "Auto play"
+            spacing: Theme.paddingLarge
-            anchors.margins: Theme.paddingLarge
+
-            description: "What to do when AllRadio2 starts"
+            Image{
-            currentIndex: Favorites.getSetting("appStart",0)
+                source: "../images/community.png"
-            menu: ContextMenu {
+                height: Theme.itemSizeHuge
-                MenuItem { text: "Off" }
+                width: height
-                MenuItem { text: "Last played" }
+                fillMode: Image.PreserveAspectFit
-                MenuItem { text: "Random favorite" }
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Label {
+                width: parent.width-70
+                font.pixelSize: Theme.fontSizeSmall
+                text: qsTr("Working on more settings.....")
+                anchors.horizontalCenter: parent.horizontalCenter
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignHCenter
+                height: 200
+                wrapMode: Text.WordWrap
+            }
+            Label {
+                width: parent.width-70
+                font.pixelSize: Theme.fontSizeLarge
+                text: qsTr("WARNING! THis is for debugging or corrupt database. Only delete db if it is not working!!!")
+                anchors.horizontalCenter: parent.horizontalCenter
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignHCenter
+                wrapMode: Text.WordWrap
+            }
+            Button {
+                text: qsTr("Delete DB")
+                onClicked: Favorites.dropTable()
+                anchors.horizontalCenter: parent.horizontalCenter
             }
         }
     }
-
-    onAccepted: {
-        //console.log(" *** APPSTART: "+appStart.currentIndex)
-        Favorites.setSetting("appStart",appStart.currentIndex)
-      /*  activateNumbers.checked ? showCompasNumbers = 1 : showCompasNumbers = 0
-        var scron
-        keepSon.checked ? scron = 1 : scron = 0
-        keepScreenOn = keepSon.checked
-        settings.setSettingSetting(aComp,aMag,aR,showCompasNumbers,scron)
-        anchorRadius = aR */
-    }
 }
-

qml/pages/SettingsPage__.qml

@@ -1,59 +0,0 @@
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-import QtQuick.LocalStorage 2.0
-import QtGraphicalEffects 1.0
-import "../helpers/db.js" as Favorites
-
-Page {
-    PageHeader {
-        id: pheader
-        title: "Settings"
-    }
-
-    Flickable {
-        id: flick
-        width:parent.width
-        height: parent.height - Theme.paddingLarge * 3
-        anchors.fill: parent
-        anchors.leftMargin: Theme.paddingLarge
-        anchors.rightMargin: Theme.paddingLarge
-        anchors.topMargin: pheader.height + Theme.paddingLarge
-        //contentHeight: column1.height
-
-
-
-            TextSwitch {
-                id: activationSwitch
-                text: "Auto play"
-                description: "Play radio station on start"
-                onCheckedChanged: {
-                    device.setStatus(checked ? DeviceState.Armed : DeviceState.Disarmed)
-                }
-            }
-            ComboBox {
-                 width: parent.widht
-                 label: "What to play"
-                 menu: ContextMenu {
-                     MenuItem { text: "Last played" }
-                     MenuItem { text: "Random favorite" }
-                 }
-             }
-
-
-            /*         Label {
-                width: parent.width-70
-                font.pixelSize: Theme.fontSizeLarge
-                text: qsTr("WARNING! THis is for debugging or corrupt database. Only delete db if it is not working!!!")
-                anchors.horizontalCenter: parent.horizontalCenter
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignHCenter
-                wrapMode: Text.WordWrap
-            }
-            Button {
-                text: qsTr("Delete DB")
-                onClicked: Favorites.dropTable()
-                anchors.horizontalCenter: parent.horizontalCenter
-            } */
-
-    }
-}

rpm/harbour-allradio.spec

@@ -1,10 +1,10 @@
 Name:       harbour-allradio
 
 Summary:    AllRadio
-Version:    2.0.18
+Version:    2.0.17
 Release:    1
 Group:      Qt/Qt
-License:    GPLv2
+License:    GPL2
 URL:        https://gitea.nesnomis.nu/nesnomis/harbour-allradio/
 Source0:    %{name}-%{version}.tar.bz2
 Requires:   sailfishsilica-qt5 >= 0.10.9
@@ -29,9 +29,6 @@ BuildRequires:  pkgconfig(dbus-1)
 AllRadio2 is a new version of AllRadio, an internet radio player.
 
 %if "%{?vendor}" == "chum"
-PackageName: AllRadio2
-Type: desktop-application
-PackagerName: Niels Simonsen (nesnomis)
 Categories:
  - Multimedia
 Icon: https://gitea.nesnomis.nu/nesnomis/harbour-allradio/src/branch/master/icons/128x128/harbour-allradio.png
@@ -42,7 +39,7 @@ Screenshots:
 - https://gitea.nesnomis.nu/nesnomis/harbour-allradio/wiki/raw/Screenshot_20250522_222316_001.png
 - https://gitea.nesnomis.nu/nesnomis/harbour-allradio/wiki/raw/Screenshot_20250522_222349_001.png
 Url:
-  Homepage: http://gitea.nesnomis.nu/nesnomis/harbour-allradio
+  Homepage: https://openrepos.net/content/nesnomis/allradio2
 %endif
 
 %prep

translations/harbour-allradio-de.ts

@@ -1134,7 +1134,15 @@
 <context>
     <name>SettingsPage</name>
     <message>
-        <source>App settings</source>
+        <source>Working on more settings.....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING! THis is for debugging or corrupt database. Only delete db if it is not working!!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete DB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1183,7 +1191,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching servers</source>
+        <source>Searching for servers...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

translations/harbour-allradio.ts

@@ -1134,7 +1134,15 @@
 <context>
     <name>SettingsPage</name>
     <message>
-        <source>App settings</source>
+        <source>Working on more settings.....</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING! THis is for debugging or corrupt database. Only delete db if it is not working!!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete DB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1183,7 +1191,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching servers</source>
+        <source>Searching for servers...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>