From c7304e54e40cd9151e6d00a8441aaf48b68c9bcc Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 3 Sep 2014 15:50:08 -0700
Subject: single pref win: move eip preferences to new combined preference
 window.

---
 src/leap/bitmask/gui/ui/eippreferences.ui          | 102 ---------
 src/leap/bitmask/gui/ui/mainwindow.ui              |   8 +-
 src/leap/bitmask/gui/ui/preferences.ui             | 234 ++++++++-------------
 .../bitmask/gui/ui/preferences_account_page.ui     |  95 +++++++++
 src/leap/bitmask/gui/ui/preferences_email_page.ui  |  32 +++
 src/leap/bitmask/gui/ui/preferences_vpn_page.ui    |  89 ++++++++
 6 files changed, 303 insertions(+), 257 deletions(-)
 delete mode 100644 src/leap/bitmask/gui/ui/eippreferences.ui
 create mode 100644 src/leap/bitmask/gui/ui/preferences_account_page.ui
 create mode 100644 src/leap/bitmask/gui/ui/preferences_email_page.ui
 create mode 100644 src/leap/bitmask/gui/ui/preferences_vpn_page.ui

(limited to 'src/leap/bitmask/gui/ui')

diff --git a/src/leap/bitmask/gui/ui/eippreferences.ui b/src/leap/bitmask/gui/ui/eippreferences.ui
deleted file mode 100644
index 1a5fcd24..00000000
--- a/src/leap/bitmask/gui/ui/eippreferences.ui
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>EIPPreferences</class>
- <widget class="QDialog" name="EIPPreferences">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>435</width>
-    <height>144</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Encrypted Internet Preferences</string>
-  </property>
-  <property name="windowIcon">
-   <iconset resource="../../../../../data/resources/icons.qrc">
-    <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="gbGatewaySelector">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="title">
-      <string>Select gateway for provider</string>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="lblSelectProvider">
-        <property name="text">
-         <string>Select &amp;provider:</string>
-        </property>
-        <property name="buddy">
-         <cstring>cbProvidersGateway</cstring>
-        </property>
-       </widget>
-      </item>
-      <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>
-      <item row="7" column="2">
-       <widget class="QPushButton" name="pbSaveGateway">
-        <property name="text">
-         <string>&amp;Save this provider settings</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="3">
-       <widget class="QLabel" name="lblProvidersGatewayStatus">
-        <property name="text">
-         <string>&lt; Providers Gateway Status &gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label">
-        <property name="text">
-         <string>Select &amp;gateway:</string>
-        </property>
-        <property name="buddy">
-         <cstring>cbGateways</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>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>cbProvidersGateway</tabstop>
-  <tabstop>cbGateways</tabstop>
-  <tabstop>pbSaveGateway</tabstop>
- </tabstops>
- <resources>
-  <include location="../../../../../data/resources/icons.qrc"/>
- </resources>
- <connections/>
-</ui>
diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index f7570ee6..2e8aea8c 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -317,7 +317,6 @@
     <addaction name="action_advanced_key_management"/>
     <addaction name="separator"/>
     <addaction name="action_preferences"/>
-    <addaction name="action_eip_preferences"/>
     <addaction name="separator"/>
     <addaction name="action_quit"/>
    </widget>
@@ -338,12 +337,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Account Preferences...</string>
-   </property>
-  </action>
-  <action name="action_eip_preferences">
-   <property name="text">
-    <string>Internet Preferences...</string>
+    <string>Preferences...</string>
    </property>
   </action>
   <action name="action_quit">
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index cd4d3a77..5e30ea57 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>503</width>
-    <height>401</height>
+    <width>520</width>
+    <height>439</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,159 +17,97 @@
    <iconset resource="../../../../../data/resources/icons.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="4" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1,0">
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="account_label">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+     <property name="text">
+      <string>user@example.org</string>
      </property>
