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.

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

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

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>
-- 
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/preferences_account_page.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