From 93ccb5d117397ec6456a9e2f137c07581679c750 Mon Sep 17 00:00:00 2001 From: Francesco Marella Date: Mon, 7 Jun 2010 13:22:58 +0200 Subject: Rebase on trunk and add the missing bits to rsappindicator.py --- src/gtk-redshift/rsappindicator.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/gtk-redshift/rsappindicator.py') diff --git a/src/gtk-redshift/rsappindicator.py b/src/gtk-redshift/rsappindicator.py index 59fa725..15a2dee 100644 --- a/src/gtk-redshift/rsappindicator.py +++ b/src/gtk-redshift/rsappindicator.py @@ -33,6 +33,7 @@ except ImportError as ie: sys.exit(str(ie)) import defs +import utils def run(): @@ -60,6 +61,9 @@ def run(): indicator.set_icon('redshift') process.send_signal(signal.SIGUSR1) + def autostart_cb(widget, data=None): + utils.set_autostart(widget.get_active()) + def destroy_cb(widget, data=None): gtk.main_quit() return False @@ -71,6 +75,11 @@ def run(): toggle_item.connect('activate', toggle_cb) status_menu.append(toggle_item) + autostart_item = gtk.CheckMenuItem(_('Autostart')) + autostart_item.set_active(utils.get_autostart()) + autostart_item.connect('activate', autostart_cb) + status_menu.append(autostart_item) + quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT) quit_item.connect('activate', destroy_cb) status_menu.append(quit_item) -- cgit v1.2.3-70-g09d2 From c9b0abf61022d55866bba65302708dfda65a57d1 Mon Sep 17 00:00:00 2001 From: Francesco Marella Date: Tue, 22 Jun 2010 12:46:45 +0200 Subject: Disable autostart menu item when the desktop file can't be found --- src/gtk-redshift/rsappindicator.py | 12 +++++++++--- src/gtk-redshift/statusicon.py | 12 +++++++++--- src/gtk-redshift/utils.py | 4 ++-- 3 files changed, 20 insertions(+), 8 deletions(-) (limited to 'src/gtk-redshift/rsappindicator.py') diff --git a/src/gtk-redshift/rsappindicator.py b/src/gtk-redshift/rsappindicator.py index 15a2dee..23f1ac8 100644 --- a/src/gtk-redshift/rsappindicator.py +++ b/src/gtk-redshift/rsappindicator.py @@ -76,9 +76,15 @@ def run(): status_menu.append(toggle_item) autostart_item = gtk.CheckMenuItem(_('Autostart')) - autostart_item.set_active(utils.get_autostart()) - autostart_item.connect('activate', autostart_cb) - status_menu.append(autostart_item) + try: + autostart_item.set_active(utils.get_autostart()) + except IOError as strerror: + print strerror + autostart_item.set_property('sensitive', False) + else: + autostart_item.connect('activate', autostart_cb) + finally: + status_menu.append(autostart_item) quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT) quit_item.connect('activate', destroy_cb) diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py index 24f02da..8019ad4 100644 --- a/src/gtk-redshift/statusicon.py +++ b/src/gtk-redshift/statusicon.py @@ -67,9 +67,15 @@ def run(): status_menu.append(toggle_item) autostart_item = gtk.CheckMenuItem(_('Autostart')) - autostart_item.set_active(utils.get_autostart()) - autostart_item.connect('activate', autostart_cb) - status_menu.append(autostart_item) + try: + autostart_item.set_active(utils.get_autostart()) + except IOError as strerror: + print strerror + autostart_item.set_property('sensitive', False) + else: + autostart_item.connect('activate', autostart_cb) + finally: + status_menu.append(autostart_item) quit_item = gtk.ImageMenuItem(gtk.STOCK_QUIT) quit_item.connect('activate', destroy_cb) diff --git a/src/gtk-redshift/utils.py b/src/gtk-redshift/utils.py index 5c63a02..0344406 100644 --- a/src/gtk-redshift/utils.py +++ b/src/gtk-redshift/utils.py @@ -28,7 +28,7 @@ def get_autostart(): autostart_dir = base.save_config_path("autostart") autostart_file = os.path.join(autostart_dir, REDSHIFT_DESKTOP) if not os.path.exists(autostart_file): - return False + raise IOError("Installed redshift desktop file not found!") else: dfile = desktop.DesktopEntry(autostart_file) if dfile.get(AUTOSTART_KEY) == 'false': @@ -44,7 +44,7 @@ def set_autostart(active): desktop_files = list(base.load_data_paths("applications", REDSHIFT_DESKTOP)) if not desktop_files: - print "Error: Installed redshift desktop file not found!" + raise IOError("Installed redshift desktop file not found!") return desktop_file_path = desktop_files[0] # Read installed file and modify it -- cgit v1.2.3-70-g09d2