Merge lp:~diegosarmentero/ubuntu-sso-client/improve-EnhancedLineEdit into lp:ubuntu-sso-client

[Diego Sarmentero]

Improves in EnhancedLineEdit

Improves in EnhancedLineEdit

[Roberto Alsina (ralsina)]

Good, simple change.

review: Approve

[Natalia Bidart (nataliabidart)]

(12:48:55 PM) nessita: gatox: teeeeessssstsssss :-)
(12:49:11 PM) nessita: gatox: we would like to cover the foillowing:
(12:49:24 PM) ***gatox reading...
(12:49:52 PM) nessita: show_button behaves in a given way (if the string is valid, X buttons is visible, Y is not, otherwise, X button is not visible, Y is)
(12:50:01 PM) nessita: or label*
(12:50:34 PM) nessita: gatox: and you may wanna assert over some of the things you're setting to self.clear_label, the most important ones
(12:50:53 PM) nessita: by important I mean those that are key pieces to the user experience
(12:50:54 PM) gatox: nessita, ok... copy that! :P
(12:51:02 PM) nessita: such as setProperty("lineEditWarning", True)
(12:51:13 PM) nessita: but the margin is not required to be tested
(12:51:15 PM) nessita: makes sense?

review: Needs Fixing

[lp:~diegosarmentero/ubuntu-sso-client/improve-EnhancedLineEdit]

761. By Diego Sarmentero on 2011-08-19

adding tests for enchaned line edit

762. By Diego Sarmentero on 2011-08-19

adding missing docstrings

763. By Diego Sarmentero on 2011-08-19

fixing pep8 issues

[Natalia Bidart (nataliabidart)]

Looks good!

Can we please use the constant for the mouse pointer instead of 0?

Thanks!

review: Approve

[lp:~diegosarmentero/ubuntu-sso-client/improve-EnhancedLineEdit]

764. By Diego Sarmentero on 2011-08-19

changing cursor value to use the proper constant instead a number.

=== modified file 'ubuntu_sso/qt/gui.py'
--- ubuntu_sso/qt/gui.py	2011-08-11 15:19:29 +0000
+++ ubuntu_sso/qt/gui.py	2011-08-19 17:15:36 +0000
@@ -17,6 +17,7 @@
 """Qt implementation of the UI."""
 
 from PyQt4.QtCore import pyqtSignal
+from PyQt4.QtCore import Qt
 from PyQt4.QtGui import (
     QApplication,
     QWidget,
@@ -24,7 +25,6 @@
     QHBoxLayout,
     QVBoxLayout,
     QPixmap,
-    QPushButton,
     QStyle,
     QWizard,
     QWizardPage,
@@ -148,14 +148,15 @@
         self._line_edit.setLayout(layout)
         self.valid_cb = valid_cb
         layout.addStretch()
-        self.clear_button = QPushButton(self._line_edit)
-        layout.addWidget(self.clear_button)
-        self.clear_button.setMinimumSize(16, 16)
-        self.clear_button.setVisible(False)
-        self.clear_button.setFlat(True)
-        self.clear_button.setCursor(QCursor(0))
-        self.clear_button.setIcon(QApplication.style().standardIcon(
-                                                QStyle.SP_MessageBoxWarning))
+        self.clear_label = QLabel(self._line_edit)
+        self.clear_label.setMargin(2)
+        self.clear_label.setProperty("lineEditWarning", True)
+        layout.addWidget(self.clear_label)
+        self.clear_label.setMinimumSize(16, 16)
+        self.clear_label.setVisible(False)
+        self.clear_label.setCursor(QCursor(Qt.ArrowCursor))
+        self.clear_label.setPixmap(QApplication.style().standardIcon(
+            QStyle.SP_MessageBoxWarning).pixmap(16, 16))
         # connect the change of text to the cation that will check if the
         # text is valid and if the icon should be shown.
         self._line_edit.textChanged.connect(self.show_button)
@@ -163,9 +164,9 @@
     def show_button(self, string):
         """Decide if we show the button or not."""
         if not self.valid_cb(string):
-            self.clear_button.setVisible(True)
+            self.clear_label.setVisible(True)
         else:
-            self.clear_button.setVisible(False)
+            self.clear_label.setVisible(False)
 
 
 class SSOWizardEnhancedEditPage(SSOWizardPage):

=== added file 'ubuntu_sso/qt/tests/test_enchanced_line_edit.py'
--- ubuntu_sso/qt/tests/test_enchanced_line_edit.py	1970-01-01 00:00:00 +0000
+++ ubuntu_sso/qt/tests/test_enchanced_line_edit.py	2011-08-19 17:15:36 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Author: Diego Sarmentero <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Test the EnhancedLineEdit."""
+
+from twisted.trial.unittest import TestCase
+
+from PyQt4 import QtGui
+from PyQt4 import QtCore
+
+from ubuntu_sso.qt.gui import EnhancedLineEdit
+
+
+class EnhancedLineEditTestCase(TestCase):
+    """Tests EnhancedLineEdit for valid and invalid states."""
+
+    def get_pixmap_data(self, pixmap):
+        """Get the raw data of a QPixmap."""
+        byte_array = QtCore.QByteArray()
+        array_buffer = QtCore.QBuffer(byte_array)
+        pixmap.save(array_buffer, "PNG")
+        return byte_array
+
+    # pylint: disable=C0103
+    def assertEqualPixmaps(self, pixmap1, pixmap2):
+        """Compare two Qt pixmaps."""
+        d1 = self.get_pixmap_data(pixmap1)
+        d2 = self.get_pixmap_data(pixmap2)
+        self.assertEqual(d1, d2)
+    # pylint: enable=C0103
+
+    def test_enhanced_line_edit_init(self):
+        """Tests the initial state of the enchanced line edit."""
+        line_edit = QtGui.QLineEdit()
+        line_edit.show()
+        enhanced = EnhancedLineEdit(line_edit)
+        self.assertEqual(type(enhanced.valid_cb), type(lambda x: False))
+        self.assertEqual(enhanced.clear_label.property("lineEditWarning"),
+            True)
+        self.assertEqual(enhanced.clear_label.isVisible(), False)
+        self.assertEqual(enhanced.clear_label.cursor().shape(),
+            QtCore.Qt.ArrowCursor)
+        self.assertEqual(enhanced.clear_label.isVisible(), False)
+        self.assertEqualPixmaps(enhanced.clear_label.pixmap(),
+            QtGui.QApplication.style().standardIcon(
+            QtGui.QStyle.SP_MessageBoxWarning).pixmap(16, 16))
+
+    def test_enhanced_line_edit_function_show_true(self):
+        """Tests the EnchancedLineEdit show method with validation = True."""
+        line_edit = QtGui.QLineEdit()
+        line_edit.show()
+        func = lambda x: False
+        enhanced = EnhancedLineEdit(line_edit, valid_cb=func)
+        line_edit.setText("testing")
+        self.assertEquals(enhanced.clear_label.isVisible(), True)
+
+    def test_enhanced_line_edit_function_show_false(self):
+        """Tests the EnchancedLineEdit show method with validation = False."""
+        line_edit = QtGui.QLineEdit()
+        line_edit.show()
+        func = lambda x: True
+        enhanced = EnhancedLineEdit(line_edit, valid_cb=func)
+        line_edit.setText("testing")
+        self.assertEquals(enhanced.clear_label.isVisible(), False)