Bring back icons to NetworkSettingsPage

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 0857a4e..4b890e4 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -25,17 +25,29 @@
 #include "networkssettingspage.h"
 
 #include "client.h"
+#include "iconloader.h"
 #include "identity.h"
 #include "network.h"
 
 
 NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) {
   ui.setupUi(this);
+
+  // set up icons
+  ui.renameNetwork->setIcon(SmallIcon("edit-rename"));
+  ui.addNetwork->setIcon(SmallIcon("list-add"));
+  ui.deleteNetwork->setIcon(SmallIcon("edit-delete"));
+  ui.addServer->setIcon(SmallIcon("list-add"));
+  ui.deleteServer->setIcon(SmallIcon("edit-delete"));
+  ui.editServer->setIcon(SmallIcon("configure"));
+  ui.upServer->setIcon(SmallIcon("go-up"));
+  ui.downServer->setIcon(SmallIcon("go-down"));
+
   _ignoreWidgetChanges = false;
 
-  connectedIcon = QIcon(":/22x22/actions/network-connect");
-  connectingIcon = QIcon(":/22x22/actions/gear");
-  disconnectedIcon = QIcon(":/22x22/actions/network-disconnect");
+  connectedIcon = SmallIcon("network-connect");
+  connectingIcon = SmallIcon("network-wired");  // FIXME network-connecting
+  disconnectedIcon = SmallIcon("network-disconnect");
 
   foreach(int mib, QTextCodec::availableMibs()) {
     QByteArray codec = QTextCodec::codecForMib(mib)->name();
@@ -653,6 +665,8 @@ void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) {
 
 ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
+  ui.useSSL->setIcon(SmallIcon("document-encrypt"));
+
   QVariantMap serverData = _serverData.toMap();
   if(serverData.count()) {
     ui.host->setText(serverData["Host"].toString());

diff --git a/src/qtui/settingspages/networkssettingspage.h b/src/qtui/settingspages/networkssettingspage.h
index 22a9e33..1b3b0fd 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.h
+++ b/src/qtui/settingspages/networkssettingspage.h
@@ -21,17 +21,16 @@
 #ifndef _NETWORKSSETTINGSPAGE_H_
 #define _NETWORKSSETTINGSPAGE_H_
 
-#include <QIcon>
+#include <QPixmap>
 
+#include "network.h"
 #include "settingspage.h"
+
 #include "ui_networkssettingspage.h"
 #include "ui_networkeditdlg.h"
 #include "ui_servereditdlg.h"
 #include "ui_saveidentitiesdlg.h"
 
-#include "network.h"
-#include "types.h"
-
 class NetworksSettingsPage : public SettingsPage {
   Q_OBJECT
 
@@ -83,7 +82,7 @@ class NetworksSettingsPage : public SettingsPage {
     QHash<NetworkId, NetworkInfo> networkInfos;
     bool _ignoreWidgetChanges;
 
-    QIcon connectedIcon, connectingIcon, disconnectedIcon;
+    QPixmap connectedIcon, connectingIcon, disconnectedIcon;
 
     void reset();
     bool testHasChanged();

diff --git a/src/qtui/settingspages/servereditdlg.ui b/src/qtui/settingspages/servereditdlg.ui
index 80dac12..1a48d59 100644 (file)
--- a/src/qtui/settingspages/servereditdlg.ui
+++ b/src/qtui/settingspages/servereditdlg.ui
@@ -50,7 +50,7 @@
    <item>
     <layout class="QHBoxLayout" >
      <item>
-      <widget class="QLabel" name="label_3" >
+      <widget class="QLabel" name="passwordLabel" >
        <property name="text" >
         <string>Password:</string>
        </property>
@@ -77,7 +77,7 @@
       <string>Use SSL</string>
      </property>
      <property name="icon" >
-      <iconset resource="../../icons/icons.qrc" >
+      <iconset>
        <normaloff>:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-encrypt.png</iconset>
      </property>
     </widget>