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

diff --git a/src/qtui/ui/coreconnectdlg.ui b/src/qtui/ui/coreconnectdlg.ui
index 9b628843..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>563</width>
-    <height>356</height>
+    <width>539</width>
+    <height>347</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -19,10 +19,13 @@
    <string>Connect to Quassel Core</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../../icons/icons.qrc" >
+   <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" >
@@ -32,7 +35,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex" >
-      <number>2</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="accountPage" >
       <property name="geometry" >
@@ -40,7 +43,7 @@
         <x>0</x>
         <y>0</y>
         <width>539</width>
-        <height>331</height>
+        <height>340</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" >
@@ -65,7 +68,7 @@
                <string>Edit...</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >
+               <iconset>
                 <normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</normaloff>:/16x16/actions/oxygen/16x16/actions/document-properties.png</iconset>
               </property>
              </widget>
@@ -76,7 +79,7 @@
                <string>Add...</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >
+               <iconset>
                 <normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-add.png</iconset>
               </property>
              </widget>
@@ -87,7 +90,7 @@
                <string>Delete</string>
               </property>
               <property name="icon" >
-               <iconset resource="../../icons/icons.qrc" >
+               <iconset>
                 <normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</normaloff>:/16x16/actions/oxygen/16x16/actions/list-remove.png</iconset>
               </property>
              </widget>
@@ -105,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>
@@ -139,7 +149,7 @@
         <x>0</x>
         <y>0</y>
         <width>539</width>
-        <height>332</height>
+        <height>347</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" >
@@ -155,12 +165,6 @@
           <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" >
@@ -169,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>
@@ -208,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>
@@ -227,7 +231,7 @@ space</string>
                <string/>
               </property>
               <property name="pixmap" >
-               <pixmap resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/document-encrypt.png</pixmap>
+               <pixmap>:/22x22/actions/oxygen/22x22/actions/document-encrypt.png</pixmap>
               </property>
              </widget>
             </item>
@@ -242,31 +246,21 @@ space</string>
              </sizepolicy>
             </property>
             <property name="currentIndex" >
-             <number>0</number>
+             <number>1</number>
             </property>
             <widget class="QWidget" name="loginCredentialsPage" >
              <property name="geometry" >
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>501</width>
-               <height>145</height>
+               <width>485</width>
+               <height>135</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>
+              <property name="margin" >
+               <number>0</number>
+              </property>
               <item>
                <spacer>
                 <property name="orientation" >
@@ -292,9 +286,6 @@ space</string>
                  <string>Login</string>
                 </property>
                 <layout class="QVBoxLayout" >
-                 <property name="margin" >
-                  <number>4</number>
-                 </property>
                  <item>
                   <layout class="QGridLayout" >
                    <item row="0" column="0" >
@@ -339,16 +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>100</width>
-               <height>30</height>
+               <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" >
@@ -412,21 +507,10 @@ 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" stdset="0" >
-                 <size>
-                  <width>20</width>
-                  <height>40</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
              </layout>
             </widget>
             <widget class="QWidget" name="loginEmptyPage" >
@@ -434,8 +518,8 @@ space</string>
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>100</width>
-               <height>30</height>
+               <width>485</width>
+               <height>135</height>
               </rect>
              </property>
             </widget>
@@ -458,8 +542,8 @@ space</string>
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>539</width>
-        <height>332</height>
+        <width>100</width>
+        <height>30</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" >
@@ -573,9 +657,7 @@ space</string>
   <tabstop>launchCoreConfigWizard</tabstop>
   <tabstop>syncButtonBox</tabstop>
  </tabstops>
- <resources>
-  <include location="../../icons/icons.qrc" />
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>accountButtonBox</sender>