Show icons in menu pane

Reviewed-by: ckamm

43 files changed, 98 insertions, 1 deletions

diff --git a/src/ui/applicationui.cpp b/src/ui/applicationui.cpp
index 316b323..e583a36 100644
--- a/src/ui/applicationui.cpp
+++ b/src/ui/applicationui.cpp
@@ -97,3 +97,7 @@ void ApplicationUi::updateMenuBarWidget(Widget *menuBarWidget)
     mMenuBar->show();
 }
 
+QIcon ApplicationUi::icon() const
+{
+    return QIcon(":/ui/icons/application.png");
+}
diff --git a/src/ui/applicationui.h b/src/ui/applicationui.h
index 1785f2f..2f2fcdc 100644
--- a/src/ui/applicationui.h
+++ b/src/ui/applicationui.h
@@ -47,6 +47,7 @@ class ApplicationUi : public ToolBoxPage
     Q_OBJECT
 public:
     explicit ApplicationUi(QWidget *parent = 0);
+    QIcon icon() const;
 
 public slots:
     void updateMenuBarWidget(Widget *menuBarWidget);
diff --git a/src/ui/cameraui.cpp b/src/ui/cameraui.cpp
index 5c7902e..4c717ad 100644
--- a/src/ui/cameraui.cpp
+++ b/src/ui/cameraui.cpp
@@ -235,6 +235,11 @@ void CameraUi::enableCameraControls(bool enabled)
     mImageBrowseButton->setEnabled(enabled);
 }
 
