Added label and icons in the top bar

11 files changed, 45 insertions, 0 deletions

diff --git a/hyperui/mainwindow.cpp b/hyperui/mainwindow.cpp
index 4f48fe3..95decf6 100644
--- a/hyperui/mainwindow.cpp
+++ b/hyperui/mainwindow.cpp
@@ -64,6 +64,29 @@ MainWindow::MainWindow(QGraphicsItem *parent)
     m_preview = new DraggablePreview(m_mainView, QSize(width, height), this);
     connect(m_preview, SIGNAL(maximizeFinished()), SLOT(onMaximizeFinished()));
 
+    QGraphicsSimpleTextItem *phoneLabel =
+        new QGraphicsSimpleTextItem(tr("T-Mobile"), this);
+
+    QFont labelFont(Resource::stringValue("default/font-family"));
+    labelFont.setBold(true);
+    labelFont.setPixelSize(Resource::intValue("topbar/font-size"));
+    phoneLabel->setFont(labelFont);
+    phoneLabel->setBrush(QColor(Resource::stringValue("default/font-color")));
+
+    QGraphicsPixmapItem *iconBattery =
+        new QGraphicsPixmapItem(Resource::pixmap("topbar_battery.png"), this);
+
+    QGraphicsPixmapItem *icon3G =
+        new QGraphicsPixmapItem(Resource::pixmap("topbar_3g.png"), this);
+
+    QGraphicsPixmapItem *iconNetwork =
+        new QGraphicsPixmapItem(Resource::pixmap("topbar_network.png"), this);
+
+    phoneLabel->setPos(Resource::value("topbar/label-pos").toPoint());
+    iconNetwork->setPos(Resource::value("topbar/icon-network-pos").toPoint());
+    icon3G->setPos(Resource::value("topbar/icon-3g-pos").toPoint());
+    iconBattery->setPos(Resource::value("topbar/icon-battery-pos").toPoint());
+
     createDummyDailyEvents();
 
 #ifdef Q_OS_SYMBIAN
diff --git a/hyperui/resource/640x360/hyperui.ini b/hyperui/resource/640x360/hyperui.ini
index 0a864da..5434efe 100644
--- a/hyperui/resource/640x360/hyperui.ini
+++ b/hyperui/resource/640x360/hyperui.ini
@@ -9,6 +9,13 @@ font-size=30
 width=360
 height=640
 
+[topbar]
+font-size=14
+label-pos=@Point(230 5)
+icon-network-pos=@Point(290 5)
+icon-3g-pos=@Point(310 5)
+icon-battery-pos=@Point(330 5)
+
 [page-menu]
 font-size=26
 label-rect=@Rect(10 10 195 20)
diff --git a/hyperui/resource/640x360/hyperui.qrc b/hyperui/resource/640x360/hyperui.qrc
index 21a16d2..e099776 100644
--- a/hyperui/resource/640x360/hyperui.qrc
+++ b/hyperui/resource/640x360/hyperui.qrc
@@ -58,6 +58,10 @@
 
     <file>images/dialer_bullet_phone.png</file>
 
+    <file>images/topbar_3g.png</file>
+    <file>images/topbar_network.png</file>
+    <file>images/topbar_battery.png</file>   
+
     <file>images/dialer_bt_dialer.png</file>
     <file>images/dialer_bt_mute.png</file>
     <file>images/dialer_bt_speaker.png</file>
diff --git a/hyperui/resource/640x360/images/topbar_3g.png b/hyperui/resource/640x360/images/topbar_3g.png
new file mode 100644
index 0000000..6cf2af0
--- /dev/null
+++ b/hyperui/resource/640x360/images/topbar_3g.png
diff --git a/hyperui/resource/640x360/images/topbar_battery.png b/hyperui/resource/640x360/images/topbar_battery.png
new file mode 100644
index 0000000..cc461dd
--- /dev/null
+++ b/hyperui/resource/640x360/images/topbar_battery.png
diff --git a/hyperui/resource/640x360/images/topbar_network.png b/hyperui/resource/640x360/images/topbar_network.png
new file mode 100644
index 0000000..4716773
--- /dev/null
+++ b/hyperui/resource/640x360/images/topbar_network.png
diff --git a/hyperui/resource/864x480/hyperui.ini b/hyperui/resource/864x480/hyperui.ini
index 51b09e7..afd5213 100644
--- a/hyperui/resource/864x480/hyperui.ini
+++ b/hyperui/resource/864x480/hyperui.ini
@@ -9,6 +9,13 @@ font-size=40
 width=480
 height=864
 
+[topbar]
+font-size=16
+label-pos=@Point(340 6)
+icon-network-pos=@Point(406 6)
+icon-3g-pos=@Point(428 6)
+icon-battery-pos=@Point(450 6)
+
 [page-menu]
 font-size=26
 label-rect=@Rect(10 10 267 35)
diff --git a/hyperui/resource/864x480/hyperui.qrc b/hyperui/resource/864x480/hyperui.qrc
index 21a16d2..e099776 100644
--- a/hyperui/resource/864x480/hyperui.qrc
+++ b/hyperui/resource/864x480/hyperui.qrc
@@ -58,6 +58,10 @@
 
     <file>images/dialer_bullet_phone.png</file>
 
+    <file>images/topbar_3g.png</file>
+    <file>images/topbar_network.png</file>
+    <file>images/topbar_battery.png</file>   
+
     <file>images/dialer_bt_dialer.png</file>
     <file>images/dialer_bt_mute.png</file>
     <file>images/dialer_bt_speaker.png</file>
diff --git a/hyperui/resource/864x480/images/topbar_3g.png b/hyperui/resource/864x480/images/topbar_3g.png
new file mode 100644
index 0000000..96e455c
--- /dev/null
+++ b/hyperui/resource/864x480/images/topbar_3g.png
diff --git a/hyperui/resource/864x480/images/topbar_battery.png b/hyperui/resource/864x480/images/topbar_battery.png
new file mode 100644
index 0000000..2d4c69d
--- /dev/null
+++ b/hyperui/resource/864x480/images/topbar_battery.png
diff --git a/hyperui/resource/864x480/images/topbar_network.png b/hyperui/resource/864x480/images/topbar_network.png
new file mode 100644
index 0000000..8432486
--- /dev/null
+++ b/hyperui/resource/864x480/images/topbar_network.png