Small changes, and fixing for chum repo

LICENSE

@@ -0,0 +1,340 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Moe Ghoul>, 1 April 1989
+  Moe Ghoul, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
+ 

harbour-allradio.pro

@@ -17,6 +17,7 @@ CONFIG += sailfishapp
 SOURCES += src/harbour-allradio.cpp
 
 DISTFILES += qml/harbour-allradio.qml \
+    LICENSE \
     qml/cover/CoverPage.qml \
     qml/items/HeaderButton.qml \
     qml/items/RadioMprisPlayer.qml \
@@ -27,12 +28,12 @@ DISTFILES += qml/harbour-allradio.qml \
     qml/pages/FavoritesPage.qml \
     qml/pages/HistoryPage.qml \
     qml/pages/SearchStationsPage.qml \
-    qml/pages/SecondPage.qml \
     qml/pages/SettingsPage.qml \
     qml/pages/TagListPage.qml \
     rpm/harbour-allradio.spec \
     translations/*.ts \
-    harbour-allradio.desktop
+    harbour-allradio.desktop \
+    translations/harbour-allradio-sv.ts
 
 SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
 
@@ -40,8 +41,15 @@ SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
 # following CONFIG line
 CONFIG += sailfishapp_i18n
 
-# German translation is enabled as an example. If you aren't
-# planning to localize your app, remember to comment out the
-# following TRANSLATIONS line. And also do not forget to
-# modify the localized app name in the the .desktop file.
+# Translation files for the most downloaded countries on openrepos (except danish, i will translate that).
 TRANSLATIONS += translations/harbour-allradio-de.ts
+TRANSLATIONS += translations/harbour-allradio-sv.ts
+TRANSLATIONS += translations/harbour-allradio-da.ts
+TRANSLATIONS += translations/harbour-allradio-en.ts
+TRANSLATIONS += translations/harbour-allradio-es.ts
+TRANSLATIONS += translations/harbour-allradio-fi.ts
+TRANSLATIONS += translations/harbour-allradio-fr.ts
+TRANSLATIONS += translations/harbour-allradio-it.ts
+TRANSLATIONS += translations/harbour-allradio-pl.ts
+TRANSLATIONS += translations/harbour-allradio-ru.ts
+TRANSLATIONS += translations/harbour-allradio-uk.ts

qml/delegates/FavoriteStations.qml

@@ -171,7 +171,7 @@ ListItem {
             anchors.rightMargin: Theme.paddingMedium
             elide: Text.ElideRight
             width: parent.width - (favIcon.width + (Theme.paddingLarge * 2))
-            text: lastcheckok == "1" ? name : " [DOWN] "+name
+            text: lastcheckok == "1" ? name : " ["+qsTr("DOWN")+"] "+name
             color: lastcheckok == "1" ? Theme.primaryColor : Theme.secondaryColor
             font.strikeout: lastcheckok == "1" ? false : true
             font.pixelSize: Theme.fontSizeSmall

qml/delegates/RadioImage.qml

@@ -75,7 +75,7 @@ Column {
             elide: Text.ElideRight
             width: parent.width - (parent.border.width * 2)
             height: width
-            text: stationLabel ? stationLabel : "AllRadio"//lastcheckok == "1" ? name : " [DOWN] "+name
+            text: stationLabel ? stationLabel : "AllRadio2"//lastcheckok == "1" ? name : " [DOWN] "+name
             color: Theme.primaryColor//stationlabel === "1" ? Theme.lightPrimaryColor : Theme.secondaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 4

qml/delegates/SmallStationsDelegate.qml

@@ -23,7 +23,7 @@ ListItem {
             elide: Text.ElideRight
             width: stationimage.width
             height: Theme.itemSizeExtraSmall
-            text: lastcheckok === "1" ? name : " [DOWN] "+name
+            text: lastcheckok === "1" ? name : " "+qsTr([DOWN])+" "+name
             color: lastcheckok === "1" ? Theme.primaryColor : Theme.secondaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 2

qml/delegates/SmallTagsDelegate.qml

@@ -23,7 +23,7 @@ ListItem {
             elide: Text.ElideRight
             width: stationimage.width
             height: Theme.itemSizeExtraSmall
-            text: tag ? tag : "No Tag"
+            text: tag ? tag : qsTr("No Tag")
             color: Theme.primaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 2

qml/delegates/StationsDelegate.qml

@@ -84,7 +84,7 @@ ListItem {
             anchors.rightMargin: Theme.paddingMedium
             elide: Text.ElideRight
             width: parent.width - (favIcon.width + (Theme.paddingLarge * 2))
-            text: lastcheckok == "1" ? name : " [DOWN] "+name
+            text: lastcheckok == "1" ? name : " "+qsTr([DOWN])+" "+name
             color: lastcheckok == "1" ? Theme.primaryColor : Theme.secondaryColor
             font.strikeout: lastcheckok == "1" ? false : true
             font.pixelSize: Theme.fontSizeSmall
@@ -107,7 +107,7 @@ ListItem {
             anchors.leftMargin: Theme.paddingMedium
 
             font.pixelSize: Theme.fontSizeExtraSmall
-            text: countrycode ? radioBrowser.getCountryName(countrycode) : "No country"//"Country name"//getAll(hls,codec,bitrate)
+            text: countrycode ? radioBrowser.getCountryName(countrycode) : qsTr("No country")//"Country name"//getAll(hls,codec,bitrate)
             color: delegate.highlighted ? Theme.highlightColor : Theme.secondaryColor
         }
         Label {
@@ -117,7 +117,7 @@ ListItem {
             anchors.leftMargin: Theme.paddingLarge
             anchors.rightMargin: Theme.paddingSmall
             font.pixelSize: Theme.fontSizeExtraSmall
-            text: lastcheckok ? JSfunctions.getAll(hls,codec,bitrate) : "[OFFLINES]"
+            text: lastcheckok ? JSfunctions.getAll(hls,codec,bitrate) : qsTr("[OFFLINE]")
             color: delegate.highlighted ? Theme.highlightColor : Theme.secondaryColor
         }
         Label {

qml/delegates/TabDelegate.qml

@@ -16,7 +16,7 @@ Item {
             down: tab === 0
             width: parent.width / 3
          //   icon: "image://theme/icon-m-home" //"image://theme/icon-m-video"
-            text: "Favorites"
+            text: qsTr("Favorites")
             onButtonClick: {showP=0.0;tab = 0}
         }
         TabButton {
@@ -24,7 +24,7 @@ Item {
             down: tab === 1
             width: parent.width / 3
         //    icon: "image://theme/icon-m-search"
-            text: "History"
+            text: qsTr("History")
             onButtonClick: {showP=0.0;tab = 1}
         }
         TabButton {
@@ -32,7 +32,7 @@ Item {
             down: tab === 2
             width: parent.width / 3
          //   icon: "image://theme/icon-m-favorite"
-            text: "Search"
+            text: qsTr("Search")
             onButtonClick: {showP=0.0;tab = 2;console.log("CLICK")}
         }
     }

qml/delegates/TagImage.qml

@@ -69,7 +69,7 @@ Column {
             elide: Text.ElideRight
             width: parent.width - (parent.border.width * 2)
             height: width
-            text: stationLabel ? stationLabel : "No Tag"//lastcheckok == "1" ? name : " [DOWN] "+name
+            text: stationLabel ? stationLabel : qsTr("No Tag")//lastcheckok == "1" ? name : " [DOWN] "+name
             color: stationlabel === "1" ? Theme.lightPrimaryColor : Theme.secondaryColor
             wrapMode: Text.WordWrap
             maximumLineCount: 4

qml/harbour-allradio.qml

@@ -1,68 +1,60 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
-//import Nemo.Configuration 1.0 /////////
-import Nemo.Notifications 1.0 ///////////
+import Nemo.Notifications 1.0
 import Amber.Mpris 1.0
 import "pages"
 import "items"
-//import "radio-player"
-//import "video-player"
 import "helpers"
-//import "jupii"
-
-// Check out Amber Mpris Qml !!!
 
 ApplicationWindow
 {
     id: allRadio
-    property string _version: "2.0.15"
+    property string _version: "2.0.21"
     property string _language: Qt.locale().name.slice(0,2)
     property string _country: Qt.locale().name.slice(-2)
-    property int currentListIndex: -1
-    property int currentListCount: -1
     property int sleepTime: 0
-    //property alias settings: allradioSettings
     property alias mediaPlayerPanel: mediaPlayerPanel
+    property alias radioPlayer: radioPlayer
+    property alias radioBrowser: radioBrowser
+    property alias sleepTimer: sleepTimer
+/*
     property RadioPlayer radioPlayer : RadioPlayer {id:radioPlayer}
     property RadioBrowser radioBrowser : RadioBrowser {id:radioBrowser;parent: allRadio}
     property SleepTimer sleepTimer : SleepTimer {id:sleepTimer}
-
+*/
+    SleepTimer {id: sleepTimer}
+    RadioBrowser {id: radioBrowser; parent: allRadio}
+    RadioPlayer {id: radioPlayer}
     RadioMprisPlayer {id: radioMprisPlayer}
     MediaPlayerPanel {id: mediaPlayerPanel}
-    //ConfigurationGroup {id:settingsGroup;path: "/apps/harbour-allradio";ConfigurationGroup {id: allradioSettings;path: "/settings"}}
     Notification {id: notification;onClicked: console.log("Clicked")}
-    //MprisPlayer {}
 
+    // Not finished. --latest and --random should work though
     function handleArguments() {
          for(var i = 1; i < Qt.application.arguments.length; i++) {
              switch (Qt.application.arguments[i]) {
                  case "--help": help();break; // no argument
-                 //case "--codec": console.info("*** CODEC *** "+Qt.application.arguments[i+1]);break; // argument can be: mp3, aac, aac+, hls
-                 //case "--favorite": console.info("*** FAVORITE *** "+Qt.application.arguments[i+1]);break; // argument can be: top, latest, random
-                 //case "--pause": console.info("*** HISTORY *** "+Qt.application.arguments[i+1]);break; // argument can be: top, latest, random
                  case "--sleep": console.info("*** SLEEP *** : "+Qt.application.arguments[i+1]);break; // play for 1-120 minutes (sleeptimer)
                  case "--latest": console.info("*** PLAY *** : "+Qt.application.arguments[i+1]);latest();break; // latest, saved, random, world
                  case "--random": console.info("*** PLAY *** : "+Qt.application.arguments[i+1]);random();break; // latest, saved, random, world
              }
          }
     }
-
+    // Help text to be displayed in the console
     function help(){
         console.info("help")
-
     }
-
-
+    // Play latest from console 'harbour-allradio --latest'
     function latest(){
         radioPlayer.loadRecentPlay()
         radioPlayer.playStream()
-
     }
+    // Play random from console (stations added to favorites needed) 'harbour-allradio --random'
     function random(){
         radioPlayer.loadRandomPlay()
         radioPlayer.playStream()
-
     }
+
     initialPage: Component { AllRadio { } }
     cover: Qt.resolvedUrl("cover/CoverPage.qml")
     allowedOrientations: defaultAllowedOrientations

qml/helpers/db.js

