Some tweaks in NetworksSettingsPage

diff --git a/src/qtui/settingspages/networkadddlg.ui b/src/qtui/settingspages/networkadddlg.ui
index 0c63f07..58ff11f 100644 (file)
--- a/src/qtui/settingspages/networkadddlg.ui
+++ b/src/qtui/settingspages/networkadddlg.ui
@@ -26,7 +26,14 @@
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="presetList" />
+      <widget class="QComboBox" name="presetList" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer" >

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 7c98306..0a196c7 100644 (file)
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -434,7 +434,10 @@ void NetworksSettingsPage::displayNetwork(NetworkId id) {
     ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt()));
     ui.serverList->clear();
     foreach(Network::Server server, info.serverList) {
-      ui.serverList->addItem(QString("%1:%2").arg(server.host).arg(server.port));
+      QListWidgetItem *item = new QListWidgetItem(QString("%1:%2").arg(server.host).arg(server.port));
+      if(server.useSsl)
+        item->setIcon(SmallIcon("document-encrypt"));
+      ui.serverList->addItem(item);
     }
     //setItemState(id);
     //ui.randomServer->setChecked(info.useRandomServer);
@@ -658,9 +661,12 @@ NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialo
     QStringList networks = s.childGroups();
     foreach(QString s, existing)
       networks.removeAll(s);
-    if(!networks.isEmpty())
-      networks.sort();
-      ui.presetList->addItems(networks);
+    if(!networks.isEmpty()) {
+      QMap<QString, QString> sorted;
+      foreach(QString net, networks)
+        sorted[net.toLower()] = net;
+      ui.presetList->addItems(sorted.values());
+    }
   }
   if(!ui.presetList->count()) {
     ui.useManual->setChecked(true);