Merge lp:~alecu/ubuntuone-control-panel/simplify-title-label into lp:ubuntuone-control-panel

[Alejandro J. Cura]

Simplify the PanelTitle; instead of a Label within an EventBox, it will just be a Label (LP: #737336).

simplify the PanelTitle; instead of a Label within an EventBox, it will just be a Label (LP: #737336)

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-03-18 21:01:49 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-03-21 15:15:53 +0000
@@ -164,7 +164,7 @@
         self.message = LabelLoading(LOADING)
         self.pack_start(self.message, expand=False)
 
-        self.connect('size-allocate', on_size_allocate, self.title.label)
+        self.connect('size-allocate', on_size_allocate, self.title)
         self.show_all()
 
     def _get_is_processing(self):
 
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-04 13:15:01 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-03-21 15:15:53 +0000
@@ -238,12 +238,12 @@
 
     def test_title_markup_is_correct(self):
         """The title markup is correctly set when passed as argument."""
-        self.assertEqual(self.ui.title.label.get_text(), self.kwargs['title'])
+        self.assertEqual(self.ui.title.get_text(), self.kwargs['title'])
 
     def test_title_is_correct(self):
         """The title markup is correctly set when defined at class level."""
         ui = self.klass()  # no title given
-        self.assertEqual(ui.title.label.get_text(), '')
+        self.assertEqual(ui.title.get_text(), '')
 
     def test_message_is_a_label_loading(self):
         """Message is the correct widget."""
 
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_widgets.py'
--- ubuntuone/controlpanel/gtk/tests/test_widgets.py	2011-02-24 12:24:20 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_widgets.py	2011-03-21 15:15:53 +0000
@@ -158,7 +158,7 @@
 
     def setUp(self):
         super(PanelTitleTestCase, self).setUp()
-        self.widget = widgets.PanelTitle(markup=self.TITLE, change_bg=True)
+        self.widget = widgets.PanelTitle(markup=self.TITLE)
 
         win = widgets.gtk.Window()
         win.add(self.widget)
@@ -167,28 +167,22 @@
     def test_visibility(self):
         """The widget and children visibility is correct."""
         self.assertTrue(self.widget.get_visible())
-        for child in self.widget.get_children():
-            self.assertTrue(child.get_visible())
-
-    def test_label_is_packed(self):
-        """The label is packed in the widget."""
-        self.assertIn(self.widget.label, self.widget.get_children())
 
     def test_label_markup(self):
         """The label markup is correct."""
-        self.assertEqual(self.widget.label.get_label(), self.TITLE)
+        self.assertEqual(self.widget.get_label(), self.TITLE)
 
     def test_label_xalign(self):
         """The label is left aligned."""
-        self.assertEqual(self.widget.label.get_property('xalign'), 0.0)
+        self.assertEqual(self.widget.get_property('xalign'), 0.0)
 
     def test_label_line_wrap(self):
         """The label is left aligned."""
-        self.assertTrue(self.widget.label.get_line_wrap())
-        self.assertEqual(self.widget.label.get_line_wrap_mode(),
+        self.assertTrue(self.widget.get_line_wrap())
+        self.assertEqual(self.widget.get_line_wrap_mode(),
                          widgets.pango.WRAP_WORD)
 
     def test_label_padding(self):
         """The label padding is correct."""
-        self.assertEqual(self.widget.label.get_padding(),
+        self.assertEqual(self.widget.get_padding(),
                          widgets.DEFAULT_PADDING)
 
=== modified file 'ubuntuone/controlpanel/gtk/widgets.py'
--- ubuntuone/controlpanel/gtk/widgets.py	2011-02-24 12:24:20 +0000
+++ ubuntuone/controlpanel/gtk/widgets.py	2011-03-21 15:15:53 +0000
@@ -103,18 +103,16 @@
         return self.label.get_label()
 
 
-class PanelTitle(gtk.EventBox):
+class PanelTitle(gtk.Label):
     """A box with a given color and text."""
 
-    def __init__(self, markup='', change_bg=False, *args, **kwargs):
+    def __init__(self, markup='', *args, **kwargs):
         super(PanelTitle, self).__init__(*args, **kwargs)
-        self.label = gtk.Label()
-        self.label.set_markup(markup)
-        self.label.set_padding(*DEFAULT_PADDING)
-        self.label.set_property('xalign', 0.0)
-        self.label.set_line_wrap(True)
-        self.label.set_line_wrap_mode(pango.WRAP_WORD)
-        self.add(self.label)
+        self.set_markup(markup)
+        self.set_padding(*DEFAULT_PADDING)
+        self.set_property('xalign', 0.0)
+        self.set_line_wrap(True)
+        self.set_line_wrap_mode(pango.WRAP_WORD)
         self.show_all()