Ubuntu One Control Panel

Merge lp:~ralsina/ubuntuone-control-panel/fix-968369 into lp:ubuntuone-control-panel

  1. fix-968369
  2. Merge into trunk
Proposed by Roberto Alsina on 2012-03-29
Status: Merged
Approved by: Roberto Alsina on 2012-03-29
Approved revision: 306
Merged at revision: 304
Proposed branch: lp:~ralsina/ubuntuone-control-panel/fix-968369
Merge into: lp:ubuntuone-control-panel
Diff against target: 43 lines (+12/-2)
2 files modified
ubuntuone/controlpanel/gui/qt/main/__init__.py (+2/-1)
ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+10/-1)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-control-panel/fix-968369
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-03-29
Diego Sarmentero (community) 2012-03-29 Approve on 2012-03-29
Review via email: mp+99982@code.launchpad.net

Commit Message

 - Fixed the combination of --minimized --with-icon options (Fixes LP:968369).

Description of the Change

 - Fixed the combination of --minimized --with-icon options (Fixes LP:968369).

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Brian Curtin (brian.curtin) wrote :

+1, confirmed IRL

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
2--- ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-03-27 13:41:19 +0000
3+++ ubuntuone/controlpanel/gui/qt/main/__init__.py 2012-03-29 17:23:18 +0000
4@@ -98,7 +98,8 @@
5 icon, window = start(lambda: source.main_quit(app),
6 minimized=minimized, with_icon=with_icon,
7 installer=installer)
8- window.switch_to(switch_to)
9+ if window:
10+ window.switch_to(switch_to)
11 # pylint: enable=W0612
12 if icon:
13 app.new_instance.connect(icon.restore_window)
14
15=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
16--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py 2012-03-27 13:49:49 +0000
17+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py 2012-03-29 17:23:18 +0000
18@@ -96,8 +96,11 @@
19 self.window = None
20
21 def __call__(self, *args, **kwargs):
22+ if kwargs.get('minimized', False):
23+ self.window = None
24+ else:
25+ self.window = FakeMainWindow()
26 self.args = (args, kwargs)
27- self.window = FakeMainWindow()
28 return None, self.window
29
30
31@@ -166,6 +169,12 @@
32 self.assertEqual(self.start.args[1],
33 {'minimized': False, 'with_icon': False, 'installer': True})
34
35+ def test_minimized_with_icon_options(self):
36+ """Ensure you can be minimized and with icon at the same time."""
37+ main.main([sys.argv[0], "--minimized", "--with-icon"])
38+ self.assertEqual(self.start.args[1],
39+ {'minimized': True, 'with_icon': True, 'installer': False})
40+
41 def test_translator(self):
42 """Ensure the Qt translator is loaded."""
43 main.main([sys.argv[0]])

Subscribers

People subscribed via source and target branches