Merge lp:~diegosarmentero/ubuntu-sso-client/check-cut-off into lp:ubuntu-sso-client

[Diego Sarmentero]

- Removing the align property from the label that wasn't necessary and was breakint the work wrap.
Also adjust the height of the widget depending if it has more than one line (LP: #940392).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

== Python Lint Notices ==

ubuntu_sso/qt/tests/test_enhanced_check_box.py:
    48: [C0103, EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_small_height] Invalid name "w" (should match [a-z_][a-z0-9_]{1,30}$)
    51: [E1101, EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_small_height] Instance of 'EnhancedCheckBoxTestCase' has no 'assertGreater' member
    57: [C0103, EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_big_height] Invalid name "w" (should match [a-z_][a-z0-9_]{1,30}$)
    60: [E1101, EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_big_height] Instance of 'EnhancedCheckBoxTestCase' has no 'assertLess' member

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

> == Python Lint Notices ==
>
> ubuntu_sso/qt/tests/test_enhanced_check_box.py:
> 48: [C0103,
> EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_small_height]
> Invalid name "w" (should match [a-z_][a-z0-9_]{1,30}$)
> 51: [E1101,
> EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_small_height]
> Instance of 'EnhancedCheckBoxTestCase' has no 'assertGreater' member
> 57: [C0103,
> EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_big_height]
> Invalid name "w" (should match [a-z_][a-z0-9_]{1,30}$)
> 60: [E1101,
> EnhancedCheckBoxTestCase.test_enhanced_check_size_adjust_with_big_height]
> Instance of 'EnhancedCheckBoxTestCase' has no 'assertLess' member

fixed

[lp:~diegosarmentero/ubuntu-sso-client/check-cut-off]

904. By Diego Sarmentero on 2012-03-13

Fixed lint issues.

905. By Diego Sarmentero on 2012-03-13

Change assertGreater* to assertTrue

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

=== modified file 'ubuntu_sso/qt/enhanced_check_box.py'
--- ubuntu_sso/qt/enhanced_check_box.py	2012-03-01 16:53:29 +0000
+++ ubuntu_sso/qt/enhanced_check_box.py	2012-03-13 19:55:36 +0000
@@ -24,11 +24,12 @@
 class EnhancedCheckBox(QtGui.QCheckBox):
     """Enhanced QCheckBox to support links in the message displayed."""
 
-    def __init__(self, text=""):
-        QtGui.QCheckBox.__init__(self)
+    def __init__(self, text="", parent=None):
+        QtGui.QCheckBox.__init__(self, parent)
         hbox = QtGui.QHBoxLayout()
+        hbox.setAlignment(QtCore.Qt.AlignLeft)
         self.text_label = QtGui.QLabel(text)
-        self.text_label.setAlignment(QtCore.Qt.AlignTop)
+        self.text_label.setWordWrap(True)
         self.text_label.setOpenExternalLinks(True)
         padding = self.iconSize().width()
         self.text_label.setStyleSheet("margin-top: -3px;"
@@ -37,6 +38,11 @@
         hbox.addWidget(self.text_label)
         self.setLayout(hbox)
 
+        if parent is not None:
+            lines = self.text_label.width() / float(parent.width())
+            self.text_label.setMinimumWidth(parent.width())
+            self.setMinimumHeight(self.height() * lines)
+
         self.stateChanged.connect(self.text_label.setFocus)
 
     def text(self):

=== modified file 'ubuntu_sso/qt/setup_account_page.py'
--- ubuntu_sso/qt/setup_account_page.py	2012-03-12 14:53:00 +0000
+++ ubuntu_sso/qt/setup_account_page.py	2012-03-13 19:55:36 +0000
@@ -195,7 +195,7 @@
             terms = AGREE_TO_PRIVACY_POLICY.format(app_name=self.app_name,
                         privacy_policy=privacy_policy_link)
 
-        self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms)
+        self.terms_checkbox = enhanced_check_box.EnhancedCheckBox(terms, self)
         self.ui.hlayout_check.addWidget(self.terms_checkbox)
         self.terms_checkbox.setVisible(bool(self.tc_url or self.policy_url))
 

=== modified file 'ubuntu_sso/qt/tests/test_enhanced_check_box.py'
--- ubuntu_sso/qt/tests/test_enhanced_check_box.py	2012-02-16 18:40:41 +0000
+++ ubuntu_sso/qt/tests/test_enhanced_check_box.py	2012-03-13 19:55:36 +0000
@@ -16,7 +16,7 @@
 
 """Tests for the EnhancedCheckBox widget."""
 
-from PyQt4 import QtCore
+from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso.qt import enhanced_check_box
 from ubuntu_sso.qt.tests import BaseTestCase
@@ -40,3 +40,21 @@
         check.setText("text")
         self.assertEqual(check.text(), "text")
         self.assertEqual(check.text(), check.text_label.text())
+
+    def test_enhanced_check_size_adjust_with_small_height(self):
+        """Check if the size of the EnhancedCheckBox is adjusted correctly."""
+        text = 't' * 200
+        height = 10
+        widget = QtGui.QWidget()
+        widget.setFixedSize(200, height)
+        check = enhanced_check_box.EnhancedCheckBox(text, widget)
+        self.assertTrue(check.height() > height)
+
+    def test_enhanced_check_size_adjust_with_big_height(self):
+        """Check if the size of the EnhancedCheckBox is adjusted correctly."""
+        text = 't' * 20
+        height = 200
+        widget = QtGui.QWidget()
+        widget.setFixedSize(200, height)
+        check = enhanced_check_box.EnhancedCheckBox(text, widget)
+        self.assertTrue(check.height() < height)

=== modified file 'ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-09 18:36:07 +0000
+++ ubuntu_sso/qt/tests/test_ubuntu_sso_wizard.py	2012-03-13 19:55:36 +0000
@@ -115,10 +115,8 @@
         self.ui.show()
         self.addCleanup(self.ui.hide)
         size = self.ui.size()
-        # pylint: disable=E1101
-        self.assertGreaterEqual(size.height(), PREFERED_UI_SIZE['height'])
-        self.assertGreaterEqual(size.width(), PREFERED_UI_SIZE['width'])
-        # pylint: enable=E1101
+        self.assertTrue(size.height() >= PREFERED_UI_SIZE['height'])
+        self.assertTrue(size.width() >= PREFERED_UI_SIZE['width'])
 
     def test_move_to_success_page_state(self):
         """Test _move_to_success_page method."""