diff --git a/harbour-allradio.pro b/harbour-allradio.pro
index a8dbba8..290b2ed 100644
--- a/harbour-allradio.pro
+++ b/harbour-allradio.pro
@@ -27,9 +27,7 @@ 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/SettingsPage__.qml \
qml/pages/TagListPage.qml \
rpm/harbour-allradio.spec \
translations/*.ts \
diff --git a/qml/items/MediaPlayerPanel.qml b/qml/items/MediaPlayerPanel.qml
index db7da99..fe500e7 100644
--- a/qml/items/MediaPlayerPanel.qml
+++ b/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
- }
+ // }
}
}
}
diff --git a/qml/items/Splash.qml b/qml/items/Splash.qml
index 838e512..06fc4be 100644
--- a/qml/items/Splash.qml
+++ b/qml/items/Splash.qml
@@ -7,6 +7,10 @@ Column {
id: column
spacing: Theme.paddingMedium
anchors.centerIn: parent
+ property QDtimer timer: QDtimer {
+ id: spTimer
+ interval: 5000; running: true; repeat: false
+ }
Image {
id: logo
@@ -30,7 +34,7 @@ Column {
BusyLabel {
visible: radioBrowser.serversModel.count > 0
running: visible
- text: qsTr("Connecting to:")
+ text: qsTr("Connecting:")
anchors.horizontalCenter: parent.horizontalCenter
}
Label {
@@ -41,9 +45,9 @@ Column {
anchors.horizontalCenter: parent.horizontalCenter
}
Button {
- visible: radioBrowser.serversModel.count > 1
+ visible: radioBrowser.serversModel.count > 1 && !spTimer.running
anchors.topMargin: Theme.paddingLarge
- text: "Try another server"
+ text: qsTr("Try another server")
onClicked: radioBrowser.getRandom()
anchors.horizontalCenter: parent.horizontalCenter
}
diff --git a/qml/pages/AllRadio.qml b/qml/pages/AllRadio.qml
index 44b766f..f23bd15 100644
--- a/qml/pages/AllRadio.qml
+++ b/qml/pages/AllRadio.qml
@@ -33,8 +33,8 @@ Page {
on_LoadingChanged: {
if (!_loading) {
appAutoPlay()
- console.log(" *** AUTOPLAY")
- } else console.log(" *** INTE AUTOPLAY")
+ //console.log(" *** AUTOPLAY")
+ } //else console.log(" *** INTE AUTOPLAY")
}
Splash {
diff --git a/qml/pages/CountryListPage.qml b/qml/pages/CountryListPage.qml
index 6580ae3..2f69caf 100644
--- a/qml/pages/CountryListPage.qml
+++ b/qml/pages/CountryListPage.qml
@@ -20,7 +20,7 @@ Page {
header: Column {
width: parent.width
- PageHeader {title: "Community Radio Browser";description: qsTr("Found ")+view.count + qsTr(" countries")}
+ PageHeader {title: "Community Radio Browser";description: qsTr("Found")+" "+view.count + " " +qsTr("countries")}
SearchField {
id: sfield
diff --git a/qml/pages/CountryStationsPage.qml b/qml/pages/CountryStationsPage.qml
index 147aa33..8ccceeb 100644
--- a/qml/pages/CountryStationsPage.qml
+++ b/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");
}
}
diff --git a/qml/pages/SearchStationsPage.qml b/qml/pages/SearchStationsPage.qml
index e43ee46..e13f26c 100644
--- a/qml/pages/SearchStationsPage.qml
+++ b/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");
}
}
@@ -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
diff --git a/qml/pages/SecondPage.qml b/qml/pages/SecondPage.qml
deleted file mode 100644
index 6dbadf4..0000000
--- a/qml/pages/SecondPage.qml
+++ /dev/null
@@ -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 {}
- }
-}
diff --git a/qml/pages/SettingsPage__.qml b/qml/pages/SettingsPage__.qml
deleted file mode 100644
index 6014043..0000000
--- a/qml/pages/SettingsPage__.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-import QtQuick.LocalStorage 2.0
-import QtGraphicalEffects 1.0
-import "../helpers/db.js" as Favorites
-
-Page {
- PageHeader {
- id: pheader
- title: "Settings"
- }
-
- Flickable {
- id: flick
- width:parent.width
- height: parent.height - Theme.paddingLarge * 3
- anchors.fill: parent
- anchors.leftMargin: Theme.paddingLarge
- anchors.rightMargin: Theme.paddingLarge
- anchors.topMargin: pheader.height + Theme.paddingLarge
- //contentHeight: column1.height
-
-
-
- TextSwitch {
- id: activationSwitch
- text: "Auto play"
- description: "Play radio station on start"
- onCheckedChanged: {
- device.setStatus(checked ? DeviceState.Armed : DeviceState.Disarmed)
- }
- }
- ComboBox {
- width: parent.widht
- label: "What to play"
- menu: ContextMenu {
- MenuItem { text: "Last played" }
- MenuItem { text: "Random favorite" }
- }
- }
-
-
- /* Label {
- width: parent.width-70
- font.pixelSize: Theme.fontSizeLarge
- text: qsTr("WARNING! THis is for debugging or corrupt database. Only delete db if it is not working!!!")
- anchors.horizontalCenter: parent.horizontalCenter
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignHCenter
- wrapMode: Text.WordWrap
- }
- Button {
- text: qsTr("Delete DB")
- onClicked: Favorites.dropTable()
- anchors.horizontalCenter: parent.horizontalCenter
- } */
-
- }
-}
diff --git a/translations/harbour-allradio-de.ts b/translations/harbour-allradio-de.ts
index f367f78..1cbdafa 100644
--- a/translations/harbour-allradio-de.ts
+++ b/translations/harbour-allradio-de.ts
@@ -53,18 +53,18 @@
CountryListPage
-
- Found
-
-
-
- countries
-
-
Search
+
+ Found
+
+
+
+ countries
+
+
CountryNameModel
@@ -1119,6 +1119,10 @@
Search by:
+
+ Sorted by Name
+
+
FavoriteStations
@@ -1227,16 +1231,9 @@
Trending right now
-
-
- SecondPage
- Nested Page
- Unterseite
-
-
- Item
- Element
+ By Name
+
@@ -1319,7 +1316,11 @@
- Connecting to:
+ Connecting:
+
+
+
+ Try another server
diff --git a/translations/harbour-allradio-sv.ts b/translations/harbour-allradio-sv.ts
index 3030e0c..89a0e1b 100644
--- a/translations/harbour-allradio-sv.ts
+++ b/translations/harbour-allradio-sv.ts
@@ -53,18 +53,18 @@
CountryListPage
-
- Found
- Hittade
-
-
- countries
- länder
-
Search
Sök
+
+ Found
+ Hittade
+
+
+ countries
+ länder
+
CountryNameModel
@@ -1119,6 +1119,10 @@
Search by:
Sök efter:
+
+ Sorted by Name
+ Sortera efter namn
+
FavoriteStations
@@ -1227,16 +1231,9 @@
Trending right now
Trender just nu
-
-
- SecondPage
- Nested Page
-
-
-
- Item
-
+ By Name
+ Vid Namn
@@ -1314,14 +1311,18 @@
servers
servrar
-
- Connecting to:
- Anslutar till:
-
Searching servers
Söker efter servrar
+
+ Connecting:
+ Ansluter:
+
+
+ Try another server
+ Prova en annan server
+
StationsDelegate
diff --git a/translations/harbour-allradio.ts b/translations/harbour-allradio.ts
index 74d6e39..a01f303 100644
--- a/translations/harbour-allradio.ts
+++ b/translations/harbour-allradio.ts
@@ -53,18 +53,18 @@
CountryListPage
-
- Found
-
-
-
- countries
-
-
Search
Sök
+
+ Found
+
+
+
+ countries
+
+
CountryNameModel
@@ -1119,6 +1119,10 @@
Search by:
+
+ Sorted by Name
+
+
FavoriteStations
@@ -1227,15 +1231,8 @@
Trending right now
-
-
- SecondPage
- Nested Page
-
-
-
- Item
+ By Name
@@ -1319,7 +1316,11 @@
- Connecting to:
+ Connecting:
+
+
+
+ Try another server