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

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 23ec4b64..7f2094db 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>539</width>
+    <height>347</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -18,7 +18,14 @@
   <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" >
+   <property name="margin" >
+    <number>0</number>
+   </property>
    <item>
     <widget class="QStackedWidget" name="stackedWidget" >
      <property name="sizePolicy" >
@@ -28,9 +35,17 @@
       </sizepolicy>
      </property>
      <property name="currentIndex" >
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="accountPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>539</width>
+        <height>340</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox" >
@@ -53,7 +68,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 +79,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 +90,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 +100,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 +108,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 +135,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>
@@ -119,6 +144,14 @@
       </layout>
      </widget>
      <widget class="QWidget" name="loginPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>539</width>
+        <height>347</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_2" >
@@ -132,21 +165,6 @@
           <string>Initializing your connection</string>
          </property>
          <layout class="QVBoxLayout" >
-          <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" >
-           <number>4</number>
-          </property>
           <item>
            <layout class="QGridLayout" >
             <item row="0" column="0" >
@@ -155,7 +173,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 +195,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 +212,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 +225,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>
@@ -221,26 +249,24 @@ space</string>
              <number>1</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>485</width>
+               <height>135</height>
+              </rect>
+             </property>
              <layout class="QVBoxLayout" >
+              <property name="margin" >
+               <number>0</number>
+              </property>
               <item>
                <spacer>
                 <property name="orientation" >
                  <enum>Qt::Vertical</enum>
                 </property>
-                <property name="sizeHint" >
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item>
-               <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Vertical</enum>
-                </property>
-                <property name="sizeHint" >
+                <property name="sizeHint" stdset="0" >
                  <size>
                   <width>20</width>
                   <height>40</height>
@@ -260,18 +286,6 @@ 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" >
-                  <number>4</number>
-                 </property>
                  <item>
                   <layout class="QGridLayout" >
                    <item row="0" column="0" >
@@ -316,8 +330,120 @@ space</string>
               </item>
              </layout>
             </widget>
+            <widget class="QWidget" name="connectionWarningsPage" >
+             <layout class="QVBoxLayout" name="verticalLayout" >
+              <property name="margin" >
+               <number>0</number>
+              </property>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout" >
+                <item>
+                 <spacer name="horizontalSpacer" >
+                  <property name="orientation" >
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0" >
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="viewSslCertButton" >
+                  <property name="text" >
+                   <string>view SSL Certificate</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_2" >
+                  <property name="orientation" >
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0" >
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
+              <item>
+               <spacer name="verticalSpacer" >
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0" >
+                 <size>
+                  <width>20</width>
+                  <height>48</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_2" >
+                <item>
+                 <widget class="QCheckBox" name="ignoreWarningsPermanently" >
+                  <property name="text" >
+                   <string>add to known hosts</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_3" >
+                  <property name="orientation" >
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0" >
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="ignoreWarningsButton" >
+                  <property name="text" >
+                   <string>Continue connection</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
+            </widget>
             <widget class="QWidget" name="coreConfigPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>485</width>
+               <height>135</height>
+              </rect>
+             </property>
              <layout class="QVBoxLayout" >
+              <property name="margin" >
+               <number>0</number>
+              </property>
+              <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="groupBox_4" >
                 <property name="sizePolicy" >
@@ -350,7 +476,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 +496,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>
@@ -381,24 +507,22 @@ space</string>
                   </layout>
                  </item>
                 </layout>
+                <zorder>label_7</zorder>
+                <zorder></zorder>
                </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="loginEmptyPage" />
+            <widget class="QWidget" name="loginEmptyPage" >
+             <property name="geometry" >
+              <rect>
+               <x>0</x>
+               <y>0</y>
+               <width>485</width>
+               <height>135</height>
+              </rect>
+             </property>
+            </widget>
            </widget>
           </item>
          </layout>
@@ -407,13 +531,21 @@ 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>100</width>
+        <height>30</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" >
        <item>
         <widget class="QGroupBox" name="groupBox_3" >
@@ -475,49 +607,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 +614,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 +645,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>