From acd206ea48610743d6078e1c9b510c8b486fb979 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Fri, 13 Mar 2015 17:07:57 -0300
Subject: [feat] make 'check' button selected by default

Also set text to 'bold' so it's easier to find at a first sight.

- Resolves: #5526
---
 changes/feature-5526_make-check-button-selected |  1 +
 src/leap/bitmask/gui/ui/wizard.ui               | 56 ++++++++++++++-----------
 src/leap/bitmask/gui/wizard.py                  |  1 +
 3 files changed, 33 insertions(+), 25 deletions(-)
 create mode 100644 changes/feature-5526_make-check-button-selected

diff --git a/changes/feature-5526_make-check-button-selected b/changes/feature-5526_make-check-button-selected
new file mode 100644
index 00000000..fa340849
--- /dev/null
+++ b/changes/feature-5526_make-check-button-selected
@@ -0,0 +1 @@
+-  make "check" button selected by default (Feature #5526)
diff --git a/src/leap/bitmask/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index 0e28ecbf..b125577e 100644
--- a/src/leap/bitmask/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
@@ -43,7 +43,7 @@
     <string>Welcome to Bitmask</string>
    </property>
    <property name="subTitle">
-    <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></string>
+       <string/>
       </property>
       <property name="textFormat">
        <enum>Qt::RichText</enum>
@@ -112,7 +112,7 @@
     <string>Choose a provider</string>
    </property>
    <property name="subTitle">
-    <string> </string>
+    <string/>
    </property>
    <attribute name="pageId">
     <string notr="true">1</string>
@@ -187,15 +187,15 @@
            <height>22</height>
           </size>
          </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
          <property name="text">
           <string/>
          </property>
          <property name="pixmap">
           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="2" column="1">
@@ -218,15 +218,15 @@
            <height>22</height>
           </size>
          </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
          <property name="text">
           <string/>
          </property>
          <property name="pixmap">
           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -249,15 +249,15 @@
            <height>22</height>
           </size>
          </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
          <property name="text">
           <string/>
          </property>
          <property name="pixmap">
           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
@@ -363,6 +363,12 @@
          </item>
          <item>
           <widget class="QPushButton" name="btnCheck">
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
            <property name="text">
             <string>Check</string>
            </property>
@@ -380,7 +386,7 @@
     <string>About this provider</string>
    </property>
    <property name="subTitle">
-    <string> </string>
+    <string/>
    </property>
    <attribute name="pageId">
     <string notr="true">2</string>
@@ -522,7 +528,7 @@
     <string>Provider setup</string>
    </property>
    <property name="subTitle">
-    <string> </string>
+    <string/>
    </property>
    <attribute name="pageId">
     <string notr="true">3</string>
@@ -590,15 +596,15 @@
            <height>22</height>
           </size>
          </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
          <property name="text">
           <string/>
          </property>
          <property name="pixmap">
           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -621,15 +627,15 @@
            <height>22</height>
           </size>
          </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
          <property name="text">
           <string/>
          </property>
          <property name="pixmap">
           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
@@ -673,15 +679,15 @@
            <height>22</height>
           </size>
          </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
          <property name="text">
           <string/>
          </property>
          <property name="pixmap">
           <pixmap resource="../../../../../data/resources/icons.qrc">:/images/black/22/question.png</pixmap>
          </property>
+         <property name="scaledContents">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="0" column="0">
@@ -720,7 +726,7 @@
     <string>Register new user</string>
    </property>
    <property name="subTitle">
-    <string> </string>
+    <string/>
    </property>
    <attribute name="pageId">
     <string notr="true">4</string>
@@ -845,7 +851,7 @@
     <string>Service selection</string>
    </property>
    <property name="subTitle">
-    <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 5da021d1..527df9b7 100644
--- a/src/leap/bitmask/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
@@ -675,6 +675,7 @@ class Wizard(QtGui.QWizard, SignalTracker):
             skip = self.ui.rbExistingProvider.isChecked()
             if not self._provider_checks_ok:
                 self._enable_check()
+                self.ui.btnCheck.setFocus()
                 self._skip_provider_checks(skip)
             else:
                 self._enable_check(reset=False)
-- 
cgit v1.2.3