From 45796e0256e3a57e506d6db8c2bde62a510ae6ae Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 26 Aug 2013 17:47:01 -0300
Subject: Preferences: select enabled services for providers

---
 src/leap/bitmask/gui/ui/mainwindow.ui  |  2 +-
 src/leap/bitmask/gui/ui/preferences.ui | 78 ++++++++++++++++++++++++++++++----
 2 files changed, 70 insertions(+), 10 deletions(-)

(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 834a562e..17837642 100644
--- a/src/leap/bitmask/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
@@ -217,7 +217,7 @@
       <item>
        <widget class="QPushButton" name="btnPreferences">
         <property name="enabled">
-         <bool>false</bool>
+         <bool>true</bool>
         </property>
         <property name="text">
          <string>Preferences</string>
diff --git a/src/leap/bitmask/gui/ui/preferences.ui b/src/leap/bitmask/gui/ui/preferences.ui
index 8c63ccad..b59990b1 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>451</width>
-    <height>267</height>
+    <width>453</width>
+    <height>463</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,9 +17,12 @@
    <iconset resource="../../../../../data/resources/mainwindow.qrc">
     <normaloff>:/images/mask-icon.png</normaloff>:/images/mask-icon.png</iconset>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <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>
@@ -98,7 +101,64 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
+    <widget class="QGroupBox" name="gbEnabledServices">
+     <property name="title">
+      <string>Enabled services</string>
+     </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>
+   <item row="1" column="0">
     <widget class="QGroupBox" name="gbGatewaySelector">
      <property name="enabled">
       <bool>false</bool>
@@ -116,12 +176,12 @@
          <string>&amp;Select provider:</string>
         </property>
         <property name="buddy">
-         <cstring>cbProviders</cstring>
+         <cstring>cbProvidersGateway</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
-       <widget class="QComboBox" name="cbProviders">
+       <widget class="QComboBox" name="cbProvidersGateway">
         <item>
          <property name="text">
           <string>&lt;Select provider&gt;</string>
@@ -137,7 +197,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QComboBox" name="comboBox">
+       <widget class="QComboBox" name="cbGateways">
         <item>
          <property name="text">
           <string>Automatic</string>
@@ -148,7 +208,7 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
-- 
cgit v1.2.3