From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 19 Feb 2013 21:10:05 +0000 (+0100)
Subject: Name labels a bit nicer
X-Git-Tag: 0.9-beta1~28
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a4b12295cffc6add9b03c25faff35f753b026ec9;ds=inline

Name labels a bit nicer
---

diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp
index 6ae5f515..4d66b6f6 100644
--- a/src/qtui/settingspages/networkssettingspage.cpp
+++ b/src/qtui/settingspages/networkssettingspage.cpp
@@ -45,9 +45,9 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent)
     if (!(Client::coreFeatures() & Quassel::SaslAuthentication))
         ui.sasl->hide();
     if (!(Client::coreFeatures() & Quassel::SaslExternal))
-        ui.label_saslext->hide();
+        ui.saslExtInfo->hide();
 #ifndef HAVE_SSL
-    ui.label_saslext->hide();
+    ui.saslExtInfo->hide();
 #endif
 
     // set up icons
@@ -582,16 +582,16 @@ void NetworksSettingsPage::sslUpdated()
 {
     if (_cid && !_cid->sslKey().isNull()) {
         ui.saslAccount->setDisabled(true);
-        ui.label_10->setDisabled(true);
+        ui.saslAccountLabel->setDisabled(true);
         ui.saslPassword->setDisabled(true);
-        ui.label_11->setDisabled(true);
-        ui.label_saslext->setHidden(false);
+        ui.saslPasswordLabel->setDisabled(true);
+        ui.saslExtInfo->setHidden(false);
     } else {
         ui.saslAccount->setDisabled(false);
-        ui.label_10->setDisabled(false);
+        ui.saslAccountLabel->setDisabled(false);
         ui.saslPassword->setDisabled(false);
-        ui.label_11->setDisabled(false);
-        ui.label_saslext->setHidden(true);
+        ui.saslPasswordLabel->setDisabled(false);
+        ui.saslExtInfo->setHidden(true);
     }
 }
 #endif
diff --git a/src/qtui/settingspages/networkssettingspage.ui b/src/qtui/settingspages/networkssettingspage.ui
index e2c106cd..7ef574ac 100644
--- a/src/qtui/settingspages/networkssettingspage.ui
+++ b/src/qtui/settingspages/networkssettingspage.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>515</width>
-    <height>503</height>
+    <width>510</width>
+    <height>505</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -180,7 +180,7 @@
          <string/>
         </property>
         <property name="currentIndex">
-         <number>3</number>
+         <number>0</number>
         </property>
         <widget class="QWidget" name="serversTab">
          <property name="enabled">
@@ -607,7 +607,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
               </widget>
              </item>
              <item row="1" column="0">
-              <widget class="QLabel" name="label_11">
+              <widget class="QLabel" name="saslPasswordLabel">
                <property name="enabled">
                 <bool>true</bool>
                </property>
@@ -617,7 +617,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
               </widget>
              </item>
              <item row="0" column="0">
-              <widget class="QLabel" name="label_10">
+              <widget class="QLabel" name="saslAccountLabel">
                <property name="enabled">
                 <bool>true</bool>
                </property>
@@ -630,7 +630,7 @@ Note that Quassel IRC automatically rejoins channels, so /join will rarely be ne
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_saslext">
+           <widget class="QLabel" name="saslExtInfo">
             <property name="text">
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; because the identity has an ssl certificate set, SASL EXTERNAL will be used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>