Using icons from desktop theme in preferences + site info

- Faenza icons are no longer explicitly shown in prefereneces and site
info
 - they are now used only if icon is not found in active theme, and also
for Windows users
 - please test it and let me know if icons are correct for each category
 - also fixes previous commit

src/data/icons.qrc

@@ -2,15 +2,11 @@
     <qresource prefix="/">
         <file>icons/qupzilla.png</file>
         <file>icons/qupzillaupdate.png</file>
-        <file>icons/preferences/applications-accessories.png</file>
         <file>icons/preferences/applications-internet.png</file>
         <file>icons/preferences/applications-system.png</file>
         <file>icons/preferences/applications-webbrowsers.png</file>
         <file>icons/preferences/contact-new.png</file>
         <file>icons/preferences/preferences-desktop.png</file>
-        <file>icons/preferences/gnome-window-manager.png</file>
-        <file>icons/preferences/history_entry.png</file>
-        <file>icons/preferences/stock_inbox.png</file>
         <file>icons/faenza/back.png</file>
         <file>icons/faenza/close.png</file>
         <file>icons/faenza/forward.png</file>
@@ -42,13 +38,10 @@
         <file>icons/preferences/applications-fonts.png</file>
         <file>icons/preferences/applications-graphics.png</file>
         <file>icons/preferences/document-properties.png</file>
-        <file>icons/preferences/stock_keyring.png</file>
         <file>icons/other/adblock.png</file>
-        <file>icons/preferences/stock_dialog-question.png</file>
         <file>icons/notifications/download.png</file>
         <file>icons/other/bighistory.png</file>
         <file>icons/menu/dot.png</file>
-        <file>icons/preferences/appereance.png</file>
         <file>icons/preferences/style-default.png</file>
         <file>icons/exeicons/qupzilla16.png</file>
         <file>icons/exeicons/qupzilla32.png</file>
@@ -69,5 +62,10 @@
         <file>icons/faenza/go-next.png</file>
         <file>icons/faenza/go-previous.png</file>
         <file>icons/faenza/list-remove.png</file>
+        <file>icons/preferences/application-x-theme.png</file>
+        <file>icons/preferences/dialog-password.png</file>
+        <file>icons/preferences/dialog-question.png</file>
+        <file>icons/preferences/mail-inbox.png</file>
+        <file>icons/preferences/preferences-system-firewall.png</file>
     </qresource>
 </RCC>

src/desktopnotifications/desktopnotificationsfactory.cpp

@@ -84,3 +84,28 @@ void DesktopNotificationsFactory::notify(const QPixmap &icon, const QString &hea
         break;
     }
 }
+
+void DesktopNotificationsFactory::nativeNotificationPreview()
+{
+#ifdef Q_WS_X11
+        QFile tmp(QDir::tempPath() + "/qupzilla_notif.png");
+        tmp.open(QFile::WriteOnly);
+        QPixmap(":icons/preferences/stock_dialog-question.png").save(tmp.fileName());
+
+        QDBusInterface dbus("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", QDBusConnection::sessionBus());
+        QVariantList args;
+        args.append("qupzilla");
+        args.append(m_uint);
+        args.append(tmp.fileName());
+        args.append(tr("Native System Notification"));
+        args.append("");
+        args.append(QStringList());
+        args.append(QVariantMap());
+        args.append(m_timeout);
+        QDBusMessage message = dbus.callWithArgumentList(QDBus::Block, "Notify", args);
+        QVariantList list = message.arguments();
+        if (list.count() > 0) {
+            m_uint = list.at(0).toInt();
+        }
+#endif
+}

src/desktopnotifications/desktopnotificationsfactory.h

@@ -38,6 +38,8 @@ public:
     explicit DesktopNotificationsFactory(QObject* parent = 0);
     void notify(const QPixmap &icon, const QString &heading, const QString &text);
 
+    void nativeNotificationPreview();
+
 signals:
 
 public slots:

src/downloads/downloadmanager.cpp

