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/preferences_vpn_page.ui | 89 +++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 src/leap/bitmask/gui/ui/preferences_vpn_page.ui

(limited to 'src/leap/bitmask/gui/ui/preferences_vpn_page.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 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/preferences_vpn_page.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