Just fixes
This commit is contained in:
		
							parent
							
								
									bf83fc2c24
								
							
						
					
					
						commit
						3370a11f00
					
				| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -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 { | ||||
|  | ||||
| @ -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")} | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -18,8 +18,8 @@ ApplicationWindow | ||||
|     property string _version: "2.0.16" | ||||
|     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 currentListIndex: -1 | ||||
|     //property int currentListCount: -1 | ||||
|     property int sleepTime: 0 | ||||
|     //property alias settings: allradioSettings | ||||
|     property alias mediaPlayerPanel: mediaPlayerPanel | ||||
|  | ||||
| @ -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);
 | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -44,9 +44,9 @@ MediaPlayer { | ||||
|     property bool isPaused: false | ||||
|     property int stationOk: 3 | ||||
|     property int maxTagClicks: 0 | ||||
|     property int playlistCount: playlist.count - 1 | ||||
|     //property int playlistIndex: Favorites.getSetting("playlistIndex",-1) | ||||
|     property int playlistIndex: -1 | ||||
|     property int playlistCount: playlist.count -1 | ||||
|     property int playlistIndex: Favorites.getSetting("playlistIndex",-1) | ||||
|     //property int playlistIndex: playlistCount = Favorites.getSetting("playlistIndex",-1) | ||||
|     property QDtimer timer: QDtimer { | ||||
|         id: qdTimer | ||||
|         interval: 200; running: false; repeat: false | ||||
| @ -155,12 +155,12 @@ MediaPlayer { | ||||
| 
 | ||||
| 
 | ||||
|     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 //: playlistIndex = 0 | ||||
|         loadPlaylistSelected() | ||||
|     } | ||||
| 
 | ||||
| @ -196,7 +196,7 @@ MediaPlayer { | ||||
|         isPlaying = true | ||||
|         isPaused = false | ||||
|         qdTimer.start() | ||||
|         //Favorites.setSetting("playlistIndex",playlistIndex) | ||||
|         if (_favorite) Favorites.setSetting("playlistIndex",playlistIndex) | ||||
|     } | ||||
| 
 | ||||
|     onError: { | ||||
| @ -383,6 +383,7 @@ 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") | ||||
|         } | ||||
| @ -434,6 +435,6 @@ MediaPlayer { | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|     Component.onCompleted: {reloadDbData();loadRecentPlay()} | ||||
|     Component.onCompleted: {reloadDbData();_favorite ? loadPlaylistSelected() : loadRecentPlay()} | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -29,12 +29,12 @@ Column { | ||||
|     } | ||||
| 
 | ||||
|     Label { | ||||
|         text: radioBrowser.serversModel.count > 0 ? "Found: "+radioBrowser.serversModel.count + " servers" : "Searching for servers..." | ||||
|         text: radioBrowser.serversModel.count > 0 ? qsTr("Found")+": "+radioBrowser.serversModel.count + " "+qsTr("servers") : qsTr("Searching for servers...") | ||||
|         anchors.horizontalCenter: parent.horizontalCenter | ||||
|     } | ||||
|     Label { | ||||
|         visible: radioBrowser.serversModel.count > 0 | ||||
|         text: "Connecting to:" | ||||
|         text: qsTr("Connecting to:") | ||||
|         anchors.horizontalCenter: parent.horizontalCenter | ||||
|     } | ||||
|     Label { | ||||
|  | ||||
| @ -16,13 +16,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 | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -324,7 +324,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}) | ||||
|             } | ||||
| 
 | ||||
| @ -364,7 +364,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")//playedCountries.count > 0 ? "Trending in " + radioBrowser.getCountryName(playedCountries.get(0).alpha_2) : "Trending in " + radioBrowser.getCountryName(_country) | ||||
|                 onClicked: pageStack.push("CountryStationsPage.qml",{searchby:"clicktrend",_countrycode: ""}) | ||||
|             } | ||||
| 
 | ||||
|  | ||||
| @ -7,6 +7,10 @@ | ||||
|         <source>AllRadio is an internet radio station player</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>License: GPLv2</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>AllRadio</name> | ||||
| @ -46,6 +50,10 @@ | ||||
|         <source>Trending in</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Trending in the world</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>CountryNameModel</name> | ||||
| @ -1068,6 +1076,10 @@ | ||||
|         <source>Add to favorites</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>DOWN</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>SecondPage</name> | ||||
| @ -1114,11 +1126,86 @@ | ||||
|         <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 for servers...</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Connecting to:</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>StationsDelegate</name> | ||||
|     <message> | ||||
|         <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>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> | ||||
|  | ||||
| @ -7,6 +7,10 @@ | ||||
|         <source>AllRadio is an internet radio station player</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>License: GPLv2</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>AllRadio</name> | ||||
| @ -46,6 +50,10 @@ | ||||
|         <source>Trending in</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Trending in the world</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>CountryNameModel</name> | ||||
| @ -1068,6 +1076,10 @@ | ||||
|         <source>Add to favorites</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>DOWN</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>SecondPage</name> | ||||
| @ -1114,11 +1126,86 @@ | ||||
|         <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 for servers...</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
|     <message> | ||||
|         <source>Connecting to:</source> | ||||
|         <translation type="unfinished"></translation> | ||||
|     </message> | ||||
| </context> | ||||
| <context> | ||||
|     <name>StationsDelegate</name> | ||||
|     <message> | ||||
|         <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>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> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user