X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fcoreconnectdlg.ui;h=e172e8a0d6be1e1f1b2c95e4fb367ed00aae8f16;hp=23ec4b64c5de4f594773a662205d008ebbffcbde;hb=62317a70eef06212a1afcfcc1df5b18853d8ef01;hpb=c8a1817d1843e987794f95f66ef2da93fa75286f

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 23ec4b64..e172e8a0 100644
--- a/src/qtui/ui/coreconnectdlg.ui
+++ b/src/qtui/ui/coreconnectdlg.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>496</width>
-    <height>316</height>
+    <width>563</width>
+    <height>356</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -18,6 +18,10 @@
   <property name="windowTitle" >
    <string>Connect to Quassel Core</string>
   </property>
+  <property name="windowIcon" >
+   <iconset>
+    <normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
+  </property>
   <layout class="QHBoxLayout" >
    <item>
     <widget class="QStackedWidget" name="stackedWidget" >
@@ -53,7 +57,8 @@
                <string>Edit...</string>
               </property>
               <property name="icon" >
-               <iconset/>
+               <iconset>
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</iconset>
               </property>
              </widget>
             </item>
@@ -63,7 +68,8 @@
                <string>Add...</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
+               <iconset>
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
               </property>
              </widget>
             </item>
@@ -73,7 +79,8 @@
                <string>Delete</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
+               <iconset>
+                <normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
               </property>
              </widget>
             </item>
@@ -82,7 +89,7 @@
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>20</width>
                 <height>40</height>
@@ -90,6 +97,13 @@
               </property>
              </spacer>
             </item>
+            <item>
+             <widget class="QPushButton" name="useInternalCore" >
+              <property name="text" >
+               <string>Use internal core</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>
@@ -110,7 +124,7 @@
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="standardButtons" >
-            <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+            <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
            </property>
           </widget>
          </item>
@@ -135,16 +149,7 @@
           <property name="spacing" >
            <number>0</number>
           </property>
-          <property name="leftMargin" >
-           <number>4</number>
-          </property>
-          <property name="topMargin" >
-           <number>4</number>
-          </property>
-          <property name="rightMargin" >
-           <number>4</number>
-          </property>
-          <property name="bottomMargin" >
+          <property name="margin" >
            <number>4</number>
           </property>
           <item>
@@ -155,7 +160,7 @@
                <string/>
               </property>
               <property name="pixmap" >
-               <pixmap resource="../../icons/icons.qrc" >:/22x22/actions/network-disconnect</pixmap>
+               <pixmap>:/22x22/actions/network-disconnect</pixmap>
               </property>
              </widget>
             </item>
@@ -177,7 +182,7 @@
               <property name="orientation" >
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>358</width>
                 <height>21</height>
@@ -194,10 +199,10 @@
                </sizepolicy>
               </property>
               <property name="text" >
-               <string>Core Info
-reserve
-some
-space</string>
+               <string>THIS IS A PLACEHOLDER
+TO
+RESERVE
+SOME SPACE</string>
               </property>
               <property name="alignment" >
                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -207,6 +212,16 @@ space</string>
               </property>
              </widget>
             </item>
+            <item row="0" column="3" >
+             <widget class="QLabel" name="secureConnection" >
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="pixmap" >
+               <pixmap>:/22x22/actions/oxygen/22x22/actions/document-encrypt.png</pixmap>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
           <item>
@@ -218,7 +233,7 @@ space</string>
              </sizepolicy>
             </property>
             <property name="currentIndex" >
-             <number>1</number>
+             <number>0</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
              <layout class="QVBoxLayout" >
@@ -227,7 +242,7 @@ space</string>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -240,7 +255,7 @@ space</string>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -260,16 +275,7 @@ space</string>
                  <string>Login</string>
                 </property>
                 <layout class="QVBoxLayout" >
-                 <property name="leftMargin" >
-                  <number>4</number>
-                 </property>
-                 <property name="topMargin" >
-                  <number>4</number>
-                 </property>
-                 <property name="rightMargin" >
-                  <number>4</number>
-                 </property>
-                 <property name="bottomMargin" >
+                 <property name="margin" >
                   <number>4</number>
                  </property>
                  <item>
@@ -350,7 +356,7 @@ space</string>
                      <property name="orientation" >
                       <enum>Qt::Horizontal</enum>
                      </property>
-                     <property name="sizeHint" >
+                     <property name="sizeHint" stdset="0" >
                       <size>
                        <width>40</width>
                        <height>20</height>
@@ -370,7 +376,7 @@ space</string>
                      <property name="orientation" >
                       <enum>Qt::Horizontal</enum>
                      </property>
-                     <property name="sizeHint" >
+                     <property name="sizeHint" stdset="0" >
                       <size>
                        <width>40</width>
                        <height>20</height>
@@ -388,7 +394,7 @@ space</string>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -407,7 +413,7 @@ space</string>
        <item>
         <widget class="QDialogButtonBox" name="loginButtonBox" >
          <property name="standardButtons" >
-          <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
          </property>
         </widget>
        </item>
@@ -475,49 +481,6 @@ space</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0" >
-               <widget class="QLabel" name="label_4" >
-                <property name="text" >
-                 <string>Channel states:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="2" column="1" >
-               <widget class="QProgressBar" name="channelsProgress" >
-                <property name="maximum" >
-                 <number>1</number>
-                </property>
-                <property name="value" >
-                 <number>0</number>
-                </property>
-                <property name="format" >
-                 <string>0/0</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="0" >
-               <widget class="QLabel" name="label_5" >
-                <property name="text" >
-                 <string>User states:</string>
-                </property>
-               </widget>
-              </item>
-              <item row="3" column="1" >
-               <widget class="QProgressBar" name="ircUsersProgress" >
-                <property name="minimum" >
-                 <number>0</number>
-                </property>
-                <property name="maximum" >
-                 <number>1</number>
-                </property>
-                <property name="value" >
-                 <number>0</number>
-                </property>
-                <property name="format" >
-                 <string>0/0</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </item>
             <item>
@@ -525,7 +488,7 @@ space</string>
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>483</width>
                 <height>61</height>
@@ -556,21 +519,19 @@ space</string>
  </widget>
  <tabstops>
   <tabstop>accountList</tabstop>
+  <tabstop>accountButtonBox</tabstop>
+  <tabstop>autoConnect</tabstop>
   <tabstop>editAccount</tabstop>
   <tabstop>addAccount</tabstop>
   <tabstop>deleteAccount</tabstop>
-  <tabstop>autoConnect</tabstop>
-  <tabstop>accountButtonBox</tabstop>
-  <tabstop>password</tabstop>
   <tabstop>user</tabstop>
+  <tabstop>password</tabstop>
   <tabstop>rememberPasswd</tabstop>
   <tabstop>loginButtonBox</tabstop>
-  <tabstop>syncButtonBox</tabstop>
   <tabstop>launchCoreConfigWizard</tabstop>
+  <tabstop>syncButtonBox</tabstop>
  </tabstops>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>accountButtonBox</sender>