Weather: Unifying ini files.

Signed-off-by: Luiz Agostini <luiz.agostini@openbossa.org>

5 files changed, 8 insertions, 104 deletions

diff --git a/weather/resources.qrc b/weather/resources.qrc
index bdb27bc..d46c599 100644
--- a/weather/resources.qrc
+++ b/weather/resources.qrc
@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file alias="weather.ini">weather.ini</file>
-        <file alias="symbian.ini">symbian.ini</file>
         <file>images/weather_elements/bg_day_clear.png</file>
         <file>images/weather_elements/bg_day_heavyrain.png</file>
         <file>images/weather_elements/bg_day_rain.png</file>
diff --git a/weather/settings.cpp b/weather/settings.cpp
index cdfaa26..71ec5fa 100644
--- a/weather/settings.cpp
+++ b/weather/settings.cpp
@@ -30,6 +30,8 @@
 ****************************************************************************/
 
 #include "settings.h"
+#include <QApplication>
+#include <QDesktopWidget>
 #include <QTimer>
 #include <QDebug>
 
@@ -38,7 +40,7 @@
 #include <coemain.h>
 #include <aknappui.h>
 
-#define SETTINGS_FILE   "e://resources/apps/symbian.ini"
+#define SETTINGS_FILE   "e://resources/apps/weather.ini"
 #else
 #define SETTINGS_FILE   ":/weather.ini"
 #endif
@@ -56,7 +58,11 @@ Settings *Settings::instance()
 
 QSize Settings::windowSize()
 {
+#ifdef Q_OS_SYMBIAN
+    static const QSize result(QApplication::desktop()->screenGeometry().size());
+#else
     static const QSize result(instance()->m_settings.value("windowSize").toSize());
+#endif
     return result;
 }
 
diff --git a/weather/symbian.ini b/weather/symbian.ini
deleted file mode 100644
index 6c37c72..0000000
--- a/weather/symbian.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[General]
-windowSize = @Size(360 640)
-list_cities_size = @Size(480 800)
-increased_close_button = 15
-
-[Timezones]
-Vancouver = -8
-San Francisco = -8
-Rio de Janeiro = -3
-London = 0
-Beijing = 8
-Tokyo = 9
-Cairo = 2
-
-[Selected Cities]
-New York = -5
-Oslo = 1
-Cape Town = 2
-Moscow = 3
-Brisbane = 10
diff --git a/weather/symbian_3.2.ini b/weather/symbian_3.2.ini
deleted file mode 100644
index b022c8f..0000000
--- a/weather/symbian_3.2.ini
+++ /dev/null
@@ -1,81 +0,0 @@
-[General]
-windowSize = @Size(240 320)
-title_bar_size = @Size(240 24)
-city_bar_size = @Size(240 64)
-close_button_size = @Size(10 10)
-centigrades_size = @Size(35 48)
-divisionLine_size = @Size(135 1)
-hi_size = @Size(5 7)
-low_size = @Size(5 7)
-bg_size = @Size(317 320)
-sun_size = @Size(149 149)
-cold_sun_size = @Size(121 121)
-moon_size = @Size(98 96)
-sun_line_size = @Size(1 122)
-cold_sun_line_size = @Size(1 122)
-moon_line_size = @Size(1 122)
-cloud_1_size = @Size(180 76)
-cloud_2_size = @Size(148 66)
-cloud_3_size = @Size(114 54)
-cloud_rain_1_size = @Size(180 76)
-cloud_rain_2_size = @Size(148 66)
-cloud_rain_3_size = @Size(114 54)
-cloud_storm_1_size = @Size(180 76)
-cloud_storm_2_size = @Size(148 66)
-cloud_storm_3_size = @Size(114 54)
-cloud_tstorm_1_size = @Size(180 102)
-cloud_tstorm_2_size = @Size(148 80)
-cloud_1_line_size = @Size(1 187)
-cloud_2_line_size = @Size(1 187)
-cloud_3_line_size = @Size(1 187)
-cloud_rain_1_line_size = @Size(1 187)
-cloud_rain_2_line_size = @Size(1 187)
-cloud_rain_3_line_size = @Size(1 187)
-cloud_storm_1_line_size = @Size(1 187)
-cloud_storm_2_line_size = @Size(1 187)
-cloud_storm_3_line_size = @Size(1 187)
-cloud_tstorm_1_line_size = @Size(1 187)
-cloud_tstorm_2_line_size = @Size(1 187)
-sleet_size = @Size(180 180)
-sleet_rain_size = @Size(180 180)
-rain_01_size = @Size(290 175)
-rain_02_size = @Size(290 175)
-rain_03_size = @Size(290 175)
-star_01_size = @Size(30 30)
-star_02_size = @Size(28 28)
-star_03_size = @Size(25 25)
-snow_flake_01_size = @Size(12 12)
-snow_flake_02_size = @Size(15 15)
-snow_flake_03_size = @Size(17 17)
-snow_flake_04_size = @Size(12 12)
-snow_flake_05_size = @Size(15 15)
-snow_flake_06_size = @Size(17 17)
-snow_flake_07_size = @Size(15 15)
-snow_flake_08_size = @Size(17 17)
-snow_flake_09_size = @Size(9 9)
-flurries_size = @Size(240 240)
-fog_size = @Size(317 324)
-haze_size = @Size(317 324)
-snow_size = @Size(240 240)
-list_top_size = @Size(240 8)
-list_item_bg_size = @Size(240 30)
-list_cities_size = @Size(240 300)
-list_checkbox_size = @Size(14 11)
-scroll_size = @Size(4 275)
-scroll_knob_size = @Size(5 30)
-
-
-[Timezones]
-Vancouver = -8
-San Francisco = -8
-Rio de Janeiro = -3
-London = 0
-Beijing = 8
-Tokyo = 9
-
-[Selected Cities]
-New York = -5
-Oslo = 1
-Cape Town = 2
-Moscow = 3
-Brisbane = 10
diff --git a/weather/weather.pro b/weather/weather.pro
index cb72ac4..7f73e2b 100644
--- a/weather/weather.pro
+++ b/weather/weather.pro
@@ -10,7 +10,7 @@ symbian {
         -lconnmon \
         -lcone \
         -lavkon
-    addFiles.sources = symbian.ini
+    addFiles.sources = weather.ini
     addFiles.path = e:\resources\apps
     DEPLOYMENT += addFiles
     ICON = images/icon-weather.svg