-    </spacer>
+    </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>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </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>
-   <item row="3" column="0">
-    <widget class="QGroupBox" name="gbEnabledServices">
-     <property name="title">
-      <string>Enabled services</string>
+   <item>
+    <layout class="QHBoxLayout" name="horizontal_layout" stretch="0,0">
+     <property name="spacing">
+      <number>12</number>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="3" column="1">
-       <widget class="QPushButton" name="pbSaveServices">
-        <property name="text">
-         <string>Save this provider settings</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QGroupBox" name="gbServices">
-        <property name="title">
-         <string>Services</string>
-        </property>
-        <property name="flat">
-         <bool>false</bool>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_4">
-         <item row="0" column="0">
-          <layout class="QVBoxLayout" name="vlServices"/>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="cbProvidersServices">
-        <item>
-         <property name="text">
-          <string>&lt;Select provider&gt;</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Select provider:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QLabel" name="lblProvidersServicesStatus">
-        <property name="text">
-         <string>&lt; Providers Services Status &gt;</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+     <item>
+      <widget class="QListWidget" name="nav_widget">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>120</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="movement">
+        <enum>QListView::Static</enum>
+       </property>
+       <property name="spacing">
+        <number>10</number>
+       </property>
+       <property name="viewMode">
+        <enum>QListView::IconMode</enum>
+       </property>
+       <property name="uniformItemSizes">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QStackedWidget" name="pages_widget"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="button_layout" stretch="0,0">
+     <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="close_button">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/src/leap/bitmask/gui/ui/preferences_account_page.ui b/src/leap/bitmask/gui/ui/preferences_account_page.ui
new file mode 100644
index 00000000..4e58b2ab
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/preferences_account_page.ui
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferencesAccountPage</class>
+ <widget class="QWidget" name="PreferencesAccountPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>462</width>
+    <height>371</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QPushButton" name="btnChangePassword">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Change Password</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="lblChangePasswordStatus">
+     <property name="text">
+      <string>&lt;change password status&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Preferred</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>15</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="gbServices">
+     <property name="title">
+      <string>Services</string>
+     </property>
+     <property name="flat">
+      <bool>false</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="1" column="0">
+       <layout class="QVBoxLayout" name="vlServices"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="lblProvidersServicesStatus">
+        <property name="text">
+         <string>&lt; Providers Services Status &gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer_2">
+     <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>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui
new file mode 100644
index 00000000..41b3c28d
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferencesEmailPage</class>
+ <widget class="QWidget" name="PreferencesEmailPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <widget class="QPushButton" name="pushButton">
+   <property name="geometry">
+    <rect>
+     <x>250</x>
+     <y>210</y>
+     <width>98</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>PushButton</string>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/leap/bitmask/gui/ui/preferences_vpn_page.ui b/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
new file mode 100644
index 00000000..85a0dc60
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PreferencesVpnPage</class>
+ <widget class="QWidget" name="PreferencesVpnPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>362</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="flash_label">
+     <property name="text">
+      <string>&lt;flash_label&gt;</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="heading_label">
+     <property name="text">
+      <string>Default VPN Gateway:</string>
+     </property>
+     <property name="buddy">
+      <cstring>gateways_list</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QListWidget" name="gateways_list">
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+      <property name="icon">
+       <iconset>
+        <normalon>:/images/countries/us.png</normalon>
+       </iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>New Item</string>
+      </property>
+      <property name="icon">
+       <iconset>
+        <normalon>:/images/countries/br.png</normalon>
+       </iconset>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="tip_label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>You must reconnect for changes to take effect.</string>
+     </property>
+     <property name="scaledContents">
+      <bool>false</bool>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="buddy">
+      <cstring>gateways_list</cstring>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../../../data/resources/flags.qrc"/>
+ </resources>
+ <connections/>
+</ui>
-- 
cgit v1.2.3


From 4e7c4b48b4255ceac06900fa9e65824c52e15ba7 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 4 Sep 2014 17:09:29 -0700
Subject: single pref win: enabled/disable services via preferences window,
 account page.

---
 .../bitmask/gui/ui/preferences_account_page.ui     | 67 ++++++++++++----------
 1 file changed, 38 insertions(+), 29 deletions(-)

(limited to 'src/leap/bitmask/gui/ui')

diff --git a/src/leap/bitmask/gui/ui/preferences_account_page.ui b/src/leap/bitmask/gui/ui/preferences_account_page.ui
index 4e58b2ab..9b6d885b 100644
--- a/src/leap/bitmask/gui/ui/preferences_account_page.ui
+++ b/src/leap/bitmask/gui/ui/preferences_account_page.ui
@@ -15,23 +15,28 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QPushButton" name="btnChangePassword">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Change Password</string>
+    <widget class="QGroupBox" name="provider_services_box">
+     <property name="title">
+      <string>Services</string>
      </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="lblChangePasswordStatus">
-     <property name="text">
-      <string>&lt;change password status&gt;</string>
+     <property name="flat">
+      <bool>false</bool>
      </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="1" column="0">
+       <layout class="QVBoxLayout" name="provider_services_layout"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="provider_services_label">
+        <property name="text">
+         <string>&lt;provider_services_label&gt;</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
@@ -51,24 +56,28 @@
     </spacer>
    </item>
    <item>
