HyperUI: Changed 864x480 resolution to 800x480

57 files changed, 22 insertions, 19 deletions

diff --git a/hyperui/hyperui.pro b/hyperui/hyperui.pro
index 0ab1ce4..739dfb4 100644
--- a/hyperui/hyperui.pro
+++ b/hyperui/hyperui.pro
@@ -7,6 +7,9 @@ target.path = $$PREFIX/bin
 INSTALLS += target
 
 symbian {
+    isEmpty(RESOLUTION) {
+        RESOLUTION = "640x360"
+    }
     LIBS += -lconnmon -lcone -lavkon
 }
 
@@ -38,7 +41,7 @@ SOURCES += main.cpp \
            clockwidget.cpp
 
 isEmpty(RESOLUTION) {
-    RESOLUTION = "640x360"
+    RESOLUTION = "800x480"
 }
 
 RESOURCES = resource/$$RESOLUTION/hyperui.qrc
diff --git a/hyperui/resource/864x480/hyperui.ini b/hyperui/resource/800x480/hyperui.ini
index afd5213..4865368 100644
--- a/hyperui/resource/864x480/hyperui.ini
+++ b/hyperui/resource/800x480/hyperui.ini
@@ -7,7 +7,7 @@ font-size=40
 
 [window]
 width=480
-height=864
+height=800
 
 [topbar]
 font-size=16
@@ -21,14 +21,14 @@ font-size=26
 label-rect=@Rect(10 10 267 35)
 
 [page-view]
-margin-top=120
+margin-top=110
 
 [menu-view]
-margin-top=18
-margin-left=18
-spacing-vertical=98
-spacing-horizontal=98
-main-icon-pos=@Point(-68 569)
+margin-top=5
+margin-left=20
+spacing-vertical=95
+spacing-horizontal=95
+main-icon-pos=@Point(-66 537)
 
 [clock-widget]
 update-timeout=5000
@@ -45,8 +45,8 @@ events-pixmap-rect=@Rect(48 74 387 387)
 
 [draggable-preview]
 border=2
-margin-top=7
-margin-left=77
+margin-top=0
+margin-left=62
 restore-time=300
 maximize-time=300
 first-zoom-time=200
@@ -56,17 +56,17 @@ minimum-offset=200
 maximize-range=160
 
 [dialer-widget]
-margin=5
-spacing=8
+margin=7
+spacing=6
 
 [phone-view]
-display-pos=@Point(10 10)
+display-pos=@Point(10 0)
 call-timeout=2000
 display-font-size=50
 display-cancel-pos=@Point(375 30)
-dialer-back-pos=@Point(10 120)
-call-button-pos=@Point(170 635)
-contacts-button-pos=@Point(10 635)
+dialer-back-pos=@Point(10 96)
+call-button-pos=@Point(170 585)
+contacts-button-pos=@Point(10 585)
 label-geometry=@Rect(20 10 350 80)
 contact-dummy-name=Priscila Sobral
 
@@ -76,9 +76,9 @@ font-size=42
 small-font-size=30
 phone-font-color=#6A6F81
 dial-icon-pos=@Point(17 410)
-dial-button-pos=@Point(0 65)
-mute-button-pos=@Point(144 65)
-speaker-button-pos=@Point(288 65)
+dial-button-pos=@Point(0 57)
+mute-button-pos=@Point(144 57)
+speaker-button-pos=@Point(288 57)
 sub-panel-rect=@Rect(15 400 400 200)
 call-label-rect=@Rect(50 10 374 50)
 name-label-rect=@Rect(50 55 374 50)
