1
=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
2
--- ubuntuone/controlpanel/gtk/gui.py	2011-04-07 13:58:58 +0000
3
+++ ubuntuone/controlpanel/gtk/gui.py	2011-04-07 19:01:35 +0000
4
@@ -60,6 +60,13 @@
5
60
60
6
61
from ubuntuone.controlpanel.gtk import package_manager, TRANSLATION_DOMAIN
61
from ubuntuone.controlpanel.gtk import package_manager, TRANSLATION_DOMAIN
7
62
62
8
63
try:
9
64
    from gi.repository import Unity     # pylint: disable=E0611
10
65
    USE_LIBUNITY = True
11
66
    U1_DOTDESKTOP = "ubuntuone-control-panel-gtk.desktop"
12
67
except ImportError:
13
68
    USE_LIBUNITY = False
14
69
15
63
logger = setup_logging('gtk.gui')
70
logger = setup_logging('gtk.gui')
16
64
_ = gettext.gettext
71
_ = gettext.gettext
17
65
72
18
@@ -1686,6 +1693,8 @@
19
1686
1693
20
1687
    def __init__(self, switch_to='', alert=False):
1694
    def __init__(self, switch_to='', alert=False):
21
1688
        super(ControlPanelWindow, self).__init__()
1695
        super(ControlPanelWindow, self).__init__()
22
1696
23
1697
        self.connect('focus-in-event', self.remove_urgency)
24
1689
        self.set_title(self.TITLE % {'app_name': U1_APP_NAME})
1698
        self.set_title(self.TITLE % {'app_name': U1_APP_NAME})
25
1690
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
1699
        self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
26
1691
        self.set_icon_name('ubuntuone')
1700
        self.set_icon_name('ubuntuone')
27
@@ -1708,6 +1717,15 @@
28
1708
        logger.debug('%s: started (window size %r).',
1717
        logger.debug('%s: started (window size %r).',
29
1709
                     self.__class__.__name__, self.get_size_request())
1718
                     self.__class__.__name__, self.get_size_request())
30
1710
1719
31
1720
    def remove_urgency(self, *args, **kwargs):
32
1721
        """Remove urgency from the launcher entry."""
33
1722
        if not USE_LIBUNITY:
34
1723
            return
35
1724
        entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
36
1725
        if entry.props.urgent:
37
1726
            self.switch_to('volumes')
38
1727
            entry.props.urgent = False
39
1728
40
1711
    def draw_attention(self):
1729
    def draw_attention(self):
41
1712
        """Draw attention to the control panel."""
1730
        """Draw attention to the control panel."""
42
1713
        self.present_with_time(1)
1731
        self.present_with_time(1)
43
1714
1732
44
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
45
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-06 21:05:37 +0000
46
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-07 19:01:35 +0000
47
@@ -29,6 +29,28 @@
48
29
# pylint: disable=W0201, W0212
29
# pylint: disable=W0201, W0212
49
30
30
50
31
31
51
32
class FakeLauncherEntryProps(object):
52
33
    """A fake Unity.LauncherEntry.props"""
53
34
54
35
    urgent = True
55
36
56
37
57
38
THE_FLEP = FakeLauncherEntryProps()
58
39
59
40
60
41
class FakeLauncherEntry(object):
61
42
    """A fake Unity.LauncherEntry"""
62
43
63
44
    def __init__(self):
64
45
        """Initialize this fake instance."""
65
46
        self.props = THE_FLEP
66
47
67
48
    @staticmethod
68
49
    def get_for_desktop_id(dotdesktop):
69
50
        """Find the LauncherEntry for a given dotdesktop."""
70
51
        return FakeLauncherEntry()
71
52
72
53
73
32
class FakeControlPanelService(object):
54
class FakeControlPanelService(object):
74
33
    """Fake service."""
55
    """Fake service."""
75
34
    def __init__(self, window):
56
    def __init__(self, window):
76
@@ -116,6 +138,15 @@
77
116
        """Max size is not bigger than 736x525 (LP: #645526, LP: #683164)."""
138
        """Max size is not bigger than 736x525 (LP: #645526, LP: #683164)."""
78
117
        self.assertTrue(self.ui.get_size_request() <= (736, 525))
139
        self.assertTrue(self.ui.get_size_request() <= (736, 525))
79
118
140
80
141
    def test_focus_handler(self):
81
142
        """When the window receives focus, the handler is called."""
82
143
        THE_FLEP.urgent = True
83
144
        self.patch(gui.Unity, "LauncherEntry", FakeLauncherEntry)
84
145
        cp = gui.ControlPanelWindow()
85
146
        cp.emit('focus-in-event', None)
86
147
        self.assertEqual(
87
148
            False, THE_FLEP.urgent, 'remove_urgency should have been called.')
88
149
89
119
150
90
120
class ControlPanelWindowAlertParamTestCase(BaseTestCase):
151
class ControlPanelWindowAlertParamTestCase(BaseTestCase):
91
121
    """The test suite for the control panel window when passing params."""
152
    """The test suite for the control panel window when passing params."""
92
@@ -131,7 +162,7 @@
93
131
    def test_alert(self):
162
    def test_alert(self):
94
132
        """Can pass a 'alert' parameter to draw attention to the window."""
163
        """Can pass a 'alert' parameter to draw attention to the window."""
95
133
        self.assertEqual(
164
        self.assertEqual(
97
134
            self._called, ((), {}), 'draw_attention was not called.')
165
            ((), {}), self._called, 'draw_attention should have been called.')
98
135
166
99
136
167
100
137
class ControlPanelWindowParamsTestCase(ControlPanelWindowTestCase):
168
class ControlPanelWindowParamsTestCase(ControlPanelWindowTestCase):
Reviewer	Date Requested	Status
Alejandro J. Cura (community)		Approve on 2011-04-05
Roberto Alsina (community)	2011-04-04	Approve on 2011-04-04
Review via email: mp+56250@code.launchpad.net