-    <widget class="QGroupBox" name="gbServices">
+    <widget class="QGroupBox" name="groupBox">
      <property name="title">
-      <string>Services</string>
+      <string>Password</string>
      </property>
-     <property name="flat">
-      <bool>false</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_4">
-      <item row="1" column="0">
-       <layout class="QVBoxLayout" name="vlServices"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="lblProvidersServicesStatus">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QPushButton" name="change_password_button">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
-         <string>&lt; Providers Services Status &gt;</string>
+         <string>Change Password</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="change_password_label">
+        <property name="text">
+         <string>&lt;change_password_label&gt;</string>
         </property>
        </widget>
       </item>
-- 
cgit v1.2.3


From 6166ffedcae0763f3c00076c79e74847f5c80823 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 8 Sep 2014 02:01:14 -0700
Subject: single pref win: moved password change UI to a separate window,
 opened from account page in preferences.

---
 src/leap/bitmask/gui/ui/password_change.ui | 182 +++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 src/leap/bitmask/gui/ui/password_change.ui

(limited to 'src/leap/bitmask/gui/ui')

diff --git a/src/leap/bitmask/gui/ui/password_change.ui b/src/leap/bitmask/gui/ui/password_change.ui
new file mode 100644
index 00000000..b7ceac38
--- /dev/null
+++ b/src/leap/bitmask/gui/ui/password_change.ui
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PasswordChange</class>
+ <widget class="QDialog" name="PasswordChange">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>459</width>
+    <height>231</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Change Password</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="grid_layout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="username_label">
+       <property name="text">
+        <string>Username:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="new_password_label">
+       <property name="text">
+        <string>New password:</string>
+       </property>
+       <property name="buddy">
+        <cstring>new_password_lineedit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="new_password_lineedit">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="new_password_confirmation_label">
+       <property name="text">
+        <string>Re-enter new password:</string>
+       </property>
+       <property name="buddy">
+        <cstring>new_password_confirmation_lineedit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="current_password_label">
+       <property name="text">
+        <string>Current password:</string>
+       </property>
+       <property name="buddy">
+        <cstring>current_password_lineedit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="new_password_confirmation_lineedit">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="current_password_lineedit">
+       <property name="echoMode">
+        <enum>QLineEdit::Password</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <spacer name="spacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>10</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLineEdit" name="username_lineedit">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="flash_label">
+     <property name="text">
+      <string>&lt;flash_label&gt;</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="spacer2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="button_layout">
+     <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="cancel_button">
+       <property name="text">
+        <string>Close</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ok_button">
+       <property name="text">
+        <string>OK</string>
+       </property>
+       <property name="autoDefault">
+        <bool>false</bool>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>username_lineedit</tabstop>
+  <tabstop>current_password_lineedit</tabstop>
+  <tabstop>new_password_lineedit</tabstop>
+  <tabstop>new_password_confirmation_lineedit</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
-- 
cgit v1.2.3


From 1d331478a431047bf59fc6249a93e127450bff24 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 16 Sep 2014 17:07:12 -0700
Subject: single pref win: clean up vpn pref error displaying & don't show
 dummy gateways in case of error.

---
 src/leap/bitmask/gui/ui/preferences_vpn_page.ui | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'src/leap/bitmask/gui/ui')

diff --git a/src/leap/bitmask/gui/ui/preferences_vpn_page.ui b/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
index 85a0dc60..1bf3a060 100644
--- a/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
+++ b/src/leap/bitmask/gui/ui/preferences_vpn_page.ui
@@ -36,26 +36,6 @@
    </item>
    <item>
     <widget class="QListWidget" name="gateways_list">
-     <item>
-      <property name="text">
-       <string>New Item</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <normalon>:/images/countries/us.png</normalon>
-       </iconset>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>New Item</string>
-      </property>
-      <property name="icon">
-       <iconset>
-        <normalon>:/images/countries/br.png</normalon>
-       </iconset>
-      </property>
-     </item>
     </widget>
    </item>
    <item>
-- 
cgit v1.2.3


From 92fc4c1d9d60a213a4be21db459efc3bfc3e205f Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 18 Sep 2014 15:17:46 -0700
Subject: single pref win: added shortcut to preferences

---
 src/leap/bitmask/gui/ui/mainwindow.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/leap/bitmask/gui/ui')

diff --git a/src/leap/bitmask/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index 2e8aea8c..b1d68c4a 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -337,7 +337,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Preferences...</string>
+    <string>Pr&amp;eferences...</string>
    </property>
   </action>
   <action name="action_quit">
-- 
cgit v1.2.3