Merge lp:~thisfred/ubuntuone-control-panel/attention-seeking into lp:ubuntuone-control-panel

[Eric Casteleijn]

Adds a command line option (--alert) to open the window with an urgency hint

Adds a command line option (--alert) to open the window with an urgency hint

[Natalia Bidart (nataliabidart)]

The --alert option should be a boolean option. Right now, I can't use it without an explicit argument:

ubuntuone-control-panel-gtk: error: --alert option requires an argument
nessita@dali:~/canonical/u1/cp/review_attention-seeking$ DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-gtk --alert
Usage: ubuntuone-control-panel-gtk [option]

ubuntuone-control-panel-gtk: error: --alert option requires an argument

Can you please fix that?

review: Needs Fixing

[Eric Casteleijn (thisfred)]

Fixed in r98

[Natalia Bidart (nataliabidart)]

Here we go!

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/ubuntuone-control-panel/attention-seeking into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel/tests
Xlib: extension "RANDR" missing on display ":99".
ubuntuone.controlpanel.tests.test_backend
  BackendAccountTestCase
    test_account_info ... [OK]
    test_account_info_fails ... [OK]
    test_account_info_with_current_plan ... [OK]
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
  BackendBasicTestCase
    test_backend_creation ... [OK]
    test_device_is_local ... [OK]
    test_get_token ... [OK]
  BackendDevicesTestCase
    test_backend_creation ... [OK]
    test_change_download_speed_limit ... [OK]
    test_change_limit_bandwidth ... [OK]
    test_change_show_all_notifications ... [OK]
    test_change_upload_speed_limit ... [OK]
    test_changing_settings_for_wrong_id_has_no_effect ... [OK]
    test_device_is_local ... [OK]
    test_devices_info ... [OK]
    test_devices_info_fails ... [OK]
    test_get_token ... [OK]
    test_remove_device ... [OK]
    test_remove_device_clear_credentials_if_local_device ... [OK]
    test_remove_device_fails ... [OK]
  BackendFileSyncOpsTestCase
    test_backend_creation ... [OK]
    test_connect_files ... [OK]
    test_device_is_local ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_get_token ... [OK]
    test_restart_files ... [OK]
    test_start_files ... [OK]
    test_stop_files ... [OK]
  BackendReplicationsTestCase
    test_backend_creation ... [OK]
    test_change_replication_settings ... [OK]
    test_change_replication_settings_no_set...

[lp:~thisfred/ubuntuone-control-panel/attention-seeking]

99. By Eric Casteleijn on 2011-03-07

no XXX allowed

=== modified file 'bin/ubuntuone-control-panel-gtk'
--- bin/ubuntuone-control-panel-gtk	2011-01-21 17:46:49 +0000
+++ bin/ubuntuone-control-panel-gtk	2011-03-07 19:53:08 +0000
@@ -40,12 +40,14 @@
                       help="Start the Ubuntu One Control Panel (GTK) in the "
                            "PANEL_NAME tab. Possible values are: "
                            "dashboard, volumes, devices, applications")
+    result.add_option("-a", "--alert", dest="alert", action="store_true",
+                      help="Start the Ubuntu One Control Panel (GTK) alerting "
+                      "the user to its presence.")
     return result
 
 
 if __name__ == "__main__":
     parser = parser_options()
     (options, args) = parser.parse_args(sys.argv)
-
-    gui = ControlPanelWindow(switch_to=options.switch_to)
+    gui = ControlPanelWindow(switch_to=options.switch_to, alert=options.alert)
     gui.main()
 
=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-03-04 13:47:35 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-03-07 19:53:08 +0000
@@ -1495,7 +1495,7 @@
 
     TITLE = _('%(app_name)s Control Panel')
 
-    def __init__(self, switch_to=None):
+    def __init__(self, switch_to=None, alert=False):
         super(ControlPanelWindow, self).__init__()
 
         self.set_title(self.TITLE % {'app_name': U1_APP_NAME})
@@ -1504,7 +1504,13 @@
         self.set_size_request(-1, 525)  # bug #683164
 
         self.connect('delete-event', lambda w, e: gtk.main_quit())
-        self.show()
+        if alert:
+            print "YES"
+            # NOTE this should prevent focus stealing but it does not :(
+            self.present_with_time(1)
+            self.set_urgency_hint(True)
+        else:
+            self.present()
 
         self.control_panel = ControlPanel(main_window=self)
         self.add(self.control_panel)