X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fcoreconnectdlg.ui;h=574609ecb5cdc6c98357783f56f2fdd7742e0cb2;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hp=8b903eae707d49780f9fa5e5e03fef2fc4b3022b;hpb=a80b8d3e7e04d2939e5b3ea6e17282d3509e4d32;p=quassel.git

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 8b903eae..574609ec 100644
--- a/src/qtui/ui/coreconnectdlg.ui
+++ b/src/qtui/ui/coreconnectdlg.ui
@@ -5,20 +5,44 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>617</width>
-    <height>410</height>
+    <width>563</width>
+    <height>356</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <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" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="currentIndex" >
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="accountPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>539</width>
+        <height>332</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox" >
@@ -41,7 +65,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>
@@ -51,7 +76,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>
@@ -61,7 +87,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>
@@ -70,7 +97,7 @@
               <property name="orientation" >
                <enum>Qt::Vertical</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>20</width>
                 <height>40</height>
@@ -78,6 +105,13 @@
               </property>
              </spacer>
             </item>
+            <item>
+             <widget class="QPushButton" name="useInternalCore" >
+              <property name="text" >
+               <string>use internal core</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>
@@ -98,7 +132,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>
@@ -107,13 +141,33 @@
       </layout>
      </widget>
      <widget class="QWidget" name="loginPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>539</width>
+        <height>332</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_2" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="title" >
           <string>Initializing your connection</string>
          </property>
          <layout class="QVBoxLayout" >
+          <property name="spacing" >
+           <number>0</number>
+          </property>
+          <property name="margin" >
+           <number>4</number>
+          </property>
           <item>
            <layout class="QGridLayout" >
             <item row="0" column="0" >
@@ -122,7 +176,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>
@@ -144,7 +198,7 @@
               <property name="orientation" >
                <enum>Qt::Horizontal</enum>
               </property>
-              <property name="sizeHint" >
+              <property name="sizeHint" stdset="0" >
                <size>
                 <width>358</width>
                 <height>21</height>
@@ -154,11 +208,17 @@
             </item>
             <item row="1" column="1" colspan="2" >
              <widget class="QLabel" name="coreInfoLabel" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="text" >
                <string>Core Info
-might be multiple
-lines
-so reserve some space</string>
+reserve
+some
+space</string>
               </property>
               <property name="alignment" >
                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -168,31 +228,78 @@ so reserve some 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>
            <widget class="QStackedWidget" name="loginStack" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="currentIndex" >
              <number>0</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>501</width>
+               <height>146</height>
+              </rect>
+             </property>
              <layout class="QVBoxLayout" >
+              <item>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0" >
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <spacer>
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0" >
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
               <item>
                <widget class="QGroupBox" name="loginGroup" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="title" >
                  <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>
@@ -237,25 +344,26 @@ so reserve some space</string>
                 </layout>
                </widget>
               </item>
-              <item>
-               <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" >
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
              </layout>
             </widget>
             <widget class="QWidget" name="coreConfigPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>100</width>
+               <height>30</height>
+              </rect>
+             </property>
              <layout class="QVBoxLayout" >
               <item>
                <widget class="QGroupBox" name="groupBox_4" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="title" >
                  <string>Configure your Quassel Core</string>
                 </property>
@@ -280,7 +388,7 @@ so reserve some 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>
@@ -300,7 +408,7 @@ so reserve some 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>
@@ -318,7 +426,7 @@ so reserve some 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>
@@ -328,7 +436,16 @@ so reserve some space</string>
               </item>
              </layout>
             </widget>
-            <widget class="QWidget" name="loginEmptyPage" />
+            <widget class="QWidget" name="loginEmptyPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>100</width>
+               <height>30</height>
+              </rect>
+             </property>
+            </widget>
            </widget>
           </item>
          </layout>
@@ -337,13 +454,21 @@ so reserve some 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>
       </layout>
      </widget>
      <widget class="QWidget" name="syncPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>539</width>
+        <height>332</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_3" >
@@ -405,49 +530,6 @@ so reserve some 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>
@@ -455,7 +537,7 @@ so reserve some 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>
@@ -485,16 +567,17 @@ so reserve some space</string>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>accountButtonBox</tabstop>
   <tabstop>accountList</tabstop>
+  <tabstop>accountButtonBox</tabstop>
+  <tabstop>autoConnect</tabstop>
   <tabstop>editAccount</tabstop>
   <tabstop>addAccount</tabstop>
   <tabstop>deleteAccount</tabstop>
-  <tabstop>autoConnect</tabstop>
-  <tabstop>loginButtonBox</tabstop>
   <tabstop>user</tabstop>
   <tabstop>password</tabstop>
   <tabstop>rememberPasswd</tabstop>
+  <tabstop>loginButtonBox</tabstop>
+  <tabstop>launchCoreConfigWizard</tabstop>
   <tabstop>syncButtonBox</tabstop>
  </tabstops>
  <resources>