@@ -219,7 +219,7 @@ void DownloadManager::downloadFinished(bool success)
 
     if (downloadingAllFilesFinished) {
         if (success && qApp->activeWindow() != this) {
-            mApp->desktopNotifications()->notify(QPixmap(":icons/notifications/download.png"), tr("Download Finished"), tr("All files have been successfully downloaded."));
+            mApp->desktopNotifications()->notify(QIcon::fromTheme("mail-inbox", QIcon(":icons/notifications/download.png")).pixmap(48), tr("Download Finished"), tr("All files have been successfully downloaded."));
             if (!m_closeOnFinish) {
                 raise();
                 activateWindow();

src/preferences/preferences.cpp

@@ -80,6 +80,18 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
     setAttribute(Qt::WA_DeleteOnClose);
     ui->setupUi(this);
 
+    ui->listWidget->item(0)->setIcon(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/preferences/preferences-desktop.png")));
+    ui->listWidget->item(1)->setIcon(QIcon::fromTheme("application-x-theme", QIcon(":/icons/preferences/application-x-theme.png")));
+    ui->listWidget->item(2)->setIcon(QIcon::fromTheme("applications-internet", QIcon(":/icons/preferences/applications-internet.png")));
+    ui->listWidget->item(3)->setIcon(QIcon::fromTheme("applications-webbrowsers", QIcon(":/icons/preferences/applications-webbrowsers.png")));
+    ui->listWidget->item(4)->setIcon(QIcon::fromTheme("applications-fonts", QIcon(":/icons/preferences/applications-fonts.png")));
+    ui->listWidget->item(5)->setIcon(QIcon::fromTheme("mail-inbox", QIcon(":/icons/preferences/mail-inbox.png")));
+    ui->listWidget->item(6)->setIcon(QIcon::fromTheme("dialog-password", QIcon(":/icons/preferences/dialog-password.png")));
+    ui->listWidget->item(7)->setIcon(QIcon::fromTheme("preferences-system-firewall", QIcon(":/icons/preferences/preferences-system-firewall.png")));
+    ui->listWidget->item(8)->setIcon(QIcon::fromTheme("dialog-question", QIcon(":/icons/preferences/dialog-question.png")));
+    ui->listWidget->item(9)->setIcon(QIcon::fromTheme("extension", QIcon(":/icons/preferences/extension.png")));
+    ui->listWidget->item(10)->setIcon(QIcon::fromTheme("applications-system", QIcon(":/icons/preferences/applications-system.png")));
+
     QSettings settings(mApp->getActiveProfilPath() + "settings.ini", QSettings::IniFormat);
     //GENERAL URLs
     settings.beginGroup("Web-URL-Settings");
@@ -363,7 +375,7 @@ void Preferences::showStackedPage(QListWidgetItem* item)
         m_notification->move(m_notifPosition);
         m_notification->show();
 
-        mApp->desktopNotifications()->notify(QPixmap(":icons/preferences/stock_dialog-question.png"), tr("Native System Notification"), "");
+        mApp->desktopNotifications()->nativeNotificationPreview();
     }
     else if (m_notification) {
         m_notifPosition = m_notification->pos();

src/preferences/preferences.ui

@@ -16,9 +16,15 @@
   <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0" rowspan="5">
     <widget class="QListWidget" name="listWidget">
+     <property name="minimumSize">
+      <size>
+       <width>220</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="maximumSize">
       <size>
-       <width>200</width>
+       <width>220</width>
        <height>16777215</height>
       </size>
      </property>
@@ -56,10 +62,6 @@
       <property name="whatsThis">
        <string notr="true">0</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/preferences-desktop.png</normaloff>:/icons/preferences/preferences-desktop.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -68,10 +70,6 @@
       <property name="whatsThis">
        <string notr="true">1</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/appereance.png</normaloff>:/icons/preferences/appereance.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -80,10 +78,6 @@
       <property name="whatsThis">
        <string notr="true">2</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/applications-internet.png</normaloff>:/icons/preferences/applications-internet.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -92,10 +86,6 @@
       <property name="whatsThis">
        <string notr="true">3</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/applications-webbrowsers.png</normaloff>:/icons/preferences/applications-webbrowsers.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -104,10 +94,6 @@
       <property name="whatsThis">
        <string notr="true">4</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/applications-fonts.png</normaloff>:/icons/preferences/applications-fonts.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -116,10 +102,6 @@
       <property name="whatsThis">
        <string notr="true">5</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/stock_inbox.png</normaloff>:/icons/preferences/stock_inbox.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -128,10 +110,6 @@
       <property name="whatsThis">
        <string notr="true">6</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/contact-new.png</normaloff>:/icons/preferences/contact-new.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -140,10 +118,6 @@
       <property name="whatsThis">
        <string notr="true">7</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/history_entry.png</normaloff>:/icons/preferences/history_entry.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -152,10 +126,6 @@
       <property name="whatsThis">
        <string notr="true">8</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/stock_dialog-question.png</normaloff>:/icons/preferences/stock_dialog-question.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -164,10 +134,6 @@
       <property name="whatsThis">
        <string notr="true">9</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/extension.png</normaloff>:/icons/preferences/extension.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -176,10 +142,6 @@
       <property name="whatsThis">
        <string notr="true">10</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/applications-system.png</normaloff>:/icons/preferences/applications-system.png</iconset>
-      </property>
      </item>
     </widget>
    </item>
@@ -2008,8 +1970,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../data/icons.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/webview/siteinfo.cpp

@@ -42,6 +42,11 @@ SiteInfo::SiteInfo(QupZilla* mainClass, QWidget* parent)
     , m_certWidget(0)
 {
     ui->setupUi(this);
+
+    ui->listWidget->item(0)->setIcon(QIcon::fromTheme("document-properties", QIcon(":/icons/preferences/document-properties.png")));
+    ui->listWidget->item(1)->setIcon(QIcon::fromTheme("applications-graphics", QIcon(":/icons/preferences/applications-graphics.png")));
+    ui->listWidget->item(2)->setIcon(QIcon::fromTheme("dialog-password", QIcon(":/icons/preferences/dialog-password.png")));
+
     WebView* view = p_QupZilla->weView();
     QWebFrame* frame = view->page()->mainFrame();
     QString title = view->title();

src/webview/siteinfo.ui

@@ -76,7 +76,7 @@
       <bool>false</bool>
      </property>
      <property name="currentRow">
-      <number>0</number>
+      <number>-1</number>
      </property>
      <item>
       <property name="text">
@@ -85,10 +85,6 @@
       <property name="whatsThis">
        <string notr="true">0</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/document-properties.png</normaloff>:/icons/preferences/document-properties.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -97,10 +93,6 @@
       <property name="whatsThis">
        <string notr="true">1</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/applications-graphics.png</normaloff>:/icons/preferences/applications-graphics.png</iconset>
-      </property>
      </item>
      <item>
       <property name="text">
@@ -109,10 +101,6 @@
       <property name="whatsThis">
        <string notr="true">2</string>
       </property>
-      <property name="icon">
-       <iconset resource="../data/icons.qrc">
-        <normaloff>:/icons/preferences/stock_keyring.png</normaloff>:/icons/preferences/stock_keyring.png</iconset>
-      </property>
      </item>
     </widget>
    </item>
@@ -386,9 +374,7 @@
    <header>squeezelabelv2.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../data/icons.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>