Merge branch 'release-0.3.4'

1 files changed, 54 insertions, 121 deletions

diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index e66a2d68..e187c016 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>503</width>
-    <height>529</height>
+    <height>401</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,7 +18,7 @@
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
-   <item row="5" column="0">
+   <item row="4" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -31,64 +31,80 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="gbGatewaySelector">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="gbPasswordChange">
      <property name="enabled">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <property name="title">
-      <string>Select gateway for provider</string>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
+      <string>Password Change</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="1" colspan="2">
-       <widget class="QComboBox" name="cbProvidersGateway">
-        <item>
-         <property name="text">
-          <string>&lt;Select provider&gt;</string>
-         </property>
-        </item>
-       </widget>
-      </item>
+     <layout class="QFormLayout" name="formLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
       <item row="0" column="0">
-       <widget class="QLabel" name="lblSelectProvider">
+       <widget class="QLabel" name="lblCurrentPassword">
         <property name="text">
-         <string>&amp;Select provider:</string>
+         <string>&amp;Current password:</string>
         </property>
         <property name="buddy">
-         <cstring>cbProvidersGateway</cstring>
+         <cstring>leCurrentPassword</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="leCurrentPassword">
+        <property name="echoMode">
+         <enum>QLineEdit::Password</enum>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="lblNewPassword">
         <property name="text">
-         <string>Select gateway:</string>
+         <string>&amp;New password:</string>
+        </property>
+        <property name="buddy">
+         <cstring>leNewPassword</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="QComboBox" name="cbGateways">
-        <item>
-         <property name="text">
-          <string>Automatic</string>
-         </property>
-        </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="leNewPassword">
+        <property name="echoMode">
+         <enum>QLineEdit::Password</enum>
+        </property>
        </widget>
       </item>
-      <item row="5" column="2">
-       <widget class="QPushButton" name="pbSaveGateway">
+      <item row="2" column="0">
+       <widget class="QLabel" name="lblNewPassword2">
         <property name="text">
-         <string>Save this provider settings</string>
+         <string>&amp;Re-enter new password:</string>
+        </property>
+        <property name="buddy">
+         <cstring>leNewPassword2</cstring>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3">
-       <widget class="QLabel" name="lblProvidersGatewayStatus">
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="leNewPassword2">
+        <property name="echoMode">
+         <enum>QLineEdit::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QPushButton" name="pbChangePassword">
         <property name="text">
-         <string>&lt; Providers Gateway Status &gt;</string>
+         <string>Change</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="QLabel" name="lblPasswordChangeStatus">
+        <property name="text">
+         <string>&lt;Password change status&gt;</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
@@ -98,7 +114,7 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <widget class="QGroupBox" name="gbEnabledServices">
      <property name="title">
       <string>Enabled services</string>
@@ -155,89 +171,6 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="gbPasswordChange">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="title">
-      <string>Password Change</string>
-     </property>
-     <layout class="QFormLayout" name="formLayout">
-      <property name="fieldGrowthPolicy">
-       <enum>QFormLayout::ExpandingFieldsGrow</enum>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="lblCurrentPassword">
-        <property name="text">
-         <string>&amp;Current password:</string>
-        </property>
-        <property name="buddy">
-         <cstring>leCurrentPassword</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="leCurrentPassword">
-        <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="lblNewPassword">
-        <property name="text">
-         <string>&amp;New password:</string>
-        </property>
-        <property name="buddy">
-         <cstring>leNewPassword</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="leNewPassword">
-        <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lblNewPassword2">
-        <property name="text">
-         <string>&amp;Re-enter new password:</string>
-        </property>
-        <property name="buddy">
-         <cstring>leNewPassword2</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLineEdit" name="leNewPassword2">
-        <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QPushButton" name="pbChangePassword">
-        <property name="text">
-         <string>Change</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2">
-       <widget class="QLabel" name="lblPasswordChangeStatus">
-        <property name="text">
-         <string>&lt;Password change status&gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>