@@ -7,24 +7,28 @@ function settings_db_open() {
     return db;
 }
 
-function checkforold() {
+function dropTable() {
+    //tx.executeSql("DROP TABLE IF EXISTS old_channels");
     db = settings_db_open();
     try {
-            db.transaction(function(tx)
-            {
-                var rs = tx.executeSql('SELECT * FROM channels');
-              //  console.log("OLD DATABSE TABLE EXISTS")
-            });
+        db.transaction(
+            function(tx) {
+                tx.executeSql("DROP TABLE IF EXISTS settings");
+                tx.executeSql("DROP TABLE IF EXISTS stations");
+                tx.executeSql("DROP TABLE IF EXISTS countries");
+                tx.executeSql("DROP TABLE IF EXISTS tags");
+            }
+        );
     }
     catch(a)
     {
-            //    console.log("NO OLD DATABASE")
+        console.log("drop failed: "+a)
+        return false
     }
+    init();
 }
-
 function init() {
     db = settings_db_open();
-    checkforold()
     try {
         db.transaction(
             function(tx) {
@@ -53,7 +57,7 @@ function setSetting(key, value) {
               }
         }
   );
-  console.log("setSetting: "+value)
+  //console.log("setSetting: "+value)
   return res;
 }
 
@@ -73,7 +77,7 @@ function getSetting(key, default_value) {
        //console.log("Database " + err);
        res = default_value;
    };
-  console.log("getSetting: "+res)
+  //console.log("getSetting: "+res)
   return res
 }
 
@@ -227,10 +231,7 @@ function getStationFavorite(id) { // Get info about number of clicks and if stat
        db.transaction(function(tx) {
            var rs = tx.executeSql('SELECT * FROM stations WHERE id = "'+id+'" AND favorite = 1');
            res = rs.rows.length
-      //     console.log("FAVO RESULT: "+res+" ID: "+id )
            if (res>0) return true; else return false;
-
-
        })
     } catch (err) {
        res = 0

qml/helpers/jsFunctions.js

@@ -5,13 +5,13 @@ function getGreeting() {
     datetoday.setTime(timenow);
     var thehour = datetoday.getHours();
 
-    if (thehour >= 2 && thehour < 12) display = "morning";
-    else if (thehour >= 12 && thehour <=17) display = "afternoon";
-    else display = "evening"
+    if (thehour >= 2 && thehour < 12) display = qsTr("morning");
+    else if (thehour >= 12 && thehour <=17) display = qsTr("afternoon");
+    else display = qsTr("evening")
 
 
 
-    var greeting = ("Good " + display + "!");
+    var greeting = (qsTr("Good")+" " + display + "!");
     return greeting//document.write(greeting);
 }
 

qml/items/MediaPlayerPanel.qml

@@ -82,16 +82,17 @@ DockedPanel {
                 font.bold: true
                 text: radioPlayer._name
             }
-            Row {
-                spacing: Theme.paddingMedium
-                Image {
+       //     Row {
+       //         spacing: Theme.paddingMedium
+       /*         Image {
                     id: headerLogo
                     anchors.bottom: rcountry.bottom
                     height: rcountry.height * 0.8
                     fillMode: Image.PreserveAspectFit
                     smooth: true
-                    source: radioPlayer._countrycode === "" ? radioPlayer._countrycode ? "../images/bycountry_t.png" : "" : "../flags/"+radioPlayer._countrycode.toLowerCase()+".png"
-                }
+//                    source: radioPlayer._cc === "" ? radioPlayer._cc ? "../images/bycountry_t.png" : "" : "../flags/"+radioPlayer._cc.toLowerCase()+".png"
+                    source: "../flags/"+radioPlayer._cc.toLowerCase()+".png"
+                } */
             Label {
                 id: rcountry
                 color: Theme.secondaryColor
@@ -99,7 +100,7 @@ DockedPanel {
                 width: parent.width
                 elide: Text.ElideRight
                 text: radioPlayer.radioCountryName
-            }
+     //       }
             }
         }
     }

qml/items/RadioBrowser.qml

@@ -20,8 +20,11 @@ Item {
     property string _useragent: "AllRadio/2.0.0 (test) (SailfishOS; Linux) nesnomis@gmail.com"
     property int _tags: 0
     property int _countries: 0
+    property int _c: 0
+
     // Properties to be used in application -------------------------------------------------
     property ListModel serversModel : ListModel { id: serversModel }
+    property ListModel serverStatsModel : ListModel { id: serverStatsModel }
     property ListModel votedModel : ListModel {id: votedModel}
     property CountryListModel countriesModel : CountryListModel {id:countriesModel}
     //property TagListModel tagsModel : TagListModel {id:tagsModel}
@@ -34,120 +37,153 @@ Item {
     //property int viewTagCount: tagsModel.maxCount
     property int countryCount: 0
     property bool loading: stationCount !== 0 && tagCount !== 0 && countryCount !== 0 ? false : true
-    property string lookup: "http://all.api.radio-browser.info/json/servers" //"http://all.api.radio-browser.info/json/servers"
-
+    property int serverIndex: 0
+    property int connectIndex: -1
+    property string lookup: sModel.get(serverIndex).url //"http://fi2.api.radio-browser.info/json/servers"
     // ---------------------------------------------------------------------------------------
+    Timer {
+        id: sTimer
+        interval: 2000; running: false; repeat: false
+        onTriggered: {
+            if (serverIndex < sModel.count-1) serverIndex = serverIndex + 1; else serverIndex = 0
+            getList()
+        }
+    }
+    //onServerIndexChanged: console.log(" ******* LOOKUP ******** ")+serverIndex
+
+    ListModel {
+        id: sModel
+
+        ListElement {
+            name: "all.api.radio-browser.info"
+            url: "http://all.api.radio-browser.info/json/servers"
+        }
+        ListElement {
+            name: "de1.api.radio-browser.info"
+            url: "http://de1.api.radio-browser.info/json/servers"
+        }
+        ListElement {
+            name: "de2.api.radio-browser.info"
+            url: "http://de2.api.radio-browser.info/json/servers"
+        }
+        ListElement {
+            name: "fi1.api.radio-browser.info"
+            url: "http://fi1.api.radio-browser.info/json/servers"
+        }
+        ListElement {
+            name: "fi3.api.radio-browser.info"
+            url: "http://fi3.api.radio-browser.info/json/servers"
+        }
+    }
 
     onOnlineChanged: {
-        //console.log("onOnlineChanged")
         if (online && serverUrl !== "") {
             countriesModel.source = serverUrl  + "/xml/countrycodes?hidebroken=true"
-            //tagsModel.source = serverUrl + "/xml/tags?hidebroken=true"
         }
     }
-    function getServer(s,u) {
-        //console.log("getServer")
+    // Not used?!?!?
+  /*  function getServer(s,u) {
         stationCount = 0
         tagCount = 0
         countryCount = 0
         server = s
         serverUrl = u
         getStats()
-    }
+    } */
 
-    function getRandom() {
-        //console.log("getRandom")
+    function connectServer(index) {
+        if (serversModel.count > 0) {
+
+            server = serversModel.get(index).server
+            if (serverUrl.length > 7 && url !== serverUrl) {loading=true;serverIndex = index;sTimer.running=false;getStats();} else {loading=true;serverIndex = index;getRandom();}
+        }
+    }
+    // Choose a random server from available servers
+    function getRandom(url) {
         if (serversModel.count > 0) {
             var random = Math.floor((Math.random() * serversModel.count) + 1) - 1
             serverUrl = serversModel.get(random).serverUrl
             server = serversModel.get(random).server
-            //console.log("getRandom: "+server)
-            getStats()
-
-        } //else getList()
+            if (serverUrl.length > 7 && url !== serverUrl) {sTimer.running=false;getStats();serverIndex=random} else getRandom();
+        }
     }
 
+    // Get a list of available Radio Community Servers.
     function getList() {
-        //console.log("getList")
         var req = new XMLHttpRequest();
-        req.open("get", lookup,true);
-        req.setRequestHeader('User-Agent',_useragent);
-        req.timeout = 4000; // Set timeout to 4 seconds (4000 milliseconds)
-        req.ontimeout = function () { console.log("Timed out!!!"); }
-        //console.log("server 2")
         req.onreadystatechange = function () {
-            //console.log(console.log("getList: "+req.status))
-            if (req.readyState === 4 && req.status === 200) {
+            if (req.readyState === 4 && req.status < 300) {
+
                 var obj = JSON.parse(req.responseText)
                 serversModel.clear()
                 for (var key in obj) {
                     addIfNotExist(obj[key])
                 }
-                getRandom()
-            } else if (req.readyState === 4 && req.status === 502) {lookup="http://de2.api.radio-browser.info/json/servers";getList();}
+                sTimer.running = false
+                //console.log(" *** lookup *** "+serverIndex+": "+lookup)
+                getRandom(lookup)
+            } else if (req.readyState === 4 && req.status > 299) {
+                if (serverIndex < sModel.count-1) serverIndex=serverIndex+1; else serverIndex=0;
+                lookup=sModel.get(serverIndex).url
+                //console.log(" *** lookup *** "+serverIndex+": "+lookup)
+                getList();
+            }
         };
-
+        sTimer.running = true
+        //console.log(" *** START : "+lookup)
+        req.open("get", lookup);
+        req.setRequestHeader('User-Agent',_useragent);
         req.send();
     }
-
+    // Add available server to listmodel
     function addIfNotExist(server) {
         for (var i = 0; i < serversModel.count; i++) {
-
             if (serversModel.get(i).server === server.name) {
                 return
             }
         }
         serversModel.append({"serverUrl": "http://"+server.name,"server": server.name})
     }
-
+    // ----------------------------------------------
+    // Station online?
     function getStats() {
-        //console.log("getStats")
-
         var req = new XMLHttpRequest();
-        req.open("get", serverUrl+"/json/stats",true);
-        req.setRequestHeader('User-Agent',_useragent);
         req.onreadystatechange = function () {
-            //console.log("XMLHTTPREQUEST READYSTATE: "+req.readyState + " STATUS: "+req.status)
-            if (req.readyState === 4 && req.status === 200) {
-                //console.log("STATUS:"+req.status)
+            if (req.readyState === 4 && req.status < 300) {
                 var obj = req.response.split("{").pop();
                 obj = JSON.parse("{"+obj)
-
                 if (obj.status === "OK") {
                     stationCount = obj.stations-obj.stations_broken
                     tagCount = obj.tags
                     if (obj.status === "OK") {online = true} else {online = false}
                 }
-            } else if (req.readyState === 4 && req.status === 502) getRandom()
+            }
         };
+        req.open("get", serverUrl+"/json/stats");
+        req.setRequestHeader('User-Agent',_useragent);
         req.send();
     }
-
+    // ----------------------------------------------
+    // Vote/like for radio station on community radio browser.
     function upVote(stationuuid,returnValue) {
         var req = new XMLHttpRequest();
         var ret = false
-        req.open("get", serverUrl+"/json/vote/"+stationuuid,true);
-        req.setRequestHeader('User-Agent',_useragent);
         req.onreadystatechange = function () {
-            //console.log("XMLHTTPREQUEST READYSTATE: "+req.readyState + " STATUS: "+req.status)
             if (req.readyState === 4 && req.status === 200) {
                 var obj = req.response.split("{").pop();
                 obj = JSON.parse("{"+obj)
-                //console.log(obj.ok)
                 if (obj.ok) {
-                    //stationCount = obj.stations-obj.stations_broken
-                    //tagCount = obj.tags
                     if (obj.ok) {returnValue=true;console.log(" ****** VOTED *****")} else {returnValue=false;console.log(" ****** NOT VOTED *****")}
                 }
                 return ret
-
             }
         };
+        req.open("get", serverUrl+"/json/vote/"+stationuuid);
+        req.setRequestHeader('User-Agent',_useragent);
         req.send();
-
     }
-
-
+    // ----------------------------------------------
+    // Load model with country names.
     CountryNameModel {id: countryNameModel}
 
     function getCountryName(land) {  // Get translated countryname
@@ -158,5 +194,4 @@ Item {
             }
         }
     }
-
 }

qml/items/RadioMprisPlayer.qml

@@ -11,32 +11,15 @@ MprisPlayer {
 
    identity: "AllRadio2"
    supportedUriSchemes: ["file"]
-   supportedMimeTypes: ["audio/x-wav", "audio/x-vorbis+ogg", "audio/mpeg", "audio/mp4a-latm", "audio/x-aiff"]
+   supportedMimeTypes: ["audio/x-wav", "audio/x-vorbis+ogg", "audio/mpeg", "audio/mp4a-latm", "audio/x-aiff", "audio/flac"]
 
    canControl: true
-/*
-   function playNext() {
-       if (playlistIndex < playlistCount && playlistIndex < playlist.count) playlistIndex = playlistIndex + 1
-       loadPlaylistSelected()
-   }
-
-   function playPrev() {
-       if (playlistIndex <= playlistCount && playlistIndex > 0) playlistIndex = playlistIndex - 1 //: playlistIndex = 0
-       loadPlaylistSelected()
-   }
-   */
-
-
    canGoNext: radioPlayer.playlistIndex < radioPlayer.playlist.count -1 && radioPlayer._favorite
-//true //appstate.playlistIndex < appstate.playlist.count
-   canGoPrevious: radioPlayer.playlistIndex > 0  && radioPlayer._favorite// appstate.playlistIndex > 0
+   canGoPrevious: radioPlayer.playlistIndex > 0  && radioPlayer._favorite
    canPause: radioPlayer.isPlaying ? true : false
    canPlay: radioPlayer.isPaused ? true : false
-
-   canSeek: false// playback.seekable
+   canSeek: false
    hasTrackList: false
-
-
    loopStatus: Mpris.LoopNone
    shuffle: false
    volume: 1

qml/items/RadioPlayer.qml

@@ -11,7 +11,7 @@ MediaPlayer {
     property string _stationuuid: ""
     property string _name: ""
     property string _favicon: ""
-    property string _countrycode: ""
+    property string _cc: ""
     property string _tags: ""
     property string _codec: ""
     property string _bitrate: ""
@@ -19,14 +19,11 @@ MediaPlayer {
     property string _url_resolved: ""
     property string _homepage: ""
    // property string _votes: ""
-   // property string _plays: ""
+   // property string _plays: ""  // For future implementation?!
    // property string _trend: ""
     property bool _favorite: false
     //--------------------------------
-   // property bool videoP: false
-
     property bool playerPageOpen: false
-//    property bool jupiiOn: false
     property string radioId: ""
     property string metaInfo: metaData.title ? metaData.title : ""
     property string radioArtist: ""
@@ -42,37 +39,23 @@ MediaPlayer {
     property string radioStatusString
     property bool isPlaying: false
     property bool isPaused: false
-    property int stationOk: 3
+    property int stationOk: 0
     property int maxTagClicks: 0
     property int playlistCount: playlist.count -1
-    //property int playlistIndex: Favorites.getSetting("playlistIndex",-1)
-    property int playlistIndex: -1
+    property int playlistIndex: Favorites.getSetting("playlistIndex",-1)
+    property ListModel playHistory: ListModel {id: playHistory}
+    property ListModel playlist: ListModel {id: playlist}
     property QDtimer timer: QDtimer {
         id: qdTimer
         interval: 200; running: false; repeat: false
     }
-    //property string videoOut: ""
-//    property ListModel mostPlayedFavorites: ListModel {id: mostPlayedFavorites}
-   //videoOutput: videoOut
-//    property variant magnitudeArray: null
-//    property int millisecondsPerBar: 68
-
-    property ListModel playHistory: ListModel {id: playHistory}
-    property ListModel playlist: ListModel {id: playlist}
-
 
     autoPlay: false
     autoLoad: true
 
-    //onPlaylistIndexChanged: console.log("INDEX: "+playlistIndex)
-
-    //on_FavoriteChanged: {setStationFavorite(_stationuuid,_name,_countrycode,_homepage,_url_resolved,_favicon,_tags,_codec,_bitrate,_hls,_favorite);Favorites.getMostPlayedFavorites(mostPlayedFavorites,15)}
     onPlaying: if (!playerPageOpen) pageStack.push("../pages/RadioPlayerPage.qml")
 
-       // onPlaylistIndexChanged: loadPlaylistSelected()
-
     onMetaInfoChanged: {
-     //   console.log(" ******* METAINFO: "+metaInfo)
         if (metaInfo.search(" - ") > -1) {
             var res = metaInfo.split(" - ")
             radioArtist = res[0]
@@ -83,12 +66,7 @@ MediaPlayer {
         }
     }
 
-    onRadioAudioChanged: {
-     //   if (hasVideo) console.log(" *** VIDEO"); else console.log(" *** AUDIO")
-    }
-
     onStationOkChanged: {
-     //   console.log("StationOK?: "+stationOk)
         if (stationOk === 1) {
             setStationClick()
             getStationFavorite(_stationuuid)
@@ -99,34 +77,102 @@ MediaPlayer {
         }
     }
 
-    on_StationuuidChanged: { //if (_stationuuid !== "") {getStationUrl(_stationuuid);radioPlayUrl = _url_resolved} else radioPlayUrl = ""
-        radioCountryName = radioBrowser.getCountryName(_countrycode)
+    on_StationuuidChanged: {
+        radioCountryName = radioBrowser.getCountryName(_cc)
         stop()
         source = ""
-        //metaInfo = ""
         radioVideo = false
         radioAudio = false
         isPaused = false
         isPlaying = false
-        stationOk = 3
+        stationOk = 0
         getStationUrl(_stationuuid);
     }
 
-    //onIsPausedChanged: if (_paused) {
-                          //radioPlaying = false
-                          ///radioPaused = true
-                       //   radioSource = ""
-                    //      metaInfo = ""
-                    //      if(radioVideo) {
-                      //       videoPlayer.visible = false
-                       //       radioSource = ""
-                      //    }
-            //          }
-
     onHasVideoChanged: if (hasVideo) radioVideo = true
     onHasAudioChanged: if (hasAudio) radioAudio = true
 
+    onError: {
+        notification.category = "Error"
+        notification.summary = _name
+        notification.body = errorString
+        notification.publish()
+        radioPlayer.stopStream()
+    }
 
+    onStatusChanged: {
+        switch (status) {
+            case 1: status1();break; // NoMedia
+            case 2: status2();break; // Loading
+            case 3: status3();break; // Loaded
+            case 4: status4();break; // Buffering
+            case 5: status5();break; // Stalled
+            case 6: status6();break; // Buffered
+            case 7: status7();break; // EndOfMedia
+            case 8: status8();break; // InvalidMedia
+            case 9: status9();break; // UnknownStatus
+        }
+    }
+
+    function status1 () { // NoMedia
+        radioStatus = status
+        radioStatusString = "No Media"
+    }
+
+    function status2 () { // Loading
+        radioStatus = status
+        radioStatusString = "Loading"
+    }
+
+    function status3 () { // Loaded
+        radioStatus = status
+        radioStatusString = "Loaded"
+    }
+
+    function status4 () { // Buffering
+        radioStatus = status
+        radioStatusString = "Buffering"
+    }
+
+    function status5 () { // Stalled
+        radioStatus = status
+        radioStatusString = "Stalled"
+        notification.category = "Status"
+        notification.summary = _name
+        notification.body = "Stalled"
+        notification.publish()
+        radioPlayer.stopStream()
+    }
+
+    function status6 () { // Buffered
+        radioStatus = status
+        radioStatusString = "Buffered"
+    }
+
+    function status7 () { // EndOfMedia
+        radioStatus = status
+        radioStatusString = "End Of Media"
+        notification.category = "Status"
+        notification.summary = _name
+        notification.body = "End of media"
+        notification.publish()
+        radioPlayer.resumeStream()
+    }
+
+    function status8 () { // InvalidMedia
+        radioStatus = status
+        radioStatusString = "Invalid Media"
+        notification.category = "Status"
+        notification.summary = _name
+        notification.body = "Invalid media"
+        notification.publish()
+        radioPlayer.stopStream()
+    }
+
+    function status9 () { // UnknownStatus
+        radioStatus = status
+        radioStatusString = "Unknown Status"
+    }
 
     function stopStream() { // stop and clear stream
         source = ""
@@ -140,201 +186,67 @@ MediaPlayer {
         _stationuuid = ""
         _name = ""
         _favicon = ""
-        _countrycode = ""
+        _cc = ""
         _tags = ""
         _codec = ""
         _bitrate = ""
         _hls = ""
         _homepage = ""
         stop()
-      //  metaInfo = ""
     }
 
-
-
-
-
     function playNext() {
-        if (playlistIndex < playlistCount && playlistIndex < playlist.count) playlistIndex = playlistIndex + 1
+        if (playlistIndex < playlistCount) playlistIndex = playlistIndex + 1
         loadPlaylistSelected()
     }
 
     function playPrev() {
-        if (playlistIndex <= playlistCount && playlistIndex > -1) playlistIndex = playlistIndex - 1 //: playlistIndex = 0
+        if (playlistIndex <= playlistCount) playlistIndex = playlistIndex - 1
         loadPlaylistSelected()
     }
 
-
     function videoPause() {
         source = ""
         stop()
     }
 
-
-    function pauseStream() { // stop stream without clear
-
-
-        isPaused = true
+    function pauseStream() {
         isPlaying = false
         source = ""
         stop()
-      //  metaInfo = ""
     }
 
     function resumeStream() {
         isPlaying = true
         isPaused = false
         playStream()
-
     }
 
-
-
-    function playStream() { // resume paused stream
+    function playStream() {
+        //console.log(" ********** URL : "+_url_resolved)
         source = _url_resolved
         play()
         isPlaying = true
         isPaused = false
         qdTimer.start()
-        //Favorites.setSetting("playlistIndex",playlistIndex)
+        if (_favorite) Favorites.setSetting("playlistIndex",playlistIndex)
+        //appStartPlay = false
     }
 
-    onError: {
-        notification.category = "Error"
-        notification.summary = _name
-        //notification.subText = _name
-        notification.body = errorString
-        notification.publish()
-        radioPlayer.stopStream()
-
-    }
-
-   /* onRadioStatusChanged: {
-        notification.body = radioStatusString
-        notification.publish()
-    }*/
-
-
-
-
-    onStatusChanged: {
-        //console.log(" ___ STATUS: "+status)
-        switch (status) {
-            case 1: status1();break; // NoMedia
-            case 2: status2();break; // Loading
-            case 3: status3();break; // Loaded
-            case 4: status4();break; // Buffering
-            case 5: status5();break; // Stalled
-            case 6: status6();break; // Buffered
-            case 7: status7();break; // EndOfMedia
-            case 8: status8();break; // InvalidMedia
-            case 9: status9();break; // UnknownStatus
-        }
-    }
     function tryagain() {
         tryTimer.running = true
     }
-    function status1 () { // NoMedia
-        radioStatus = status
-        radioStatusString = "No Media"
-        //console.log("Status: No Media")
-    }
-    function status2 () { // Loading
-        radioStatus = status
-        radioStatusString = "Loading"
-        //console.log("Status: Loading")
-    }
-    function status3 () { // Loaded
-        radioStatus = status
-        radioStatusString = "Loaded"
-        //console.log("Status: Loaded")
-    }
-    function status4 () { // Buffering
-        radioStatus = status
-        radioStatusString = "Buffering"
-        //console.log("Status: Buffering")
-    }
-    function status5 () { // Stalled
-        radioStatus = status
-        radioStatusString = "Stalled"
-        notification.category = "Status"
-        notification.summary = _name
-        //notification.subText = _name
-        notification.body = "Stalled"
-        notification.publish()
-        //console.log("Status: Stalled")
-        radioPlayer.stopStream()
-    }
-    function status6 () { // Buffered
-        radioStatus = status
-        radioStatusString = "Buffered"
-        //console.log("Status: Buffered")
-    }
-    function status7 () { // EndOfMedia
-    /*    if (errorCount<4) {
-        //errorCount = errorCount + 1
-        tryTimer.start()
-        }else{ */
-        radioStatus = status
-        radioStatusString = "End Of Media"
-        notification.category = "Status"
-        notification.summary = _name
-        //notification.subText = _name
-        notification.body = "End of media"
-        notification.publish()
-        //console.log("Status: End Of Media")
-        radioPlayer.resumeStream()
-      //  }
-    }
-    function status8 () { // InvalidMedia
-        radioStatus = status
-        radioStatusString = "Invalid Media"
-        notification.category = "Status"
-        notification.summary = _name
-        //notification.subText = _name
-        notification.body = "Invalid media"
-        notification.publish()
-        //console.log("Status: Invalid Media")
-        radioPlayer.stopStream()
-    }
-    function status9 () { // UnknownStatus
-        radioStatus = status
-        radioStatusString = "Unknown Status"
-        //console.log("Status: Unknown Status")
-    }
 
-    function getStationUrl(id) { // Register as radio station click on community radio and get station info from Community Radio and save it to Db. Initiate playback.
-        var req = new XMLHttpRequest();
-        req.open("post", radioBrowser.serverUrl + "/xml/url/" +id, true);
-       // console.log(radioBrowser.serverUrl)
-        req.responseType = "document";
-        req.setRequestHeader('User-Agent',radioBrowser._useragent);
-        req.onreadystatechange = function () {
-            if (req.readyState === 4 && req.status === 200) {
-                var temp = req.responseText
-                var ok = temp.indexOf('status ok="true"') !== -1
-             //   console.log("OK: "+ok)
-                if (ok) {
-                    stationOk = 1
-                } else {
-                    stationOk = 0
-                }
-            } //else if (req.readyState === 4) {stationOk = 2}
-        };
-        req.send();
-    }
+
+
     function setStationClick() {
-        //getStationFavorite(_stationuuid)
-        Favorites.setStationClicked(JsFunctions.getTimeStamp(),_stationuuid,_name,_countrycode,_homepage,_url_resolved,_favicon,_tags,_codec,_bitrate,_hls,_favorite)
+        Favorites.setStationClicked(JsFunctions.getTimeStamp(),_stationuuid,_name,_cc,_homepage,_url_resolved,_favicon,_tags,_codec,_bitrate,_hls,_favorite)
+    }
 
-        //  property bool favo: isFavorite(stationuuid) ? true : false
-
-        //getIfFavorite(_stationuuid)
-        //getIfFavorite(_stationuuid)
-    }                        //   myclicktimestamp,id,name,countrycode,homepage,radiourlresolved,favicon,tagslist,codec,bitrate,hls,favorite
     function setStationFavorite(stationuuid,name,countrycode,homepage,url_resolved,favicon,tags,codec,bitrate,hls,favorite) {
         Favorites.setStationFavorite(stationuuid,name,countrycode,homepage,url_resolved,favicon,tags,codec,bitrate,hls,favorite)
     }
+
     function getStationFavorite(id){
         _favorite = Favorites.getStationFavorite(id)
     }
@@ -342,17 +254,17 @@ MediaPlayer {
     function reloadDbData() {
         Favorites.getStationRecentClicked(playHistory,15)
         Favorites.getFavorites(playlist,"myclickcount",10000)
-
         //Favorites.getStationMostClickedFav(radioPlayermostPlayed,settings._nrOfFavoritePreview)
         //Favorites.getCountryRecentClicked(playedCountries,2)
         //Favorites.getTagsRecentClicked(playedTags,10)
         //Favorites.getMostPlayedFavorites(mostPlayedFavorites,15)
     }
+
     function loadPlaylistSelected(){
         if (playlist.get(playlistIndex).url_resolved) {
             _favicon = playlist.get(playlistIndex).favicon
             _name = playlist.get(playlistIndex).name
-            _countrycode = playlist.get(playlistIndex).countrycode
+            _cc = playlist.get(playlistIndex).countrycode
             _tags = playlist.get(playlistIndex).tags
             _codec = playlist.get(playlistIndex).codec//getCodec(model.codec)
             _bitrate = playlist.get(playlistIndex).bitrate //getBitrate(model.bitrate)
@@ -368,11 +280,12 @@ MediaPlayer {
         //    pageStack.push("RadioPlayerPage.qml")
         }
     }
+
     function loadRecentPlay(){
         if (playHistory.get(0).url_resolved) {
             _favicon = playHistory.get(0).favicon
             _name = playHistory.get(0).name
-            _countrycode = playHistory.get(0).countrycode
+            _cc = playHistory.get(0).countrycode
             _tags = playHistory.get(0).tags
             _codec = playHistory.get(0).codec//getCodec(model.codec)
             _bitrate = playHistory.get(0).bitrate //getBitrate(model.bitrate)
@@ -383,16 +296,18 @@ MediaPlayer {
             _favorite = playHistory.get(0).favorite
             isPlaying = false
             isPaused = true
+            ///if (_favorite) playlistCount = Favorites.getSetting("playlistIndex",-1)
             //playlistIndex = allradioSettings.value("currentFavorite",-1)
         //    pageStack.push("RadioPlayerPage.qml")
         }
     }
+
     function loadRandomPlay(){
         var rnd = Math.floor(Math.random() * playlist.count)
         if (playlist.get(rnd).url_resolved) {
             _favicon = playlist.get(rnd).favicon
             _name = playlist.get(rnd).name
-            _countrycode = playlist.get(rnd).countrycode
+            _cc = playlist.get(rnd).countrycode
             _tags = playlist.get(rnd).tags
             _codec = playlist.get(rnd).codec//getCodec(model.codec)
             _bitrate = playlist.get(rnd).bitrate //getBitrate(model.bitrate)
@@ -430,10 +345,25 @@ MediaPlayer {
                 mprisPlayer.playbackStatus = Mpris.Paused
         }
     }
-
-
-
-
-    Component.onCompleted: {reloadDbData();loadRecentPlay()}
+    // Register as radio station click on community radio and get station info from Community Radio and save it to Db. Initiate playback.
+    function getStationUrl(id) {
+        var req = new XMLHttpRequest();
+        req.onreadystatechange = function () {
+            if (req.readyState === 4 && req.status < 300) {
+                var temp = req.responseText
+                var ok = temp.indexOf('status ok="true"') !== -1
+                if (ok) {
+                    stationOk = 1
+                } else {
+                    stationOk = 0
+                }
+            }
+        };
+        req.open("post", radioBrowser.serverUrl + "/xml/url/" +id);
+        req.setRequestHeader('User-Agent',radioBrowser._useragent);
+        req.send();
+    }
+
+    Component.onCompleted: {reloadDbData();_favorite ? loadPlaylistSelected() : loadRecentPlay()}
 }
 

qml/items/Splash.qml

@@ -6,8 +6,12 @@ import QtGraphicalEffects 1.0
 Column {
     id: column
     spacing: Theme.paddingMedium
-    //property alias busy: busyIndicator.running
     anchors.centerIn: parent
+    Timer {
+        id: spTimer
+        interval: 10000; running: visible ? true : false; repeat: false
+        onTriggered: radioBrowser.getRandom(radioBrowser.serverUrl)
+    }
 
     Image {
         id: logo
@@ -21,27 +25,34 @@ Column {
             source: parent
             color: Theme.highlightColor
         }
-     //   BusyIndicator {
-     //       size: BusyIndicatorSize.Large
-     //       anchors.centerIn: parent
-     //       running: parent.visible
-     //   }
     }
 
-    Label {
-        text: radioBrowser.serversModel.count > 0 ? "Found: "+radioBrowser.serversModel.count + " servers" : "Searching for servers..."
+    BusyLabel {
+        width: parent.width
+        text: radioBrowser.serversModel.count > 0 ? qsTr("Found")+": "+radioBrowser.serversModel.count + " "+qsTr("servers") : qsTr("Searching servers")
+        running: radioBrowser.serversModel.count < 1
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+    BusyLabel {
+        width: parent.width
+        visible: radioBrowser.serversModel.count > 0
+        running: visible
+        text: qsTr("Connecting")
         anchors.horizontalCenter: parent.horizontalCenter
     }
     Label {
         visible: radioBrowser.serversModel.count > 0
-        text: "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 && !spTimer.running
+        anchors.topMargin: Theme.paddingLarge
+        text: qsTr("Try another server")
+        onClicked: radioBrowser.getRandom(radioBrowser.serverUrl)
+        anchors.horizontalCenter: parent.horizontalCenter
+    } */
 
 }

qml/models/AdvancedSearchModel.qml

@@ -6,10 +6,6 @@ XmlListModel {
     property bool clear: false
     property ListModel stationsModel: ListModel {id: stationsModel}
 
- //   onFinishedChanged: console.log("*** FINISHED: "+finished+" ***")
-
-    //onClearChanged: if (clear) {stationsModel.clear()}
-
     query: "/result/station"
     XmlRole { name: "stationuuid"; query: "@stationuuid/string()" }
     XmlRole { name: "name"; query: "@name/string()" }
@@ -52,10 +48,9 @@ XmlListModel {
                                      "clicktrend" : get(i).clicktrend,
                                      "clickcount" : get(i).clickcount,
                                      "lastcheckok" : get(i).lastcheckok
-                                 })
+                                 });
         }
         finished = true
-    //    console.log(" ***** APPENDED ******")
     }
 }
 

qml/models/CountryListModel.qml

@@ -13,14 +13,10 @@ Item {
         var filt
         for(var i = 0; i < xmlModel.count; i++) {
             cname = getCountryName(xmlModel.get(i).name)
-            //if (cname) filt = cname.toLowerCase()
             if (cname) {filt = cname.toLowerCase(); if (filt.indexOf(filter) !== -1) countryModel.append({"name" : cname, "alpha_2" : xmlModel.get(i).name,"stationcount" : xmlModel.get(i).stationcount})}
-            //console.log(cname)
         }
         countryModel.listModelSort(countryModel, compareElements)
-        //numberOfCountries = i
-        countryCount = countryModel.count
-     //   console.log("COUNTRIESMODEL DONE: "+countryModel.count)
+        radioBrowser.countryCount = countryModel.count
         running = false
     }
 
@@ -49,18 +45,15 @@ Item {
     XmlListModel {
             id: xmlModel
             query: "/result/countrycode"
-            //source: radioServers.serverUrl + type + "/countrycodes?hidebroken=true"
 
             XmlRole { name: "name"; query: "@name/string()" }
             XmlRole { name: "stationcount"; query: "@stationcount/string()" }
 
             onStatusChanged: {
-                //if (status === XmlListModel.Loading) loadingInfo = "Preloading countries"
                 if (status === XmlListModel.Ready) {
                     addtomodel()
                     running = false
                 }
-                //if (status === XmlListModel.Loading) running = true;
             }
         }
 

qml/models/CountryNameModel.qml

@@ -513,5 +513,4 @@ ListModel {
         }
         return countryname.text[index]
     }
-
 }

qml/models/GetCountryStations.qml

@@ -2,22 +2,14 @@ import QtQuick 2.0
 import QtQuick.XmlListModel 2.0
 
 Item {
-    // radio-browser advanced:
-    ////property int bitrateMin: 0
-    ////property int bitrateMax: 1000000
-    ////property string state: ""
-    ////property bool stateExact: false
-    ////property string language: ""
-    ////property bool languageExact: false
-    ////property string tagList: "" // commaseparated string
     property string name: ""
     property bool nameExact: false
     property string countrycode: ""
     property string tag: ""
     property bool tagExcact: false
     property string codec: ""
-    property string order: "" // name, url, homepage, favicon, tags, country, state, language, votes, codec, bitrate, lastcheckok, lastchecktime, clicktimestamp, clickcount, clicktrend, random
-    property bool reverse: false//order === name ? false : true // true if name
+    property string order: ""
+    property bool reverse: false
     property int offset: 0
     property int limit: 150
     property string source: ""
@@ -43,7 +35,6 @@ Item {
         if (order !== "") filterString = filterString + "&order="+order
         if (order === "name") reverse = false; else reverse = true
         filterString = filterString + "&reverse="+reverse + "&offset="+offset+"&limit="+limit
-     //   console.log(radioBrowser.serverUrl + "/xml/stations/search?hidebroken=true"+filterString)
         source = radioBrowser.serverUrl + "/xml/stations/search?hidebroken=true"+filterString
     }
 }

qml/pages/AboutPage.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+
 Page {
     Flickable {
         id: flick
@@ -16,13 +17,13 @@ Page {
             Label {
                 font.pixelSize: Theme.fontSizeExtraLarge
                 font.bold: true
-                text: "AllRadio v"+ _version
+                text: "AllRadio2 v"+ _version
                 anchors.horizontalCenter: parent.horizontalCenter
 
             }
 
             Label {
-                text: "License: GPL"
+                text: qsTr("License: GPLv2")
                 anchors.horizontalCenter: parent.horizontalCenter
             }
 
@@ -35,66 +36,6 @@ Page {
                     horizontalCenter: parent.horizontalCenter
                 }
             }
-       /*     Rectangle{
-                gradient: Gradient {
-                    GradientStop { position: 0.0; color: "#333333" }
-                    GradientStop { position: 1.0; color: "#777777" }
-                }
-                anchors {
-                    horizontalCenter: parent.horizontalCenter
-                }
-                height: 3
-                width: parent.width-64
-            }
-
-            Label {
-                width: 360
-                font.pixelSize: Theme.fontSizeMedium
-                text: "Created by llelectronics"
-                anchors.horizontalCenter: parent.horizontalCenter
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignHCenter
-            }
-            Repeater{
-                anchors.horizontalCenter: parent.horizontalCenter
-                //model: credits
-                Label  {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    text: title
-                    font.pixelSize: Theme.fontSizeSmall
-                }
-            }
-            Rectangle{
-                gradient: Gradient {
-                    GradientStop { position: 0.0; color: "#333333" }
-                    GradientStop { position: 1.0; color: "#777777" }
-                }
-                anchors {
-                    horizontalCenter: parent.horizontalCenter
-                }
-                height: 3
-                width: parent.width-64
-            }
-
-            Button {
-                id: homepage
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: "<a href=\"https://github.com/llelectronics/webcat\">Sourcecode on Github</a>"
-                onClicked: {
-                    mainWindow.openNewTab('page-'+salt(), "https://github.com/llelectronics/webcat", false);
-                }
-            } */
-
-            Label {
-                width: parent.width-70
-                font.pixelSize: Theme.fontSizeSmall
-                text: qsTr("AllRadio is an internet radio station player")
-                anchors.horizontalCenter: parent.horizontalCenter
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignHCenter
-                height: 200
-                wrapMode: Text.WordWrap
-            }
         }
     }
 }

qml/pages/AllRadio.qml

@@ -14,6 +14,8 @@ Page {
     anchors.fill: parent
     anchors.bottomMargin: mediaPlayerPanel.visibleSize
 
+    property int _appStart: Favorites.getSetting("appStart",0)
+    property bool _loading: radioBrowser.loading
     property bool stationOk: radioPlayer.stationOk
     property bool online: radioBrowser.online
     property GetCountryStations getTrending1: GetCountryStations {id: getTrending1}
@@ -28,6 +30,12 @@ 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
@@ -56,15 +64,6 @@ Page {
                onClicked: {
                    pageStack.push("SleepTimerPage.qml")
                }
-
-                  /*     var dialog = pageStack.push("Sailfish.Silica.TimePickerDialog", {
-                           hour: 0,
-                           minute: 30,
-                           hourMode: DateTime.TwentyFourHours
-                       })
-                       dialog.accepted.connect(function() {
-                       })
-                   } */
             }
         }
 
@@ -96,6 +95,7 @@ Page {
                     smooth: true
                     source: "../images/community.png"
                 }
+
                 ColorOverlay {
                     anchors.fill: logo
                     source: logo
@@ -178,11 +178,11 @@ Page {
                 height: Theme.itemSizeHuge * 1.35
                 width: page.width
                 cellHeight: height
-                cellWidth: cellHeight * 0.75//Theme.itemSizeHuge + Theme.itemSizeMedium * 2
+                cellWidth: cellHeight * 0.75
                 flow: GridView.TopToBottom
                 snapMode: SlideshowView.NoSnap
                 layoutDirection: Qt.LeftToRight
-                visible: favorites.count > 0//radioBrowser.getCountryName(_country) || playedCountries.count > 0 ? true : false
+                visible: favorites.count > 0
 
                 model: favorites
 
@@ -191,22 +191,19 @@ Page {
 
                     onClicked: {
                         if (model.url_resolved !== radioPlayer._url_resolved) {
+                            radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
                             radioPlayer._favicon = model.favicon
                             radioPlayer._name = model.name
-                            radioPlayer._countrycode = model.countrycode
                             radioPlayer._tags = model.tags
-                            radioPlayer._codec = model.codec//getCodec(model.codec)
-                            radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
+                            radioPlayer._codec = model.codec
+                            radioPlayer._bitrate = model.bitrate
                             radioPlayer._hls = model.hls
                             radioPlayer._url_resolved = model.url_resolved
                             radioPlayer._homepage = model.homepage
                             radioPlayer._stationuuid = model.stationuuid
                             radioPlayer.getStationFavorite(model.stationuuid)
                             radioPlayer.playlistIndex = index
-
-                            console.log("Index: "+index)
-
-                        }
+                        } else radioPlayer.resumeStream()
                     }
                 }
             }
@@ -216,7 +213,7 @@ Page {
 
             HeaderButton {
                 visible: radioPlayer.playHistory.count > 0
-                headerText: qsTr("Play history")//playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
+                headerText: qsTr("Play history")
                 onClicked: pageStack.push("HistoryPage.qml")
             }
 
@@ -226,7 +223,7 @@ Page {
                 height: playedTags.count > 0 ? Theme.itemSizeHuge * 1.35 : 0
                 width: page.width
                 cellHeight: height
-                cellWidth: cellHeight * 0.75//Theme.itemSizeHuge + Theme.itemSizeMedium * 2
+                cellWidth: cellHeight * 0.75
                 flow: GridView.TopToBottom
                 snapMode: SlideshowView.NoSnap
                 layoutDirection: Qt.LeftToRight
@@ -237,18 +234,18 @@ Page {
                     flagVisible: true
                     onClicked: {
                         if (model.url_resolved !== radioPlayer._url_resolved) {
+                            radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
                             radioPlayer._favicon = model.favicon
                             radioPlayer._name = model.name
-                            radioPlayer._countrycode = model.countrycode
                             radioPlayer._tags = model.tags
-                            radioPlayer._codec = model.codec//getCodec(model.codec)
-                            radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
+                            radioPlayer._codec = model.codec
+                            radioPlayer._bitrate = model.bitrate
                             radioPlayer._hls = model.hls
                             radioPlayer._url_resolved = model.url_resolved
                             radioPlayer._homepage = model.homepage
                             radioPlayer._stationuuid = model.stationuuid
                             radioPlayer.getStationFavorite(model.stationuuid)
-                        }
+                        } else radioPlayer.resumeStream()
                     }
                 }
             }
@@ -258,7 +255,7 @@ Page {
 
             HeaderButton {
                 visible: radioPlayer.playHistory.count > 0
-                headerText: qsTr("My most played Tags")//playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
+                headerText: qsTr("My most played Tags")
                 onClicked: pageStack.push("TagListPage.qml",{})
             }
 
@@ -268,7 +265,7 @@ Page {
                 height: playedTags.count > 0 ? Theme.itemSizeHuge * 1.35 : 0
                 width: page.width
                 cellHeight: height
-                cellWidth: cellHeight * 0.75//Theme.itemSizeHuge + Theme.itemSizeMedium * 2
+                cellWidth: cellHeight * 0.75
                 flow: GridView.TopToBottom
                 snapMode: SlideshowView.NoSnap
                 layoutDirection: Qt.LeftToRight
@@ -283,7 +280,7 @@ Page {
             HeaderButton {
                 visible: radioBrowser.getCountryName(_country) || playedCountries.count > 0 ? true : false
                 headerText: playedCountries.count > 0 ? qsTr("Trending in")+ " " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : qsTr("Trending in") + " " + radioBrowser.getCountryName(_country)
-                onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: playedCountries.get(0).alpha_2})
+                onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: playedCountries.count > 0 ? playedCountries.get(0).alpha_2 : _country})
             }
 
             GridView {
@@ -291,7 +288,7 @@ Page {
                 height: Theme.itemSizeHuge * 1.35
                 width: page.width
                 cellHeight: height
-                cellWidth: cellHeight * 0.75//Theme.itemSizeHuge + Theme.itemSizeMedium * 2
+                cellWidth: cellHeight * 0.75
                 flow: GridView.TopToBottom
                 snapMode: SlideshowView.NoSnap
                 layoutDirection: Qt.LeftToRight
@@ -303,18 +300,18 @@ Page {
                     flagVisible: false
                     onClicked: {
                         if (model.url_resolved !== radioPlayer._url_resolved) {
+                            radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
                             radioPlayer._favicon = model.favicon
                             radioPlayer._name = model.name
-                            radioPlayer._countrycode = model.countrycode
                             radioPlayer._tags = model.tags
-                            radioPlayer._codec = model.codec//getCodec(model.codec)
-                            radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
+                            radioPlayer._codec = model.codec
+                            radioPlayer._bitrate = model.bitrate
                             radioPlayer._hls = model.hls
                             radioPlayer._url_resolved = model.url_resolved
                             radioPlayer._homepage = model.homepage
                             radioPlayer._stationuuid = model.stationuuid
                             radioPlayer.getStationFavorite(model.stationuuid)
-                        }
+                        } else radioPlayer.resumeStream()
                     }
                 }
             }
@@ -323,8 +320,7 @@ Page {
 
             HeaderButton {
                 visible: playedCountries.count > 1
-//                headerText: playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(1).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
-                headerText: playedCountries.count > 1 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(1).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
+                headerText: playedCountries.count > 1 ? qsTr("Trending in")+" " + radioBrowser.getCountryName(playedCountries.get(1).alpha_2) : qsTr("Trending in")+" " + radioBrowser.getCountryName(_country)
                 onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: playedCountries.get(1).alpha_2})
             }
 
@@ -333,7 +329,7 @@ Page {
                 height: Theme.itemSizeHuge * 1.35
                 width: page.width
                 cellHeight: height
-                cellWidth: cellHeight * 0.75//Theme.itemSizeHuge + Theme.itemSizeMedium * 2
+                cellWidth: cellHeight * 0.75
                 flow: GridView.TopToBottom
                 snapMode: SlideshowView.NoSnap
                 layoutDirection: Qt.LeftToRight
@@ -345,9 +341,9 @@ Page {
                     flagVisible: false
                     onClicked: {
                         if (model.url_resolved !== radioPlayer._url_resolved) {
+                            radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
                             radioPlayer._favicon = model.favicon
                             radioPlayer._name = model.name
-                            radioPlayer._countrycode = model.countrycode
                             radioPlayer._tags = model.tags
                             radioPlayer._codec = model.codec//getCodec(model.codec)
                             radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
@@ -356,7 +352,7 @@ Page {
                             radioPlayer._homepage = model.homepage
                             radioPlayer._stationuuid = model.stationuuid
                             radioPlayer.getStationFavorite(model.stationuuid)
-                        }
+                        } else radioPlayer.resumeStream()
                     }
                 }
             }
@@ -364,7 +360,7 @@ Page {
             Item {height: Theme.paddingLarge;width: parent.width}
 
             HeaderButton {
-                headerText: "Trending in the world"//playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country)
+                headerText: qsTr("Trending in the world")
                 onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: ""})
             }
 
@@ -373,7 +369,7 @@ Page {
                 height: Theme.itemSizeHuge * 1.35
                 width: page.width
                 cellHeight: height
-                cellWidth: cellHeight * 0.75//Theme.itemSizeHuge + Theme.itemSizeMedium * 2
+                cellWidth: cellHeight * 0.75
                 flow: GridView.TopToBottom
                 snapMode: SlideshowView.NoSnap
                 layoutDirection: Qt.LeftToRight
@@ -382,9 +378,9 @@ Page {
                     flagVisible: true
                     onClicked: {
                         if (model.url_resolved !== radioPlayer._url_resolved) {
+                            radioPlayer._cc = model.countrycode// THIS IS THE FUNCTION DESTROYING AARCH64?!?
                             radioPlayer._favicon = model.favicon
                             radioPlayer._name = model.name
-                            radioPlayer._countrycode = model.countrycode
                             radioPlayer._tags = model.tags
                             radioPlayer._codec = model.codec//getCodec(model.codec)
                             radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
@@ -393,19 +389,34 @@ Page {
                             radioPlayer._homepage = model.homepage
                             radioPlayer._stationuuid = model.stationuuid
                             radioPlayer.getStationFavorite(model.stationuuid)
+                        } else radioPlayer.resumeStream()
                     }
                 }
             }
         }
     }
+
+    function appAutoPlay() {
+        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)
         Favorites.getCountryRecentClicked(playedCountries,4)
-
-
         getTrending1.countrycode = playedCountries.count > 0 ? playedCountries.get(0).alpha_2 : _country
         getTrending1.order = "clicktrend"
         getTrending1.offset = 0

qml/pages/CountryListPage.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.0
 import Sailfish.Silica 1.0
 import QtQuick.LocalStorage 2.0
+import "../helpers/db.js" as Favorites
 import "../delegates"
 
 Page {
@@ -19,14 +20,14 @@ Page {
         header: Column {
             width: parent.width
 
-            PageHeader {title: "Community Radio Browser";description: "Found "+view.count + " countries"}
+            PageHeader {title: "Community Radio Browser";description: qsTr("Found")+" "+view.count + " " +qsTr("countries")}
 
             SearchField {
                 id: sfield
                 width: parent.width
-                placeholderText: "Search"
+                placeholderText: qsTr("Search")
                 text: ""
-                inputMethodHints: Qt.ImhNoAutoUppercase //| Qt.ImhNoPredictiveText
+                inputMethodHints: Qt.ImhNoAutoUppercase
                 EnterKey.iconSource: "image://theme/icon-m-enter-close"
                 EnterKey.onClicked: {focus = false}
                 focus: sfocus
@@ -42,7 +43,7 @@ Page {
 
             onClicked: {
                 sfocus=false;
-                settings.setValue("lastCountry",alpha_2)
+                Favorites.setSetting("lastCountry",alpha_2)
                 pageStack.push("CountryStationsPage.qml",{stationCount: stationcount,_countrycode: alpha_2,searchby:"name"})
             }
         }

qml/pages/CountryStationsPage.qml

@@ -21,10 +21,10 @@ Page {
 
     onSearchbyChanged: {
         switch (searchby){
-            case "name": sortedby = "Sorted by Name";break;
-            case "votes": sortedby = "Most likes";break;
-            case "clicktrend": sortedby = "Trending right now";break;
-            case "clickcount": sortedby = "Most played";
+            case "name": sortedby = qsTr("Sorted by Name");break;
+            case "votes": sortedby = qsTr("Most likes");break;
+            case "clicktrend": sortedby = qsTr("Trending right now");break;
+            case "clickcount": sortedby = qsTr("Most played");
         }
     }
 
@@ -47,8 +47,8 @@ Page {
         ViewPlaceholder {
             anchors.centerIn: parent
             enabled: view.count == 0
-            text: getCountryStations.finished && view.count === 0 ? "Oh no..." : "Please wait"
-            hintText: getCountryStations.finished && view.count === 0 ? "No radio stations!?!" : "getting radio stations"
+            text: getCountryStations.finished && view.count === 0 ? qsTr("Oh no...") : qsTr("Please wait")
+            hintText: getCountryStations.finished && view.count === 0 ? qsTr("No radio stations!?!") : qsTr("getting radio stations")
         }
 
         VerticalScrollDecorator {}
@@ -74,7 +74,7 @@ Page {
                    anchors.topMargin: Theme.paddingLarge
                    anchors.right: parent.right
                    anchors.left: parent.left
-                   anchors.rightMargin: Theme.paddingLarge//headerLogo.width + (Theme.paddingLarge * 2)
+                   anchors.rightMargin: Theme.paddingLarge
                    anchors.leftMargin: Theme.paddingLarge
 
                    Row {
@@ -94,7 +94,7 @@ Page {
                            color: Theme.highlightColor
                            wrapMode: Text.WordWrap
                            elide: Text.ElideLeft
-                           text: getCountryStations.country //+ " ["+stationCount+"]"
+                           text: getCountryStations.country
                        }
                    }
                    Label {
@@ -102,7 +102,7 @@ Page {
                        color: Theme.secondaryHighlightColor
                        width: parent.width
                        horizontalAlignment: Text.AlignRight
-                       text: sortedby//view.count + " channels"
+                       text: sortedby
                    }
                }
             }
@@ -112,7 +112,7 @@ Page {
                 width: parent.width
                 SearchField {
                     id: sfield
-                    placeholderText: "Search"
+                    placeholderText: qsTr("Search")
                     inputMethodHints: Qt.ImhNoAutoUppercase
                     EnterKey.iconSource: "image://theme/icon-m-enter-close"
                     EnterKey.onClicked: focus = false
@@ -145,11 +145,11 @@ Page {
 
             ComboBox {
                 id: searchCombo
-                label: "Search by:"
+                label: qsTr("Search by:")
                 currentIndex: comboIndex
                 menu: ContextMenu {
-                    MenuItem { text: "Name" }
-                    MenuItem { text: "Tag" }
+                    MenuItem { text: qsTr("Name") }
+                    MenuItem { text: qsTr("Tag") }
                 }
                 onValueChanged: {
                     switch(currentIndex) {
@@ -168,19 +168,19 @@ Page {
 
         PullDownMenu {
             MenuItem {
-                text: "Name"
+                text: qsTr("Name")
                 onClicked: {getCountryStations.clear=true;getCountryStations.order = "name";getCountryStations.getStations()}//;xmlModel.running = true}
             }
             MenuItem {
-                text: "Most likes"
+                text: qsTr("Most likes")
                 onClicked: {getCountryStations.clear=true;getCountryStations.order = "votes";getCountryStations.getStations()}//;xmlModel.running = true}
             }
             MenuItem {
-                text: "Most played"
+                text: qsTr("Most played")
                 onClicked: {getCountryStations.clear=true;getCountryStations.order = "clickcount";getCountryStations.getStations()}//xmlModel.running = true}
             }
             MenuItem {
-                text: "Trending right now"
+                text: qsTr("Trending right now")
                 onClicked: {getCountryStations.clear=true;getCountryStations.order = "clicktrend";getCountryStations.getStations()}//xmlModel.running = true}
             }
         }
@@ -190,9 +190,9 @@ Page {
         delegate: StationsDelegate{
             onClicked: {
                 if (model.url_resolved !== radioPlayer._url_resolved) {
-                    radioPlayer._favicon = model.favicon
+                    radioPlayer._cc = model.countrycode
                     radioPlayer._name = model.name
-                    radioPlayer._countrycode = model.countrycode
+                    radioPlayer._favicon = model.favicon
                     radioPlayer._tags = model.tags
                     radioPlayer._codec = model.codec
                     radioPlayer._bitrate = model.bitrate
@@ -205,6 +205,7 @@ Page {
             }
         }
     }
+
     Component.onCompleted: {
         getCountryStations.countrycode=_countrycode
         getCountryStations.order=searchby

qml/pages/FavoritesPage.qml

@@ -24,8 +24,8 @@ Page {
             width: parent.width
             spacing: Theme.paddingLarge
             PageHeader{
-            title: "Favorites"
-            description: "Radio stations: "+view.count
+            title: qsTr("Favorites")
+            description: qsTr("Radio stations: ")+view.count
             }
 
         Row {
@@ -43,7 +43,7 @@ Page {
                 fontColor: down ? Theme.secondaryColor : Theme.secondaryColor
                 iconVisible: false
           //      icon: "image://theme/icon-m-home" //"image://theme/icon-m-video"
-                text: "By name"
+                text: qsTr("By name")
                 onButtonClick: {showP=0.0;tab = 0;Favorites.getFavorites(favorites,"name",10000)}
             }
             TabButton {
@@ -55,7 +55,7 @@ Page {
                 fontColor: down ? Theme.secondaryColor : Theme.secondaryColor
                 iconVisible: false
             //    icon: "image://theme/icon-m-search"
-                text: "Most played"
+                text: qsTr("Most played")
                 onButtonClick: {showP=0.0;tab = 1;Favorites.getFavorites(favorites,"myclickcount",10000)}
             }
             TabButton {
@@ -67,7 +67,7 @@ Page {
                 fontColor: down ? Theme.secondaryColor : Theme.secondaryColor
                 iconVisible: false
              //   icon: "image://theme/icon-m-favorite"
-                text: "Last played"
+                text: qsTr("Last played")
                 onButtonClick: {showP=0.0;tab = 2;Favorites.getFavorites(favorites,"myclicktimestamp",10000);console.log("CLICK")}
             }
         }
@@ -78,8 +78,8 @@ Page {
         ViewPlaceholder {
             anchors.centerIn: allRadio.center
             enabled: view.count == 0
-            text: "Favorites"
-            hintText: "add favorites here"
+            text: qsTr("Favorites")
+            hintText: qsTr("add favorites here")
         }
 
         VerticalScrollDecorator {}
@@ -89,7 +89,7 @@ Page {
                 if (model.url_resolved !== radioPlayer._url_resolved) {
                     radioPlayer._favicon = model.favicon
                     radioPlayer._name = model.name
-                    radioPlayer._countrycode = model.countrycode
+                    radioPlayer._cc = model.countrycode
                     radioPlayer._tags = model.tags
                     radioPlayer._codec = model.codec//getCodec(model.codec)
                     radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
@@ -99,12 +99,8 @@ Page {
                     radioPlayer._stationuuid = model.stationuuid
                     radioPlayer._favorite = model.favorite ? true : false
                     radioPlayer.fav
-                    //pageStack.push("RadioPlayerPage.qml")
                     radioPlayer.playlistIndex = index
-
-                    console.log("Index: "+index)
-
-                }
+                } else radioPlayer.resumeStream()
             }
         }
         function updateFav() {

qml/pages/HistoryPage.qml

@@ -19,12 +19,12 @@ Page {
         ViewPlaceholder {
             anchors.centerIn: allRadio.center
             enabled: view.count == 0
-            text: "History"
-            hintText: "see you play history here"
+            text: qsTr("History")
+            hintText: qsTr("see you play history here")
         }
 
         VerticalScrollDecorator {}
-        header: PageHeader{title: "Play history";description: "Radio stations: "+view.count}
+        header: PageHeader{title: qsTr("Play history");description: qsTr("Radio stations: ")+view.count}
 
 
        /* onAtYEndChanged: {
@@ -42,7 +42,7 @@ Page {
                 if (model.url_resolved !== radioPlayer._url_resolved) {
                     radioPlayer._favicon = model.favicon
                     radioPlayer._name = model.name
-                    radioPlayer._countrycode = model.countrycode
+                    radioPlayer._cc = model.countrycode
                     radioPlayer._tags = model.tags
                     radioPlayer._codec = model.codec//getCodec(model.codec)
                     radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
@@ -53,7 +53,7 @@ Page {
                     radioPlayer._favorite = model.favorite ? true : false
                     radioPlayer.playlistIndex = favoriteView.currentIndex
                     //pageStack.push("RadioPlayerPage.qml")
-                }
+                } else radioPlayer.resumeStream()
             }
         }
         function updateHist() {

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 ? true : false
+    property bool keepScreenOn: Qt.application.active && radioPlayer.isPlaying && radioPlayer.radioVideo ? true : false
 
     allowedOrientations: radioPlayer.isPlaying && radioPlayer.radioVideo ? Orientation.All : Orientation.Portrait
 
@@ -33,7 +33,7 @@ Page {
 
     PageHeader {
        id: pheader
-       z: orientation === Orientation.Portrait || !screenTimer.running ? 98 : 0
+       z: orientation === Orientation.Portrait //|| !screenTimer.running ? 98 : 0
        visible: orientation !== Orientation.LandscapeMask
 
        Column {
@@ -63,7 +63,7 @@ Page {
                    height: countryName.height * 0.9
                    fillMode: Image.PreserveAspectFit
                    smooth: false
-                   source: radioPlayer._countrycode === "" ? "../images/bycountry_t.png" : "../flags/"+radioPlayer._countrycode.toLowerCase()+".png"
+                   source: radioPlayer._cc === "" ? "../images/bycountry_t.png" : "../flags/"+radioPlayer._cc.toLowerCase()+".png"
                }
            }
            Label {
@@ -263,9 +263,9 @@ Page {
                     id: sleeptimer
                     source: "image://theme/icon-s-timer"
                     height: play.height
-                    width: height
+                    width: favorite.height
                     fillMode: Image.PreserveAspectFit
-                    anchors.verticalCenter: play.verticalCenter
+                    anchors.verticalCenter: favorite.verticalCenter
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
@@ -282,7 +282,7 @@ Page {
                         anchors.fill: parent
                         onClicked: {
                             radioPlayer._favorite ? radioPlayer._favorite = false : radioPlayer._favorite = true
-                            radioPlayer.setStationFavorite(radioPlayer._stationuuid,radioPlayer._name,radioPlayer._countrycode,radioPlayer._homepage,radioPlayer._url_resolved,radioPlayer._favicon,radioPlayer._tags,radioPlayer._codec,radioPlayer._bitrate,radioPlayer._hls,radioPlayer._favorite)
+                            radioPlayer.setStationFavorite(radioPlayer._stationuuid,radioPlayer._name,radioPlayer._cc,radioPlayer._homepage,radioPlayer._url_resolved,radioPlayer._favicon,radioPlayer._tags,radioPlayer._codec,radioPlayer._bitrate,radioPlayer._hls,radioPlayer._favorite)
                         }
                     }
                 }
@@ -291,6 +291,7 @@ Page {
                     property bool returnValue: false
                     source: returnValue ? "image://theme/icon-m-like" : "image://theme/icon-m-outline-like"
                     height: favorite.height
+                    anchors.verticalCenter: favorite.verticalCenter
                     width: height
                     fillMode: Image.PreserveAspectFit
                     onReturnValueChanged: console.log(" RETURN VALUE: "+upvote.returnValue)

qml/pages/SearchStationsPage.qml

@@ -21,10 +21,10 @@ Page {
     onSearchbyChanged: {
     //    console.log("SEARCHBY: "+searchby)
         switch (searchby){
-            case "name": sortedby = "Sorted by Name";break;
-            case "votes": sortedby = "Most likes";break;
-            case "clicktrend": sortedby = "Trending right now";break;
-            case "clickcount": sortedby = "Most played";
+            case "name": sortedby = qsTr("By Name");break;
+            case "votes": sortedby = qsTr("Most likes");break;
+            case "clicktrend": sortedby = qsTr("Trending right now");break;
+            case "clickcount": sortedby = qsTr("Most played");
         }
     }
 
@@ -48,8 +48,8 @@ Page {
         ViewPlaceholder {
             anchors.centerIn: parent
             enabled: view.count == 0
-            text: getCountryStations.finished && view.count === 0 ? "Search" : "Please wait"
-            hintText: getCountryStations.finished && view.count === 0 ? "radio stations" : "getting radio stations"
+            text: getCountryStations.finished && view.count === 0 ? qsTr("Search") : qsTr("Please wait")
+            hintText: getCountryStations.finished && view.count === 0 ? qsTr("radio stations") : qsTr("getting radio stations")
         }
 
         VerticalScrollDecorator {}
@@ -114,7 +114,7 @@ Page {
                 width: parent.width
                 SearchField {
                     id: sfield
-                    placeholderText: "Search"
+                    placeholderText: qsTr("Search")
                     inputMethodHints: Qt.ImhNoAutoUppercase //| Qt.ImhNoPredictiveText
                     EnterKey.iconSource: "image://theme/icon-m-enter-close"
                     EnterKey.onClicked: focus = false
@@ -150,11 +150,11 @@ Page {
 
             ComboBox {
                 id: searchCombo
-                label: "Search by:"
+                label: qsTr("Search by:")
                 currentIndex: 0
                 menu: ContextMenu {
-                    MenuItem { text: "Name" }
-                    MenuItem { text: "Tag" }
+                    MenuItem { text: qsTr("Name") }
+                    MenuItem { text: qsTr("Tag") }
                 }
                 onValueChanged: {
                     switch(currentIndex) {
@@ -173,20 +173,20 @@ Page {
 
         PullDownMenu {
             MenuItem {
-                text: "Name"
+                text: qsTr("Name")
                 onClicked: {getCountryStations.order = "name";if (view.count > 0) {getCountryStations.clear=true;getCountryStations.getStations()}}//;xmlModel.running = true}
             }
 
             MenuItem {
-                text: "Most likes"
+                text: qsTr("Most likes")
                 onClicked: {getCountryStations.order = "votes";if (view.count > 0) {getCountryStations.clear=true;getCountryStations.getStations()}}//;xmlModel.running = true}
             }
             MenuItem {
-                text: "Most played"
+                text: qsTr("Most played")
                 onClicked: {getCountryStations.order = "clickcount";if (view.count > 0) {getCountryStations.clear=true;getCountryStations.getStations()}}//xmlModel.running = true}
             }
             MenuItem {
-                text: "Trending right now"
+                text: qsTr("Trending right now")
                 onClicked: {getCountryStations.order = "clicktrend";if (view.count > 0) {getCountryStations.clear=true;getCountryStations.getStations()}}//xmlModel.running = true}
             }
         }
@@ -197,7 +197,7 @@ Page {
                 if (model.url_resolved !== radioPlayer._url_resolved) {
                     radioPlayer._favicon = model.favicon
                     radioPlayer._name = model.name
-                    radioPlayer._countrycode = model.countrycode
+                    radioPlayer._cc = model.countrycode
                     radioPlayer._tags = model.tags
                     radioPlayer._codec = model.codec//getCodec(model.codec)
                     radioPlayer._bitrate = model.bitrate //getBitrate(model.bitrate)
@@ -208,7 +208,7 @@ Page {
                     //radioPlayer._favorite = model.favorite ? true : false
                     radioPlayer.getStationFavorite(model.stationuuid)
                   //  pageStack.push("RadioPlayerPage.qml")
-                }
+                } else radioPlayer.resumeStream()
             }
         }
     }

qml/pages/SecondPage.qml

@@ -1,30 +0,0 @@
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-
-Page {
-    id: page
-
-    // The effective value will be restricted by ApplicationWindow.allowedOrientations
-    allowedOrientations: Orientation.All
-
-    SilicaListView {
-        id: listView
-        model: 20
-        anchors.fill: parent
-        header: PageHeader {
-            title: qsTr("Nested Page")
-        }
-        delegate: BackgroundItem {
-            id: delegate
-
-            Label {
-                x: Theme.horizontalPageMargin
-                text: qsTr("Item") + " " + index
-                anchors.verticalCenter: parent.verticalCenter
-                color: delegate.highlighted ? Theme.highlightColor : Theme.primaryColor
-            }
-            onClicked: console.log("Clicked " + index)
-        }
-        VerticalScrollDecorator {}
-    }
-}

qml/pages/SettingsPage.qml

@@ -1,39 +1,91 @@
 import QtQuick 2.0
+import QtQml 2.2
 import Sailfish.Silica 1.0
-Page {
-    Flickable {
-        id: flick
-        width:parent.width
-        height: parent.height - Theme.paddingLarge * 3
-        anchors.top: parent.top
-        anchors.topMargin: Theme.paddingLarge * 3
-        contentHeight: column1.height
+import QtQuick.LocalStorage 2.0
+import QtGraphicalEffects 1.0
+import "../helpers/db.js" as Favorites
+
+Dialog {
+    id: settingsDialog
 
     Column {
-            id: column1
-            width: parent.width
-            spacing: Theme.paddingLarge
+        anchors.left: parent.left
+        anchors.right: parent.right
+        spacing: Theme.paddingMedium
 
-            Image{
-                source: "../images/community.png"
-                height: Theme.itemSizeHuge
-                width: height
-                fillMode: Image.PreserveAspectFit
-                anchors {
-                    horizontalCenter: parent.horizontalCenter
-                }
-            }
+        DialogHeader {}
 
         Label {
-                width: parent.width-70
-                font.pixelSize: Theme.fontSizeSmall
-                text: qsTr("Working on it.....")
-                anchors.horizontalCenter: parent.horizontalCenter
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignHCenter
-                height: 200
-                wrapMode: Text.WordWrap
+            anchors.right: parent.right
+            anchors.rightMargin: Theme.paddingLarge
+            color: Theme.highlightColor
+            font.pixelSize: Theme.fontSizeLarge
+            text: qsTr("Player settings")
+        }
+
+        Separator {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: Theme.paddingMedium
+            color: Theme.highlightColor
+        }
+
+        ComboBox {
+            id: appStart
+            width: parent.width
+            label: qsTr("Auto play")
+            anchors.margins: Theme.paddingLarge
+            description: qsTr("What to do when AllRadio2 starts")
+            currentIndex: Favorites.getSetting("appStart",0)
+            menu: ContextMenu {
+                MenuItem { text: qsTr("Off") }
+                MenuItem { text: qsTr("Last played") }
+                MenuItem { text: qsTr("Random favorite") }
             }
         }
+        Label {
+            anchors.right: parent.right
+            anchors.rightMargin: Theme.paddingLarge
+            color: Theme.highlightColor
+            font.pixelSize: Theme.fontSizeLarge
+            text: qsTr("Server settings")
+        }
+
+        Separator {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: Theme.paddingMedium
+            color: Theme.highlightColor
+        }
+
+        ComboBox {
+            id: serverL
+            width: parent.width
+            anchors.margins: Theme.paddingLarge
+            label: qsTr("Connected to")
+            description: qsTr("Available servers (just information, won't change server yet!)")
+            currentIndex: radioBrowser.serverIndex
+            menu : ContextMenu {
+                id: contextMenu
+                    Repeater {
+                        model: radioBrowser.serversModel
+                        delegate: MenuItem {
+                            text: server
+                            onClicked: radioBrowser.connectServer(currentIndex)//{radioBrowser.server = serverUrl;radioBrowser.serverIndex=currentIndex;}//console.log("***"+serverUrl)
                         }
                     }
+
+            }
+
+            /*   menu: ContextMenu {
+                MenuItem { text: qsTr("None") }
+                MenuItem { text: qsTr("Last played") }
+                MenuItem { text: qsTr("Random favorite") }
+            }*/
+        }
+    }
+
+    onAccepted: Favorites.setSetting("appStart",appStart.currentIndex)
+
+}
+

qml/pages/SleepTimerPage.qml

@@ -15,7 +15,7 @@ Page {
         clip: true
         anchors.bottomMargin: mediaPlayerPanel.visibleSize
         VerticalScrollDecorator {}
-            PageHeader {title: "Sleep timer";description: ((sleepTime > 0) ? (qsTr("Remaning time: ") + (sleepTime) + qsTr(" minutes")) : qsTr("choose time: ") + minutes.value )}
+            PageHeader {title: qsTr("Sleep timer");description: ((sleepTime > 0) ? (qsTr("Remaning time: ") + (sleepTime) + qsTr(" minutes")) : qsTr("choose time: ") + minutes.value )}
 
             ValuePicker {
                 id: minutes

qml/pages/TagListPage.qml

@@ -36,8 +36,8 @@ Page {
             width: parent.width
 
             PageHeader {
-                title: "Played tags"
-                description: "Found "+playedTags.count
+                title: qsTr("Played tags")
+                description: qsTr("Found ")+playedTags.count
             }
         }
 

rpm/harbour-allradio.spec

@@ -1,10 +1,10 @@
 Name:       harbour-allradio
 
 Summary:    AllRadio
-Version:    2.0.15
+Version:    2.0.21
 Release:    1
 Group:      Qt/Qt
-License:    GPL2
+License:    GPLv2
 URL:        https://gitea.nesnomis.nu/nesnomis/harbour-allradio/
 Source0:    %{name}-%{version}.tar.bz2
 Requires:   sailfishsilica-qt5 >= 0.10.9
@@ -26,7 +26,27 @@ BuildRequires:  pkgconfig(nemonotifications-qt5)
 BuildRequires:  pkgconfig(dbus-1)
 
 %description
-AllRadio2 is a new version of AllRadio.
+AllRadio2 is a new version of AllRadio, an internet radio player.
+
+%if "%{?vendor}" == "chum"
+PackageName: AllRadio2
+Type: desktop-application
+PackagerName: Niels Simonsen (nesnomis)
+Categories:
+ - Radio
+ - Audio
+ - Video
+ - Media
+Icon: https://gitea.nesnomis.nu/nesnomis/harbour-allradio/raw/branch/master/icons/128x128/harbour-allradio.png
+Screenshots:
+- https://gitea.nesnomis.nu/nesnomis/harbour-allradio/wiki/raw/Screenshot_20250522_222021_001.png
+- https://gitea.nesnomis.nu/nesnomis/harbour-allradio/wiki/raw/Screenshot_20250522_222038_001.png
+- https://gitea.nesnomis.nu/nesnomis/harbour-allradio/wiki/raw/Screenshot_20250522_222152_001.png
+- 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
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}

translations/harbour-allradio-de.ts

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="de_DE">
 <context>
     <name>AboutPage</name>
     <message>
-        <source>AllRadio is an internet radio station player</source>
+        <source>License: GPLv2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -46,6 +46,25 @@
         <source>Trending in</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Trending in the world</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CountryListPage</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>countries</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CountryNameModel</name>
@@ -1054,6 +1073,57 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CountryStationsPage</name>
+    <message>
+        <source>Oh no...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No radio stations!?!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>getting radio stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most likes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trending right now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorted by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FavoriteStations</name>
     <message>
@@ -1068,22 +1138,140 @@
         <source>Add to favorites</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DOWN</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SecondPage</name>
+    <name>FavoritesPage</name>
     <message>
-        <source>Nested Page</source>
-        <translation>Unterseite</translation>
+        <source>Favorites</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Item</source>
-        <translation>Element</translation>
+        <source>Radio stations: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>By name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add favorites here</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HistoryPage</name>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>see you play history here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Radio stations: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchStationsPage</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>radio stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>getting radio stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most likes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trending right now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>By Name</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsPage</name>
     <message>
-        <source>Working on it.....</source>
+        <source>Player settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What to do when AllRadio2 starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Random favorite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available servers (just information, won&apos;t change server yet!)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1113,6 +1301,36 @@
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sleep timer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SmallTagsDelegate</name>
+    <message>
+        <source>No Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Splash</name>
+    <message>
+        <source>Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StationsDelegate</name>
@@ -1120,5 +1338,65 @@
         <source>Vote on Community Radio Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[OFFLINE]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabDelegate</name>
+    <message>
+        <source>Favorites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TagImage</name>
+    <message>
+        <source>No Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TagListPage</name>
+    <message>
+        <source>Played tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>jsFunctions</name>
+    <message>
+        <source>morning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>afternoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>evening</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

translations/harbour-allradio.ts

@@ -4,8 +4,8 @@
 <context>
     <name>AboutPage</name>
     <message>
-        <source>AllRadio is an internet radio station player</source>
-        <translation type="unfinished"></translation>
+        <source>License: GPLv2</source>
+        <translation>Licens: GPLv2</translation>
     </message>
 </context>
 <context>
@@ -24,7 +24,7 @@
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Sök</translation>
     </message>
     <message>
         <source>Countries</source>
@@ -46,6 +46,25 @@
         <source>Trending in</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Trending in the world</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CountryListPage</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Sök</translation>
+    </message>
+    <message>
+        <source>Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>countries</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CountryNameModel</name>
@@ -1054,6 +1073,57 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CountryStationsPage</name>
+    <message>
+        <source>Oh no...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No radio stations!?!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>getting radio stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Sök</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most likes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trending right now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorted by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FavoriteStations</name>
     <message>
@@ -1068,22 +1138,140 @@
         <source>Add to favorites</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DOWN</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>SecondPage</name>
+    <name>FavoritesPage</name>
     <message>
-        <source>Nested Page</source>
+        <source>Favorites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Item</source>
+        <source>Radio stations: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>By name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>add favorites here</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HistoryPage</name>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>see you play history here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Radio stations: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchStationsPage</name>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Sök</translation>
+    </message>
+    <message>
+        <source>Please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>radio stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>getting radio stations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most likes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trending right now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>By Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsPage</name>
     <message>
-        <source>Working on it.....</source>
+        <source>Player settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What to do when AllRadio2 starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last played</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Random favorite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available servers (just information, won&apos;t change server yet!)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1113,6 +1301,36 @@
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sleep timer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SmallTagsDelegate</name>
+    <message>
+        <source>No Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Splash</name>
+    <message>
+        <source>Found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>StationsDelegate</name>
@@ -1120,5 +1338,65 @@
         <source>Vote on Community Radio Browser</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[OFFLINE]</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabDelegate</name>
+    <message>
+        <source>Favorites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Sök</translation>
+    </message>
+</context>
+<context>
+    <name>TagImage</name>
+    <message>
+        <source>No Tag</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TagListPage</name>
+    <message>
+        <source>Played tags</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>jsFunctions</name>
+    <message>
+        <source>morning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>afternoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>evening</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>