diff --git a/hyperui/resource/864x480/hyperui.qrc b/hyperui/resource/800x480/hyperui.qrc
index e099776..e099776 100644
--- a/hyperui/resource/864x480/hyperui.qrc
+++ b/hyperui/resource/800x480/hyperui.qrc
diff --git a/hyperui/resource/800x480/images/background.png b/hyperui/resource/800x480/images/background.png
new file mode 100644
index 0000000..9162ff1
--- /dev/null
+++ b/hyperui/resource/800x480/images/background.png
diff --git a/hyperui/resource/864x480/images/dialer/background.png b/hyperui/resource/800x480/images/dialer/background.png
index 20c2a08..20c2a08 100644
--- a/hyperui/resource/864x480/images/dialer/background.png
+++ b/hyperui/resource/800x480/images/dialer/background.png
diff --git a/hyperui/resource/864x480/images/dialer/bottom_left_key.png b/hyperui/resource/800x480/images/dialer/bottom_left_key.png
index 71963ec..71963ec 100644
--- a/hyperui/resource/864x480/images/dialer/bottom_left_key.png
+++ b/hyperui/resource/800x480/images/dialer/bottom_left_key.png
diff --git a/hyperui/resource/864x480/images/dialer/bottom_left_key_pressed.png b/hyperui/resource/800x480/images/dialer/bottom_left_key_pressed.png
index e012ca9..e012ca9 100644
--- a/hyperui/resource/864x480/images/dialer/bottom_left_key_pressed.png
+++ b/hyperui/resource/800x480/images/dialer/bottom_left_key_pressed.png
diff --git a/hyperui/resource/864x480/images/dialer/bottom_right_key.png b/hyperui/resource/800x480/images/dialer/bottom_right_key.png
index 4236c0d..4236c0d 100644
--- a/hyperui/resource/864x480/images/dialer/bottom_right_key.png
+++ b/hyperui/resource/800x480/images/dialer/bottom_right_key.png
diff --git a/hyperui/resource/864x480/images/dialer/bottom_right_key_pressed.png b/hyperui/resource/800x480/images/dialer/bottom_right_key_pressed.png
index c07e151..c07e151 100644
--- a/hyperui/resource/864x480/images/dialer/bottom_right_key_pressed.png
+++ b/hyperui/resource/800x480/images/dialer/bottom_right_key_pressed.png
diff --git a/hyperui/resource/864x480/images/dialer/middle_key.png b/hyperui/resource/800x480/images/dialer/middle_key.png
index f27ed17..f27ed17 100644
--- a/hyperui/resource/864x480/images/dialer/middle_key.png
+++ b/hyperui/resource/800x480/images/dialer/middle_key.png
diff --git a/hyperui/resource/864x480/images/dialer/middle_key_pressed.png b/hyperui/resource/800x480/images/dialer/middle_key_pressed.png
index 5a33774..5a33774 100644
--- a/hyperui/resource/864x480/images/dialer/middle_key_pressed.png
+++ b/hyperui/resource/800x480/images/dialer/middle_key_pressed.png
diff --git a/hyperui/resource/864x480/images/dialer/top_left_key.png b/hyperui/resource/800x480/images/dialer/top_left_key.png
index 4949a9e..4949a9e 100644
--- a/hyperui/resource/864x480/images/dialer/top_left_key.png
+++ b/hyperui/resource/800x480/images/dialer/top_left_key.png
diff --git a/hyperui/resource/864x480/images/dialer/top_left_key_pressed.png b/hyperui/resource/800x480/images/dialer/top_left_key_pressed.png
index 79b9ed7..79b9ed7 100644
--- a/hyperui/resource/864x480/images/dialer/top_left_key_pressed.png
+++ b/hyperui/resource/800x480/images/dialer/top_left_key_pressed.png
diff --git a/hyperui/resource/864x480/images/dialer/top_right_key.png b/hyperui/resource/800x480/images/dialer/top_right_key.png
index 4f4dd42..4f4dd42 100644
--- a/hyperui/resource/864x480/images/dialer/top_right_key.png
+++ b/hyperui/resource/800x480/images/dialer/top_right_key.png
diff --git a/hyperui/resource/864x480/images/dialer/top_right_key_pressed.png b/hyperui/resource/800x480/images/dialer/top_right_key_pressed.png
index 9a1b5dc..9a1b5dc 100644
--- a/hyperui/resource/864x480/images/dialer/top_right_key_pressed.png
+++ b/hyperui/resource/800x480/images/dialer/top_right_key_pressed.png
diff --git a/hyperui/resource/864x480/images/dialer_bk_bottom.png b/hyperui/resource/800x480/images/dialer_bk_bottom.png
index 5bfae0a..5bfae0a 100644
--- a/hyperui/resource/864x480/images/dialer_bk_bottom.png
+++ b/hyperui/resource/800x480/images/dialer_bk_bottom.png
diff --git a/hyperui/resource/864x480/images/dialer_bk_lineexpand.png b/hyperui/resource/800x480/images/dialer_bk_lineexpand.png
index 3617647..3617647 100644
--- a/hyperui/resource/864x480/images/dialer_bk_lineexpand.png
+++ b/hyperui/resource/800x480/images/dialer_bk_lineexpand.png
diff --git a/hyperui/resource/864x480/images/dialer_bk_top.png b/hyperui/resource/800x480/images/dialer_bk_top.png
index 0e2e8e0..0e2e8e0 100644
--- a/hyperui/resource/864x480/images/dialer_bk_top.png
+++ b/hyperui/resource/800x480/images/dialer_bk_top.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_call.png b/hyperui/resource/800x480/images/dialer_bt_call.png
index 0dbdee3..0dbdee3 100644
--- a/hyperui/resource/864x480/images/dialer_bt_call.png
+++ b/hyperui/resource/800x480/images/dialer_bt_call.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_call_over.png b/hyperui/resource/800x480/images/dialer_bt_call_over.png
index 0c1b4a2..0c1b4a2 100644
--- a/hyperui/resource/864x480/images/dialer_bt_call_over.png
+++ b/hyperui/resource/800x480/images/dialer_bt_call_over.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_contacts.png b/hyperui/resource/800x480/images/dialer_bt_contacts.png
index 9e97bfc..9e97bfc 100644
--- a/hyperui/resource/864x480/images/dialer_bt_contacts.png
+++ b/hyperui/resource/800x480/images/dialer_bt_contacts.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_dialer.png b/hyperui/resource/800x480/images/dialer_bt_dialer.png
index 59af1da..59af1da 100644
--- a/hyperui/resource/864x480/images/dialer_bt_dialer.png
+++ b/hyperui/resource/800x480/images/dialer_bt_dialer.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_endcall.png b/hyperui/resource/800x480/images/dialer_bt_endcall.png
index db59642..db59642 100644
--- a/hyperui/resource/864x480/images/dialer_bt_endcall.png
+++ b/hyperui/resource/800x480/images/dialer_bt_endcall.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_endcall_over.png b/hyperui/resource/800x480/images/dialer_bt_endcall_over.png
index d56cfe5..d56cfe5 100644
--- a/hyperui/resource/864x480/images/dialer_bt_endcall_over.png
+++ b/hyperui/resource/800x480/images/dialer_bt_endcall_over.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_mute.png b/hyperui/resource/800x480/images/dialer_bt_mute.png
index d39c999..d39c999 100644
--- a/hyperui/resource/864x480/images/dialer_bt_mute.png
+++ b/hyperui/resource/800x480/images/dialer_bt_mute.png
diff --git a/hyperui/resource/864x480/images/dialer_bt_speaker.png b/hyperui/resource/800x480/images/dialer_bt_speaker.png
index 71edc62..71edc62 100644
--- a/hyperui/resource/864x480/images/dialer_bt_speaker.png
+++ b/hyperui/resource/800x480/images/dialer_bt_speaker.png
diff --git a/hyperui/resource/864x480/images/dialer_bullet_phone.png b/hyperui/resource/800x480/images/dialer_bullet_phone.png
index 3fbcaf3..3fbcaf3 100644
--- a/hyperui/resource/864x480/images/dialer_bullet_phone.png
+++ b/hyperui/resource/800x480/images/dialer_bullet_phone.png
diff --git a/hyperui/resource/864x480/images/dialer_display_background.png b/hyperui/resource/800x480/images/dialer_display_background.png
index 7b9ca17..7b9ca17 100644
--- a/hyperui/resource/864x480/images/dialer_display_background.png
+++ b/hyperui/resource/800x480/images/dialer_display_background.png
diff --git a/hyperui/resource/864x480/images/dialer_display_bt_cancel.png b/hyperui/resource/800x480/images/dialer_display_bt_cancel.png
index 0005319..0005319 100644
--- a/hyperui/resource/864x480/images/dialer_display_bt_cancel.png
+++ b/hyperui/resource/800x480/images/dialer_display_bt_cancel.png
diff --git a/hyperui/resource/864x480/images/dialer_photo.png b/hyperui/resource/800x480/images/dialer_photo.png
index 45595ae..45595ae 100644
--- a/hyperui/resource/864x480/images/dialer_photo.png
+++ b/hyperui/resource/800x480/images/dialer_photo.png
diff --git a/hyperui/resource/864x480/images/idle_clock_pointer_hour.png b/hyperui/resource/800x480/images/idle_clock_pointer_hour.png
index e7cce97..e7cce97 100644
--- a/hyperui/resource/864x480/images/idle_clock_pointer_hour.png
+++ b/hyperui/resource/800x480/images/idle_clock_pointer_hour.png
diff --git a/hyperui/resource/864x480/images/idle_clock_pointer_minutes.png b/hyperui/resource/800x480/images/idle_clock_pointer_minutes.png
index ea9d08e..ea9d08e 100644
--- a/hyperui/resource/864x480/images/idle_clock_pointer_minutes.png
+++ b/hyperui/resource/800x480/images/idle_clock_pointer_minutes.png
diff --git a/hyperui/resource/864x480/images/idle_clock_pointers_middle.png b/hyperui/resource/800x480/images/idle_clock_pointers_middle.png
index f1ef538..f1ef538 100644
--- a/hyperui/resource/864x480/images/idle_clock_pointers_middle.png
+++ b/hyperui/resource/800x480/images/idle_clock_pointers_middle.png
diff --git a/hyperui/resource/864x480/images/idle_clock_structure.png b/hyperui/resource/800x480/images/idle_clock_structure.png
index 5b7509f..5b7509f 100644
--- a/hyperui/resource/864x480/images/idle_clock_structure.png
+++ b/hyperui/resource/800x480/images/idle_clock_structure.png
diff --git a/hyperui/resource/864x480/images/menu_bt_calendar.png b/hyperui/resource/800x480/images/menu_bt_calendar.png
index cdc4f18..cdc4f18 100644
--- a/hyperui/resource/864x480/images/menu_bt_calendar.png
+++ b/hyperui/resource/800x480/images/menu_bt_calendar.png
diff --git a/hyperui/resource/864x480/images/menu_bt_camera.png b/hyperui/resource/800x480/images/menu_bt_camera.png
index 0bb2b73..0bb2b73 100644
--- a/hyperui/resource/864x480/images/menu_bt_camera.png
+++ b/hyperui/resource/800x480/images/menu_bt_camera.png
diff --git a/hyperui/resource/864x480/images/menu_bt_chat.png b/hyperui/resource/800x480/images/menu_bt_chat.png
index b5912f5..b5912f5 100644
--- a/hyperui/resource/864x480/images/menu_bt_chat.png
+++ b/hyperui/resource/800x480/images/menu_bt_chat.png
diff --git a/hyperui/resource/864x480/images/menu_bt_email.png b/hyperui/resource/800x480/images/menu_bt_email.png
index 9168c48..9168c48 100644
--- a/hyperui/resource/864x480/images/menu_bt_email.png
+++ b/hyperui/resource/800x480/images/menu_bt_email.png
diff --git a/hyperui/resource/864x480/images/menu_bt_folder.png b/hyperui/resource/800x480/images/menu_bt_folder.png
index 80acd14..80acd14 100644
--- a/hyperui/resource/864x480/images/menu_bt_folder.png
+++ b/hyperui/resource/800x480/images/menu_bt_folder.png
diff --git a/hyperui/resource/864x480/images/menu_bt_games.png b/hyperui/resource/800x480/images/menu_bt_games.png
index 64facc0..64facc0 100644
--- a/hyperui/resource/864x480/images/menu_bt_games.png
+++ b/hyperui/resource/800x480/images/menu_bt_games.png
diff --git a/hyperui/resource/864x480/images/menu_bt_music.png b/hyperui/resource/800x480/images/menu_bt_music.png
index 4d14fdf..4d14fdf 100644
--- a/hyperui/resource/864x480/images/menu_bt_music.png
+++ b/hyperui/resource/800x480/images/menu_bt_music.png
diff --git a/hyperui/resource/864x480/images/menu_bt_navigation.png b/hyperui/resource/800x480/images/menu_bt_navigation.png
index 90835be..90835be 100644
--- a/hyperui/resource/864x480/images/menu_bt_navigation.png
+++ b/hyperui/resource/800x480/images/menu_bt_navigation.png
diff --git a/hyperui/resource/864x480/images/menu_bt_phone.png b/hyperui/resource/800x480/images/menu_bt_phone.png
index f6978f5..f6978f5 100644
--- a/hyperui/resource/864x480/images/menu_bt_phone.png
+++ b/hyperui/resource/800x480/images/menu_bt_phone.png
diff --git a/hyperui/resource/864x480/images/menu_bt_settings.png b/hyperui/resource/800x480/images/menu_bt_settings.png
index 87bba74..87bba74 100644
--- a/hyperui/resource/864x480/images/menu_bt_settings.png
+++ b/hyperui/resource/800x480/images/menu_bt_settings.png
diff --git a/hyperui/resource/864x480/images/menu_bt_twitter.png b/hyperui/resource/800x480/images/menu_bt_twitter.png
index 7904c00..7904c00 100644
--- a/hyperui/resource/864x480/images/menu_bt_twitter.png
+++ b/hyperui/resource/800x480/images/menu_bt_twitter.png
diff --git a/hyperui/resource/864x480/images/menu_bt_web.png b/hyperui/resource/800x480/images/menu_bt_web.png
index 4e11f6a..4e11f6a 100644
--- a/hyperui/resource/864x480/images/menu_bt_web.png
+++ b/hyperui/resource/800x480/images/menu_bt_web.png
diff --git a/hyperui/resource/800x480/images/screen_unlock.png b/hyperui/resource/800x480/images/screen_unlock.png
new file mode 100755
index 0000000..46d01b8
--- /dev/null
+++ b/hyperui/resource/800x480/images/screen_unlock.png
diff --git a/hyperui/resource/864x480/images/top_bar_active.png b/hyperui/resource/800x480/images/top_bar_active.png
index 561973d..561973d 100644
--- a/hyperui/resource/864x480/images/top_bar_active.png
+++ b/hyperui/resource/800x480/images/top_bar_active.png
diff --git a/hyperui/resource/864x480/images/top_bt_back.png b/hyperui/resource/800x480/images/top_bt_back.png
index 0b423b2..0b423b2 100644
--- a/hyperui/resource/864x480/images/top_bt_back.png
+++ b/hyperui/resource/800x480/images/top_bt_back.png
diff --git a/hyperui/resource/864x480/images/top_bt_back_disabled.png b/hyperui/resource/800x480/images/top_bt_back_disabled.png
index 11fa15e..11fa15e 100644
--- a/hyperui/resource/864x480/images/top_bt_back_disabled.png
+++ b/hyperui/resource/800x480/images/top_bt_back_disabled.png
diff --git a/hyperui/resource/864x480/images/top_bt_options.png b/hyperui/resource/800x480/images/top_bt_options.png
index 0ffdf4e..0ffdf4e 100644
--- a/hyperui/resource/864x480/images/top_bt_options.png
+++ b/hyperui/resource/800x480/images/top_bt_options.png
diff --git a/hyperui/resource/864x480/images/top_bt_options_disabled.png b/hyperui/resource/800x480/images/top_bt_options_disabled.png
index f44045e..f44045e 100644
--- a/hyperui/resource/864x480/images/top_bt_options_disabled.png
+++ b/hyperui/resource/800x480/images/top_bt_options_disabled.png
diff --git a/hyperui/resource/864x480/images/topbar_3g.png b/hyperui/resource/800x480/images/topbar_3g.png
index 96e455c..96e455c 100644
--- a/hyperui/resource/864x480/images/topbar_3g.png
+++ b/hyperui/resource/800x480/images/topbar_3g.png
diff --git a/hyperui/resource/864x480/images/topbar_battery.png b/hyperui/resource/800x480/images/topbar_battery.png
index 2d4c69d..2d4c69d 100644
--- a/hyperui/resource/864x480/images/topbar_battery.png
+++ b/hyperui/resource/800x480/images/topbar_battery.png
diff --git a/hyperui/resource/864x480/images/topbar_network.png b/hyperui/resource/800x480/images/topbar_network.png
index 8432486..8432486 100644
--- a/hyperui/resource/864x480/images/topbar_network.png
+++ b/hyperui/resource/800x480/images/topbar_network.png
diff --git a/hyperui/resource/864x480/images/background.png b/hyperui/resource/864x480/images/background.png
deleted file mode 100644
index 78d3209..0000000
--- a/hyperui/resource/864x480/images/background.png
+++ /dev/null
diff --git a/hyperui/resource/864x480/images/screen_unlock.png b/hyperui/resource/864x480/images/screen_unlock.png
deleted file mode 100755
index 7fcc856..0000000
--- a/hyperui/resource/864x480/images/screen_unlock.png
+++ /dev/null