+QIcon CameraUi::icon() const
+{
+    return QIcon(":/ui/icons/camera.png");
+}
+
 /*!
     \class CameraScriptInterface
     \brief Exposed as camera.
diff --git a/src/ui/cameraui.h b/src/ui/cameraui.h
index 38cf177..59abb7e 100644
--- a/src/ui/cameraui.h
+++ b/src/ui/cameraui.h
@@ -87,6 +87,7 @@ public:
     virtual ~CameraUi();
 
     CameraScriptInterface *scriptInterface() const;
+    QIcon icon() const;
 
     CameraUi::CameraData cameraData() const;
 
diff --git a/src/ui/contactsui.cpp b/src/ui/contactsui.cpp
index 7139753..b96863d 100644
--- a/src/ui/contactsui.cpp
+++ b/src/ui/contactsui.cpp
@@ -124,3 +124,8 @@ void ContactsUi::updateContactList() {
     }
 }
 
+QIcon ContactsUi::icon() const
+{
+    return QIcon(":/ui/icons/contacts.png");
+}
+
diff --git a/src/ui/contactsui.h b/src/ui/contactsui.h
index 3844a34..dd00f54 100644
--- a/src/ui/contactsui.h
+++ b/src/ui/contactsui.h
@@ -46,6 +46,7 @@ class ContactsUi : public ToolBoxPage
     Q_OBJECT
 public:
     explicit ContactsUi(Contacts *contacts, QWidget *parent = 0);
+    QIcon icon() const;
 
 private slots:
     void importContacts();
diff --git a/src/ui/docgalleryui.cpp b/src/ui/docgalleryui.cpp
index 3a67243..8526f27 100644
--- a/src/ui/docgalleryui.cpp
+++ b/src/ui/docgalleryui.cpp
@@ -133,4 +133,9 @@ void DocGalleryUi::finishReadingImages()
     emit docGalleryDataChanged(mData);
 }
 
+QIcon DocGalleryUi::icon() const
+{
+    return QIcon(":/ui/icons/docgallery.png");
+}
+
 #include "moc_docgalleryui.cpp"
diff --git a/src/ui/docgalleryui.h b/src/ui/docgalleryui.h
index 54d1f45..20b8f19 100644
--- a/src/ui/docgalleryui.h
+++ b/src/ui/docgalleryui.h
@@ -46,6 +46,7 @@ class DocGalleryUi : public ToolBoxPage
 public:
     explicit DocGalleryUi(QWidget *parent = 0);
     QtMobility::DocGallerySimulatorData data() const;
+    QIcon icon() const;
 
 signals:
     void docGalleryDataChanged(const QtMobility::DocGallerySimulatorData &mData);
diff --git a/src/ui/feedbackui.cpp b/src/ui/feedbackui.cpp
index 05036d3..b83c1f5 100644
--- a/src/ui/feedbackui.cpp
+++ b/src/ui/feedbackui.cpp
@@ -243,3 +243,8 @@ void FeedbackUi::setEnabled(bool enabled)
     mActuatorState->setEnabled(enabled);
     mEffectState->setEnabled(enabled);
 }
+
+QIcon FeedbackUi::icon() const
+{
+    return QIcon(":/ui/icons/feedback.png");
+}
diff --git a/src/ui/feedbackui.h b/src/ui/feedbackui.h
index c923156..5931428 100644
--- a/src/ui/feedbackui.h
+++ b/src/ui/feedbackui.h
@@ -48,6 +48,7 @@ class FeedbackUi : public ToolBoxPage
     Q_OBJECT
 public:
     explicit FeedbackUi(Feedback *feedback, QWidget *parent = 0);
+    QIcon icon() const;
 
 signals:
 
diff --git a/src/ui/icons/application.png b/src/ui/icons/application.png
new file mode 100644
index 0000000..c9b36ab
--- /dev/null
+++ b/src/ui/icons/application.png
diff --git a/src/ui/icons/camera.png b/src/ui/icons/camera.png
new file mode 100644
index 0000000..abc88d2
--- /dev/null
+++ b/src/ui/icons/camera.png
diff --git a/src/ui/icons/contacts.png b/src/ui/icons/contacts.png
new file mode 100644
index 0000000..0b755e1
--- /dev/null
+++ b/src/ui/icons/contacts.png
diff --git a/src/ui/icons/docgallery.png b/src/ui/icons/docgallery.png
new file mode 100644
index 0000000..7e2b72e
--- /dev/null
+++ b/src/ui/icons/docgallery.png
diff --git a/src/ui/icons/feedback.png b/src/ui/icons/feedback.png
new file mode 100644
index 0000000..6cd5eb3
--- /dev/null
+++ b/src/ui/icons/feedback.png
diff --git a/src/ui/icons/messaging.png b/src/ui/icons/messaging.png
new file mode 100644
index 0000000..857feff
--- /dev/null
+++ b/src/ui/icons/messaging.png
diff --git a/src/ui/icons/multipointtouch.png b/src/ui/icons/multipointtouch.png
new file mode 100644
index 0000000..2ec9e70
--- /dev/null
+++ b/src/ui/icons/multipointtouch.png
diff --git a/src/ui/icons/network.png b/src/ui/icons/network.png
new file mode 100644
index 0000000..941be09
--- /dev/null
+++ b/src/ui/icons/network.png
diff --git a/src/ui/icons/nfc.png b/src/ui/icons/nfc.png
new file mode 100644
index 0000000..e67da7a
--- /dev/null
+++ b/src/ui/icons/nfc.png
diff --git a/src/ui/icons/organizer.png b/src/ui/icons/organizer.png
new file mode 100644
index 0000000..d7b7b15
--- /dev/null
+++ b/src/ui/icons/organizer.png
diff --git a/src/ui/icons/sensors.png b/src/ui/icons/sensors.png
new file mode 100644
index 0000000..9bd17ad
--- /dev/null
+++ b/src/ui/icons/sensors.png
diff --git a/src/ui/icons/storage.png b/src/ui/icons/storage.png
new file mode 100644
index 0000000..d2e58f4
--- /dev/null
+++ b/src/ui/icons/storage.png
diff --git a/src/ui/icons/systeminfo.png b/src/ui/icons/systeminfo.png
new file mode 100644
index 0000000..759ec7e
--- /dev/null
+++ b/src/ui/icons/systeminfo.png
diff --git a/src/ui/icons/view.png b/src/ui/icons/view.png
new file mode 100644
index 0000000..11186e1
--- /dev/null
+++ b/src/ui/icons/view.png
diff --git a/src/ui/messagingui.cpp b/src/ui/messagingui.cpp
index c5c993d..f479495 100644
--- a/src/ui/messagingui.cpp
+++ b/src/ui/messagingui.cpp
@@ -78,3 +78,8 @@ void MessagingUi::importMaildir()
 
     mMobilityData->mMessaging->importMaildir(dir);
 }
+
+QIcon MessagingUi::icon() const
+{
+    return QIcon(":/ui/icons/messaging.png");
+}
diff --git a/src/ui/messagingui.h b/src/ui/messagingui.h
index 09ff27b..69d0175 100644
--- a/src/ui/messagingui.h
+++ b/src/ui/messagingui.h
@@ -45,6 +45,7 @@ class MessagingUi : public ToolBoxPage
     Q_OBJECT
 public:
     explicit MessagingUi(MobilityData *mobilityData, QWidget *parent = 0);
+    QIcon icon() const;
 
 private slots:
     void importMaildir();
diff --git a/src/ui/multipointtouchui.cpp b/src/ui/multipointtouchui.cpp
index cba3264..494183b 100644
--- a/src/ui/multipointtouchui.cpp
+++ b/src/ui/multipointtouchui.cpp
@@ -157,3 +157,8 @@ void MultiPointTouchUi::readSettings(QSettings &settings)
     }
     settings.endGroup();
 }
+
+QIcon MultiPointTouchUi::icon() const
+{
+    return QIcon(":/ui/icons/multipointtouch.png");
+}
diff --git a/src/ui/multipointtouchui.h b/src/ui/multipointtouchui.h
index a427366..8d9a04b 100644
--- a/src/ui/multipointtouchui.h
+++ b/src/ui/multipointtouchui.h
@@ -60,6 +60,7 @@ public:
     void setGestureScriptPath(const QString &path);
     void writeSettings(QSettings &settings) const;
     void readSettings(QSettings &settings);
+    QIcon icon() const;
 
 signals:
     void inputModeChanged(MultiPointTouchUi::InputMode newMode);
diff --git a/src/ui/nfcui.cpp b/src/ui/nfcui.cpp
index d4f09a2..063b260 100644
--- a/src/ui/nfcui.cpp
+++ b/src/ui/nfcui.cpp
@@ -214,3 +214,8 @@ void NfcUi::startEditor()
     dialog.exec();
     loadTagList();
 }
+
+QIcon NfcUi::icon() const
+{
+    return QIcon(":/ui/icons/nfc.png");
+}
diff --git a/src/ui/nfcui.h b/src/ui/nfcui.h
index f1e27ac..7256864 100644
--- a/src/ui/nfcui.h
+++ b/src/ui/nfcui.h
@@ -49,6 +49,7 @@ public:
     virtual ~NfcUi();
 
     QByteArray processCommand(const QByteArray &command);
+    QIcon icon() const;
 
 signals:
     void targetEnteringProximity(const QByteArray &uid);
diff --git a/src/ui/organizerui.cpp b/src/ui/organizerui.cpp
index 02dd3ef..5c81c39 100644
--- a/src/ui/organizerui.cpp
+++ b/src/ui/organizerui.cpp
@@ -97,3 +97,8 @@ void OrganizerUi::exportOrganizer()
                 tr("Cannot export data to \"%1\".").arg(exportFile));
     }
 }
+
+QIcon OrganizerUi::icon() const
+{
+    return QIcon(":/ui/icons/organizer.png");
+}
diff --git a/src/ui/organizerui.h b/src/ui/organizerui.h
index c3e3456..552bd59 100644
--- a/src/ui/organizerui.h
+++ b/src/ui/organizerui.h
@@ -45,6 +45,7 @@ class OrganizerUi : public ToolBoxPage
     Q_OBJECT
 public:
     explicit OrganizerUi(Organizer *organizer, QWidget *parent = 0);
+    QIcon icon() const;
 
 private slots:
     void importOrganizer();
diff --git a/src/ui/sensorsui.cpp b/src/ui/sensorsui.cpp
index 8872857..8fac32c 100644
--- a/src/ui/sensorsui.cpp
+++ b/src/ui/sensorsui.cpp
@@ -750,3 +750,8 @@ void SensorsUi::lightChanged()
     emitSensorsDataChange();
 }
 
+QIcon SensorsUi::icon() const
+{
+    return QIcon(":/ui/icons/sensors.png");
+}
+
diff --git a/src/ui/sensorsui.h b/src/ui/sensorsui.h
index f5b6547..ad7fe77 100644
--- a/src/ui/sensorsui.h
+++ b/src/ui/sensorsui.h
@@ -57,8 +57,10 @@ public:
     SensorDoubleEdit(QWidget *parent = 0);
 
     double value() const;
+
 public slots:
     void setValue(double newValue, bool skipSignal = false);
+
 public:
 
     void setRange(double min, double max);
@@ -197,6 +199,7 @@ public:
     SensorsScriptInterface *scriptInterface() const;
 
     SensorsUi::SensorsData sensorsData() const;
+    QIcon icon() const;
 
 public slots:
     void setSensorsData(const SensorsUi::SensorsData &data);
diff --git a/src/ui/systeminfogenericui.cpp b/src/ui/systeminfogenericui.cpp
index ca4fdda..c5bc5e1 100644
--- a/src/ui/systeminfogenericui.cpp
+++ b/src/ui/systeminfogenericui.cpp
@@ -434,6 +434,11 @@ void GenericSystemInfoUi::emitGenericDataChanged()
     emit genericDataChanged(genericData());
 }
 
+QIcon GenericSystemInfoUi::icon() const
+{
+    return QIcon(":/ui/icons/systeminfo.png");
+}
+
 GenericSystemInfoUi::GenericData GenericSystemInfoUi::genericData() const
 {
     GenericData data;
diff --git a/src/ui/systeminfogenericui.h b/src/ui/systeminfogenericui.h
index f5bed3a..b887e17 100644
--- a/src/ui/systeminfogenericui.h
+++ b/src/ui/systeminfogenericui.h
@@ -235,6 +235,7 @@ public:
     GenericSystemInfoScriptInterface *scriptInterface();
 
     GenericData genericData() const;
+    QIcon icon() const;
 
 public slots:
     void setGenericData(const GenericSystemInfoUi::GenericData &data);
diff --git a/src/ui/systeminfonetworkui.cpp b/src/ui/systeminfonetworkui.cpp
index c3aaf5a..0bbe9b4 100644
--- a/src/ui/systeminfonetworkui.cpp
+++ b/src/ui/systeminfonetworkui.cpp
@@ -320,6 +320,11 @@ void NetworkSystemInfoUi::setCurrentNetworkSignalStrength(SignalStrengthButton::
     }
 }
 
+QIcon NetworkSystemInfoUi::icon() const
+{
+    return QIcon(":/ui/icons/network.png");
+}
+
 
 /*!
     \class NetworkSystemInfoScriptInterface
diff --git a/src/ui/systeminfonetworkui.h b/src/ui/systeminfonetworkui.h
index 1323e4e..fbb99ef 100644
--- a/src/ui/systeminfonetworkui.h
+++ b/src/ui/systeminfonetworkui.h
@@ -158,6 +158,7 @@ public:
     NetworkSystemInfoScriptInterface *scriptInterface();
 
     NetworkData networkData() const;
+    QIcon icon() const;
 
 public slots:
     void setNetworkData(const NetworkSystemInfoUi::NetworkData &data);
diff --git a/src/ui/systeminfostorageui.cpp b/src/ui/systeminfostorageui.cpp
index 93a698d..31cec41 100644
--- a/src/ui/systeminfostorageui.cpp
+++ b/src/ui/systeminfostorageui.cpp
@@ -406,3 +406,8 @@ void StorageSystemInfoUi::enableDriveControls(bool enabled)
     systemInfoRemoveDrive->setEnabled(enabled);
     systemInfoChangeDriveName->setEnabled(enabled);
 }
+
+QIcon StorageSystemInfoUi::icon() const
+{
+    return QIcon(":/ui/icons/storage.png");
+}
diff --git a/src/ui/systeminfostorageui.h b/src/ui/systeminfostorageui.h
index de55ebe..022d7cb 100644
--- a/src/ui/systeminfostorageui.h
+++ b/src/ui/systeminfostorageui.h
@@ -102,6 +102,7 @@ public:
 
     StorageSystemInfoScriptInterface *scriptInterface();
 
+    QIcon icon() const;
     StorageData storageData() const;
 
 public slots:
diff --git a/src/ui/ui.qrc b/src/ui/ui.qrc
index d1b54d8..9676e62 100644
--- a/src/ui/ui.qrc
+++ b/src/ui/ui.qrc
@@ -23,5 +23,19 @@
         <file>textures/N900_left.png</file>
         <file>textures/N900_top.png</file>
         <file>icons/north.png</file>
+        <file>icons/application.png</file>
+        <file>icons/camera.png</file>
+        <file>icons/contacts.png</file>
+        <file>icons/docgallery.png</file>
+        <file>icons/feedback.png</file>
+        <file>icons/messaging.png</file>
+        <file>icons/multipointtouch.png</file>
+        <file>icons/network.png</file>
+        <file>icons/nfc.png</file>
+        <file>icons/organizer.png</file>
+        <file>icons/sensors.png</file>
+        <file>icons/storage.png</file>
+        <file>icons/systeminfo.png</file>
+        <file>icons/view.png</file>
     </qresource>
 </RCC>
diff --git a/src/ui/viewui.cpp b/src/ui/viewui.cpp
index ac3fef9..6ac3f3e 100644
--- a/src/ui/viewui.cpp
+++ b/src/ui/viewui.cpp
@@ -333,6 +333,10 @@ void ViewUi::setOrientationLocked(bool locked)
     }
 }
 
+QIcon ViewUi::icon() const
+{
+    return QIcon(":/ui/icons/view.png");
+}
 
 /*!
     \class ViewScriptInterface
diff --git a/src/ui/viewui.h b/src/ui/viewui.h
index 461624a..bd4f228 100644
--- a/src/ui/viewui.h
+++ b/src/ui/viewui.h
@@ -55,7 +55,7 @@ public:
     QObject * scriptInterface() const;
     void writeSettings(QSettings &) const;
     void readSettings(QSettings &);
-
+    QIcon icon() const;
 
 signals:
     void deviceSelectionChanged(const DeviceData &data);