Change Certificate Wizard page order to work around bug in Qt 4.4
Index: mumble-1.2.1/src/mumble/Cert.ui
===================================================================
--- mumble-1.2.1.orig/src/mumble/Cert.ui
+++ mumble-1.2.1/src/mumble/Cert.ui
@@ -141,6 +141,76 @@
     </item>
    </layout>
   </widget>
+  <widget class="CompletablePage" name="qwpNew">
+   <property name="title">
+    <string>New Certificate</string>
+   </property>
+   <property name="subTitle">
+    <string>Generate a new certificate for strong authentication</string>
+   </property>
+   <attribute name="pageId">
+    <string notr="true">1</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout_3">
+    <item row="0" column="0" colspan="2">
+     <widget class="QLabel" name="qlNewText">
+      <property name="text">
+       <string>&lt;p&gt;Mumble will now generate a strong certificate for authentication to servers.&lt;/p&gt;&lt;p&gt;If you wish, you may provide some additional information to be stored in the certificate, which will be presented to servers when you connect. If you provide a valid email address, you can upgrade to a CA issued email certificate later on, which provides strong identification.&lt;/p&gt;</string>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="qlName">
+      <property name="text">
+       <string>Name</string>
+      </property>
+      <property name="buddy">
+       <cstring>qleName</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QLabel" name="qlEmail">
+      <property name="text">
+       <string>Email</string>
+      </property>
+      <property name="buddy">
+       <cstring>qleEmail</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QLineEdit" name="qleEmail">
+      <property name="toolTip">
+       <string>Your email address (e.g. johndoe@mumble.info)</string>
+      </property>
+      <property name="whatsThis">
+       <string>This is your email address. It is strongly recommended to provide a valid email address, as this will allow you to upgrade to a strong certificate without authentication problems.</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="1">
+     <widget class="QLabel" name="qlError">
+      <property name="text">
+       <string/>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QLineEdit" name="qleName">
+      <property name="toolTip">
+       <string>Your name (e.g. John Doe)</string>
+      </property>
+      <property name="whatsThis">
+       <string>This is your name, and will be filled out in the certificate. This field is entirely optional.</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
   <widget class="CompletablePage" name="qwpImport">
    <property name="title">
     <string>Import Certificate</string>
@@ -234,78 +304,6 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWizardPage" name="qwpReplace">
-   <property name="title">
-    <string>Replace Certificate</string>
-   </property>
-   <property name="subTitle">
-    <string>Replace existing certificate with new certificate?</string>
-   </property>
-   <attribute name="pageId">
-    <string notr="true">4</string>
-   </attribute>
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0" colspan="2">
-     <widget class="QLabel" name="qlReplace">
-      <property name="enabled">
-       <bool>true</bool>
-      </property>
-      <property name="text">
-       <string>&lt;p&gt;You already have a certificate stored in Mumble, and you are about to replace it.&lt;/p&gt;
-&lt;p&gt;If you are upgrading to a certificate issued to you by a trusted CA and the email addresses match your current certificate, this is completely safe, and servers you connect to will automatically recognize the strong certificate for your email address.
-&lt;/p&gt;
-&lt;p&gt;If this is not the case, you will no longer be recognized by any server you previously have authenticated with. If you haven't been registered on any server yet, this is nothing to worry about.
-&lt;/p&gt;
-&lt;p&gt;
-Are you sure you wish to replace your certificate?
-&lt;/p&gt;
-</string>
-      </property>
-      <property name="wordWrap">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="CertView" name="cvCurrent">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="toolTip">
-       <string>Current certificate</string>
-      </property>
-      <property name="whatsThis">
-       <string>This is the certificate Mumble currently uses. It will be replaced.</string>
-      </property>
-      <property name="title">
-       <string>Current Certificate</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="CertView" name="cvNew">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>1</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="toolTip">
-       <string>New certificate</string>
-      </property>
-      <property name="whatsThis">
-       <string>This is the new certificate that will replace the old one.</string>
-      </property>
-      <property name="title">
-       <string>New Certificate</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
   <widget class="CompletablePage" name="qwpExport">
    <property name="title">
     <string>Export Certificate</string>
