Merge remote-tracking branch 'ivan/feature/preferences-select-services' into develop

Conflicts:
	src/leap/bitmask/gui/mainwindow.py
	src/leap/bitmask/gui/preferenceswindow.py

5 files changed, 37 insertions, 44 deletions

diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 25747785..34451928 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -288,17 +288,12 @@ class MainWindow(QtGui.QMainWindow):
 
         ################################# end Qt Signals connection ########
 
-        # Enable the password change when soledad is ready
-        self.soledad_ready.connect(
-            partial(self.ui.btnPreferences.setEnabled, True))
-
         init_platform()
 
         self._wizard = None
         self._wizard_firstrun = False
 
         self._logger_window = None
-        self._preferences_window = None
 
         self._bypass_checks = bypass_checks
 
@@ -419,8 +414,11 @@ class MainWindow(QtGui.QMainWindow):
 
         Displays the preferences window.
         """
-        PreferencesWindow(
-            self, self._srp_auth, self._soledad, self._settings).show()
+        preferences_window = PreferencesWindow(
+            self, self._srp_auth, self._soledad,
+            self._settings, self._standalone)
+
+        preferences_window.show()
 
     def _uncheck_logger_button(self):
         """
diff --git a/src/leap/bitmask/gui/preferenceswindow.py b/src/leap/bitmask/gui/preferenceswindow.py
index 2b48b54c..05f616b0 100644
--- a/src/leap/bitmask/gui/preferenceswindow.py
+++ b/src/leap/bitmask/gui/preferenceswindow.py
@@ -30,6 +30,7 @@ from leap.bitmask.crypto.srpauth import SRPAuthBadPassword
 from leap.bitmask.util.password import basic_password_checks
 from leap.bitmask.services import get_supported
 from leap.bitmask.config.providerconfig import ProviderConfig
+from leap.bitmask.services import get_service_display_name
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +42,7 @@ class PreferencesWindow(QtGui.QDialog):
 
     WEAK_PASSWORDS = ("123456", "qweasd", "qwerty", "password")
 
-    def __init__(self, parent, srp_auth, soledad, leap_settings):
+    def __init__(self, parent, srp_auth, soledad, leap_settings, standalone):
         """
         :param parent: parent object of the PreferencesWindow.
         :parent type: QWidget
@@ -49,12 +50,17 @@ class PreferencesWindow(QtGui.QDialog):
         :type srp_auth: SRPAuth
         :param soledad: Soledad object configured in the main app.
         :type soledad: Soledad
+        :param standalone: If True, the application is running as standalone
+                           and the preferences dialog should display some
+                           messages according to this.
+        :type standalone: bool
         """
         QtGui.QDialog.__init__(self, parent)
 
         self._srp_auth = srp_auth
         self._soledad = soledad
         self._settings = leap_settings
+        self._standalone = standalone
 
         # Load UI
         self.ui = Ui_Preferences()
@@ -62,19 +68,6 @@ class PreferencesWindow(QtGui.QDialog):
         self.ui.lblPasswordChangeStatus.setVisible(False)
         self.ui.lblProvidersServicesStatus.setVisible(False)
 
-        # Correspondence for services and their name to display
-        EIP_LABEL = self.tr("Encrypted Internet")
-        MX_LABEL = self.tr("Encrypted Mail")
-
-        self.SERVICE_DISPLAY = [
-            EIP_LABEL,
-            MX_LABEL
-        ]
-        self.SERVICE_CONFIG = [
-            "openvpn",
-            "mx"
-        ]
-
         self._selected_services = set()
         self._provider_config = ProviderConfig()
 
@@ -83,11 +76,23 @@ class PreferencesWindow(QtGui.QDialog):
         self.ui.cbProvidersServices.currentIndexChanged[unicode].connect(
             self._populate_services)
 
+        parent.soledad_ready.connect(self._soledad_ready)
+
         if not self._settings.get_configured_providers():
             self.ui.gbEnabledServices.setEnabled(False)
         else:
             self._add_configured_providers()
 
+    def _soledad_ready(self):
+        """
+        SLOT
+        TRIGGERS:
+            parent.soledad_ready
+        It sets the soledad object as ready to use.
+        """
+        self._soledad_ready = True
+        self.ui.gbPasswordChange.setEnabled(True)
+
     def _set_password_change_status(self, status, error=False, success=False):
         """
         Sets the status label for the password change.
@@ -283,8 +288,10 @@ class PreferencesWindow(QtGui.QDialog):
         for service in services:
             try:
                 checkbox = QtGui.QCheckBox(self)
-                service_index = self.SERVICE_CONFIG.index(service)
-                checkbox.setText(self.SERVICE_DISPLAY[service_index])
+                service_label = get_service_display_name(
+                    service, self._standalone)
+                checkbox.setText(service_label)
+
                 self.ui.vlServices.addWidget(checkbox)
                 checkbox.stateChanged.connect(
                     partial(self._service_selection_changed, service))
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 1f9ef4c4..b59990b1 100644
--- a/src/leap/bitmask/gui/ui/preferences.ui
+++ b/src/leap/bitmask/gui/ui/preferences.ui
@@ -20,6 +20,9 @@
   <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>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index e3f0085b..ac0f032f 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -34,7 +34,7 @@ from leap.bitmask.util.request_helpers import get_content
 from leap.bitmask.util.keyring_helpers import has_keyring
 from leap.bitmask.util.password import basic_password_checks
 from leap.bitmask.services.eip.providerbootstrapper import ProviderBootstrapper
-from leap.bitmask.services import get_supported
+from leap.bitmask.services import get_service_display_name, get_supported
 
 from ui_wizard import Ui_Wizard
 
@@ -84,23 +84,6 @@ class Wizard(QtGui.QWizard):
         self.ERROR_ICON = QtGui.QPixmap(":/images/Dialog-error.png")
         self.OK_ICON = QtGui.QPixmap(":/images/Dialog-accept.png")
 
-        # Correspondence for services and their name to display
-        EIP_LABEL = self.tr("Encrypted Internet")
-        MX_LABEL = self.tr("Encrypted Mail")
-
-        if self._is_need_eip_password_warning():
-            EIP_LABEL += " " + self.tr(
-                "(will need admin password to start)")
-
-        self.SERVICE_DISPLAY = [
-            EIP_LABEL,
-            MX_LABEL
-        ]
-        self.SERVICE_CONFIG = [
-            "openvpn",
-            "mx"
-        ]
-
         self._selected_services = set()
         self._shown_services = set()
 
@@ -507,8 +490,10 @@ class Wizard(QtGui.QWizard):
             try:
                 if service not in self._shown_services:
                     checkbox = QtGui.QCheckBox(self)
-                    service_index = self.SERVICE_CONFIG.index(service)
-                    checkbox.setText(self.SERVICE_DISPLAY[service_index])
+                    service_label = get_service_display_name(
+                        service, self.standalone)
+                    checkbox.setText(service_label)
+
                     self.ui.serviceListLayout.addWidget(checkbox)
                     checkbox.stateChanged.connect(
                         partial(self._service_selection_changed, service))