simplify wizard instructions

2 files changed, 20 insertions, 27 deletions

diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 8c52897d..e895dc5a 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -23,7 +23,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Bitmask first run</string>
+   <string>Bitmask Provider Setup</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../../../../../data/resources/mainwindow.qrc">
@@ -40,10 +40,10 @@
   </property>
   <widget class="WizardPage" name="introduction_page">
    <property name="title">
-    <string>Welcome</string>
+    <string>Welcome to Bitmask</string>
    </property>
    <property name="subTitle">
-    <string>This is the Bitmask first run wizard</string>
+    <string> </string>
    </property>
    <attribute name="pageId">
     <string notr="true">0</string>
@@ -59,7 +59,7 @@
     <item row="0" column="0">
      <widget class="QLabel" name="label_3">
       <property name="text">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Now we will guide you through some configuration that is needed before you can connect for the first time.&lt;/p&gt;&lt;p&gt;If you ever need to modify these options again, you can find the wizard in the &lt;span style=&quot; font-style:italic;&quot;&gt;'Bitmask -&amp;gt; Create new account...'&lt;/span&gt; menu from the main window.&lt;/p&gt;&lt;p&gt;Do you want to &lt;span style=&quot; font-weight:600;&quot;&gt;sign up&lt;/span&gt; for a new account, or &lt;span style=&quot; font-weight:600;&quot;&gt;log in&lt;/span&gt; with an already existing username?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <string></string>
       </property>
       <property name="textFormat">
        <enum>Qt::RichText</enum>
@@ -109,10 +109,10 @@
   </widget>
   <widget class="WizardPage" name="select_provider_page">
    <property name="title">
-    <string>Provider selection</string>
+    <string>Choose a provider</string>
    </property>
    <property name="subTitle">
-    <string>Please enter the domain of the provider you want to use for your connection</string>
+    <string> </string>
    </property>
    <attribute name="pageId">
     <string notr="true">1</string>
@@ -156,7 +156,7 @@
        <item row="3" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>Getting provider information</string>
+          <string>Getting provider information.</string>
          </property>
         </widget>
        </item>
@@ -350,10 +350,10 @@
   </widget>
   <widget class="QWizardPage" name="provider_info_page">
    <property name="title">
-    <string>Provider Information</string>
+    <string>About this provider</string>
    </property>
    <property name="subTitle">
-    <string>Description of services offered by this provider</string>
+    <string> </string>
    </property>
    <attribute name="pageId">
     <string notr="true">2</string>
@@ -495,7 +495,7 @@
     <string>Provider setup</string>
    </property>
    <property name="subTitle">
-    <string>Gathering configuration options for this provider</string>
+    <string> </string>
    </property>
    <attribute name="pageId">
     <string notr="true">3</string>
@@ -517,7 +517,7 @@
     <item>
      <widget class="QLabel" name="lblSetupProviderExpl">
       <property name="text">
-       <string>We are downloading some bits that we need to establish a secure connection with the provider for the first time.</string>
+       <string>Bitmask is attempting to establish a secure connection with this provider for the first time.</string>
       </property>
       <property name="wordWrap">
        <bool>true</bool>
@@ -590,21 +590,21 @@
        <item row="1" column="0">
         <widget class="QLabel" name="label_9">
          <property name="text">
-          <string>Getting info from the Certificate Authority</string>
+          <string>Fetching provider credentials.</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label_10">
          <property name="text">
-          <string>Do we trust this Certificate Authority?</string>
+          <string>Do we trust these credentials?</string>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
         <widget class="QLabel" name="label_11">
          <property name="text">
-          <string>Establishing a trust relationship with this provider</string>
+          <string>Connecting to provider.</string>
          </property>
         </widget>
        </item>
@@ -666,7 +666,7 @@
     <string>Register new user</string>
    </property>
    <property name="subTitle">
-    <string>Register a new user with provider</string>
+    <string> </string>
    </property>
    <attribute name="pageId">
     <string notr="true">4</string>
@@ -791,7 +791,7 @@
     <string>Service selection</string>
    </property>
    <property name="subTitle">
-    <string>Please select the services you would like to have</string>
+    <string> </string>
    </property>
    <attribute name="pageId">
     <string notr="true">5</string>
diff --git a/src/leap/bitmask/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index be5bde52..e0b4b620 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -679,7 +679,7 @@ class Wizard(QtGui.QWizard):
         the user to enable or disable.
         """
         self.ui.grpServices.setTitle(
-            self.tr("Services by {0}").format(self._provider_details['name']))
+            self.tr("Services by {0}").format(self._provider_details['domain']))
 
         services = get_supported(self._provider_details['services'])
 
@@ -723,18 +723,11 @@ class Wizard(QtGui.QWizard):
         if pageId == self.SETUP_PROVIDER_PAGE:
             if not self._provider_setup_ok:
                 self._reset_provider_setup()
-                sub_title = self.tr("Gathering configuration options for {0}")
-                sub_title = sub_title.format(self._provider_details['name'])
-                self.page(pageId).setSubTitle(sub_title)
                 self.ui.lblDownloadCaCert.setPixmap(self.QUESTION_ICON)
                 self._provider_setup_defer = self._backend.\
                     provider_bootstrap(provider=self._domain)
 
         if pageId == self.PRESENT_PROVIDER_PAGE:
-            sub_title = self.tr("Description of services offered by {0}")
-            sub_title = sub_title.format(self._provider_details['name'])
-            self.page(pageId).setSubTitle(sub_title)
-
             details = self._provider_details
             name = "<b>{0}</b>".format(details['name'])
             domain = "https://{0}".format(details['domain'])
@@ -746,9 +739,9 @@ class Wizard(QtGui.QWizard):
             self.ui.lblProviderPolicy.setText(details['enrollment_policy'])
 
         if pageId == self.REGISTER_USER_PAGE:
-            sub_title = self.tr("Register a new user with {0}")
-            sub_title = sub_title.format(self._provider_details['name'])
-            self.page(pageId).setSubTitle(sub_title)
+            title = self.tr("Register a new user with {0}")
+            title = title.format(self._provider_details['domain'])
+            self.page(pageId).setTitle(title)
             self.ui.chkRemember.setVisible(False)
 
         if pageId == self.SERVICES_PAGE: