mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- weather: rename xml files

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-01-18 23:31:53 +01:00
committed by Thilo Graf
parent ffe47ae214
commit 6c46bdcc7f
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/weather/Makefile.am
View File

@@ -1,9 +1,9 @@
configdir = $(CONFIGDIR) configdir = $(CONFIGDIR)
config_DATA = \ config_DATA = \
weather_favorites.xml weather-favorites.xml
weatherdir = $(DATADIR)/neutrino/weather weatherdir = $(DATADIR)/neutrino/weather
weather_DATA = \ weather_DATA = \
weather_locations.xml weather-locations.xml

0
data/weather/weather_favorites.xml → data/weather/weather-favorites.xml
View File

0
data/weather/weather_locations.xml → data/weather/weather-locations.xml
View File

7
src/gui/weather_setup.cpp
View File

@@ -43,8 +43,8 @@ CWeatherSetup::CWeatherSetup()
selected = -1; selected = -1;
locations.clear(); locations.clear();
loadLocations(CONFIGDIR "/weather_favorites.xml"); loadLocations(CONFIGDIR "/weather-favorites.xml");
loadLocations(WEATHERDIR "/weather_locations.xml"); loadLocations(WEATHERDIR "/weather-locations.xml");
} }
CWeatherSetup::~CWeatherSetup() CWeatherSetup::~CWeatherSetup()
@@ -103,7 +103,8 @@ int CWeatherSetup::showSelectWeatherLocation()
if (locations.empty()) if (locations.empty())
{ {
ShowHint("Warning", "Failed to load weather_locations.xml\nPlease press any key or wait some seconds! ...", 700, 10, NULL, NEUTRINO_ICON_HINT_IMAGEINFO, CComponentsHeader::CC_BTN_EXIT); // TODO: localize hint
ShowHint("Warning", "Failed to load weather-favorites.xml or weather-locations.xml\nPlease press any key or wait some seconds! ...", 700, 10, NULL, NEUTRINO_ICON_HINT_IMAGEINFO, CComponentsHeader::CC_BTN_EXIT);
g_settings.weather_location = "52.52,13.40"; g_settings.weather_location = "52.52,13.40";
g_settings.weather_city = "Berlin"; g_settings.weather_city = "Berlin";
CWeather::getInstance()->setCoords(g_settings.weather_location, g_settings.weather_city); CWeather::getInstance()->setCoords(g_settings.weather_location, g_settings.weather_city);