@@ -374,21 +372,32 @@ Are you sure you wish to replace your ce
     </item>
    </layout>
   </widget>
-  <widget class="CompletablePage" name="qwpNew">
+  <widget class="QWizardPage" name="qwpReplace">
    <property name="title">
-    <string>New Certificate</string>
+    <string>Replace Certificate</string>
    </property>
    <property name="subTitle">
-    <string>Generate a new certificate for strong authentication</string>
+    <string>Replace existing certificate with new certificate?</string>
    </property>
    <attribute name="pageId">
-    <string notr="true">1</string>
+    <string notr="true">4</string>
    </attribute>
-   <layout class="QGridLayout" name="gridLayout_3">
+   <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0" colspan="2">
-     <widget class="QLabel" name="qlNewText">
+     <widget class="QLabel" name="qlReplace">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
       <property name="text">
-       <string>&lt;p&gt;Mumble will now generate a strong certificate for authentication to servers.&lt;/p&gt;&lt;p&gt;If you wish, you may provide some additional information to be stored in the certificate, which will be presented to servers when you connect. If you provide a valid email address, you can upgrade to a CA issued email certificate later on, which provides strong identification.&lt;/p&gt;</string>
+       <string>&lt;p&gt;You already have a certificate stored in Mumble, and you are about to replace it.&lt;/p&gt;
+&lt;p&gt;If you are upgrading to a certificate issued to you by a trusted CA and the email addresses match your current certificate, this is completely safe, and servers you connect to will automatically recognize the strong certificate for your email address.
+&lt;/p&gt;
+&lt;p&gt;If this is not the case, you will no longer be recognized by any server you previously have authenticated with. If you haven't been registered on any server yet, this is nothing to worry about.
+&lt;/p&gt;
+&lt;p&gt;
+Are you sure you wish to replace your certificate?
+&lt;/p&gt;
+</string>
       </property>
       <property name="wordWrap">
        <bool>true</bool>
@@ -396,49 +405,40 @@ Are you sure you wish to replace your ce
      </widget>
     </item>
     <item row="1" column="0">
-     <widget class="QLabel" name="qlName">
-      <property name="text">
-       <string>Name</string>
-      </property>
-      <property name="buddy">
-       <cstring>qleName</cstring>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="qlEmail">
-      <property name="text">
-       <string>Email</string>
-      </property>
-      <property name="buddy">
-       <cstring>qleEmail</cstring>
+     <widget class="CertView" name="cvCurrent">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="qleEmail">
       <property name="toolTip">
-       <string>Your email address (e.g. johndoe@mumble.info)</string>
+       <string>Current certificate</string>
       </property>
       <property name="whatsThis">
-       <string>This is your email address. It is strongly recommended to provide a valid email address, as this will allow you to upgrade to a strong certificate without authentication problems.</string>
+       <string>This is the certificate Mumble currently uses. It will be replaced.</string>
       </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QLabel" name="qlError">
-      <property name="text">
-       <string/>
+      <property name="title">
+       <string>Current Certificate</string>
       </property>
      </widget>
     </item>
     <item row="1" column="1">
-     <widget class="QLineEdit" name="qleName">
+     <widget class="CertView" name="cvNew">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="toolTip">
-       <string>Your name (e.g. John Doe)</string>
+       <string>New certificate</string>
       </property>
       <property name="whatsThis">
-       <string>This is your name, and will be filled out in the certificate. This field is entirely optional.</string>
+       <string>This is the new certificate that will replace the old one.</string>
+      </property>
+      <property name="title">
+       <string>New Certificate</string>
       </property>
      </widget>
     </item>