From 07ec131ba713ebf5e49a9c57a3d2cda9cd9489ad Mon Sep 17 00:00:00 2001 From: Francesco Marella Date: Sun, 6 Jun 2010 21:00:03 +0200 Subject: Add a feature to toggle autostart at login A launcher is placed in Applications -> Utility. The user toggles autostart through the user interface. The 'xdg' module is required. --- src/gtk-redshift/Makefile.am | 8 +++++ src/gtk-redshift/gtk-redshift.desktop | 11 +++++++ src/gtk-redshift/statusicon.py | 9 ++++++ src/gtk-redshift/utils.py | 57 +++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100755 src/gtk-redshift/gtk-redshift.desktop create mode 100644 src/gtk-redshift/utils.py (limited to 'src') diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am index ddeafd6..28d5719 100644 --- a/src/gtk-redshift/Makefile.am +++ b/src/gtk-redshift/Makefile.am @@ -3,6 +3,7 @@ if ENABLE_STATUSICON gui_module=statusicon gtk_redshift_PYTHON = \ __init__.py \ + utils.py \ statusicon.py nodist_gtk_redshift_PYTHON = \ defs.py @@ -15,6 +16,7 @@ if ENABLE_APPINDICATOR gui_module=rsappindicator gtk_redshift_PYTHON = \ __init__.py \ + utils.py \ rsappindicator.py nodist_gtk_redshift_PYTHON = \ defs.py @@ -23,6 +25,12 @@ gtk_redshiftdir = $(pythondir)/gtk_redshift bin_SCRIPTS = gtk-redshift endif +if ENABLE_APPINDICATOR || ENABLE_STATUSICON +# Desktop file +desktopdir = ${datadir}/applications +desktop_DATA = gtk-redshift.desktop +endif + EXTRA_DIST = gtk-redshift.in \ defs.py.in diff --git a/src/gtk-redshift/gtk-redshift.desktop b/src/gtk-redshift/gtk-redshift.desktop new file mode 100755 index 0000000..850255c --- /dev/null +++ b/src/gtk-redshift/gtk-redshift.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=Redshift +GenericName=Color temperature adjustment +Comment=Color temperature adjustment tool +Exec=gtk-redshift +Icon=redshift +Terminal=false +Type=Application +Categories=Utility; +StartupNotify=true diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py index 2295963..24f02da 100644 --- a/src/gtk-redshift/statusicon.py +++ b/src/gtk-redshift/statusicon.py @@ -28,6 +28,7 @@ pygtk.require("2.0") import gtk, glib import defs +import utils def run(): @@ -50,6 +51,9 @@ def run(): def toggle_cb(widget, data=None): process.send_signal(signal.SIGUSR1) + def autostart_cb(widget, data=None): + utils.set_autostart(widget.get_active()) + def destroy_cb(widget, data=None): status_icon.set_visible(False) gtk.main_quit() @@ -62,6 +66,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) diff --git a/src/gtk-redshift/utils.py b/src/gtk-redshift/utils.py new file mode 100644 index 0000000..5c63a02 --- /dev/null +++ b/src/gtk-redshift/utils.py @@ -0,0 +1,57 @@ +# utils.py -- utility functions source +# This file is part of Redshift. + +# Redshift is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# Redshift is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with Redshift. If not, see . + +# Copyright (c) 2010 Francesco Marella + +import os +from xdg import BaseDirectory as base +from xdg import DesktopEntry as desktop + +REDSHIFT_DESKTOP = 'gtk-redshift.desktop' + + +def get_autostart(): + AUTOSTART_KEY = "X-GNOME-Autostart-enabled" + 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 + else: + dfile = desktop.DesktopEntry(autostart_file) + if dfile.get(AUTOSTART_KEY) == 'false': + return False + else: + return True + +def set_autostart(active): + AUTOSTART_KEY = "X-GNOME-Autostart-enabled" + autostart_dir = base.save_config_path("autostart") + autostart_file = os.path.join(autostart_dir, REDSHIFT_DESKTOP) + if not os.path.exists(autostart_file): + desktop_files = list(base.load_data_paths("applications", + REDSHIFT_DESKTOP)) + if not desktop_files: + print "Error: Installed redshift desktop file not found!" + return + desktop_file_path = desktop_files[0] + # Read installed file and modify it + dfile = desktop.DesktopEntry(desktop_file_path) + else: + dfile = desktop.DesktopEntry(autostart_file) + activestr = str(bool(active)).lower() + # print "Setting autostart to %s" % activestr + dfile.set(AUTOSTART_KEY, activestr) + dfile.write(filename=autostart_file) -- cgit v1.2.3-70-g09d2 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/Makefile.am | 6 ++++-- src/gtk-redshift/rsappindicator.py | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am index 28d5719..42647f7 100644 --- a/src/gtk-redshift/Makefile.am +++ b/src/gtk-redshift/Makefile.am @@ -10,6 +10,10 @@ nodist_gtk_redshift_PYTHON = \ gtk_redshiftdir = $(pythondir)/gtk_redshift bin_SCRIPTS = gtk-redshift + +# Desktop file +desktopdir = ${datadir}/applications +desktop_DATA = gtk-redshift.desktop endif if ENABLE_APPINDICATOR @@ -23,9 +27,7 @@ nodist_gtk_redshift_PYTHON = \ gtk_redshiftdir = $(pythondir)/gtk_redshift bin_SCRIPTS = gtk-redshift -endif -if ENABLE_APPINDICATOR || ENABLE_STATUSICON # Desktop file desktopdir = ${datadir}/applications desktop_DATA = gtk-redshift.desktop 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') 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 From 846284943baabadc4dc539894cacb00bf1f96169 Mon Sep 17 00:00:00 2001 From: Francesco Marella Date: Tue, 22 Jun 2010 16:14:39 +0200 Subject: utils.py: copy the desktop file in autostart folder --- src/gtk-redshift/utils.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/gtk-redshift/utils.py b/src/gtk-redshift/utils.py index 0344406..93e0195 100644 --- a/src/gtk-redshift/utils.py +++ b/src/gtk-redshift/utils.py @@ -28,7 +28,16 @@ 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): - raise IOError("Installed redshift desktop file not found!") + desktop_files = list(base.load_data_paths("applications", + REDSHIFT_DESKTOP)) + if not desktop_files: + raise IOError("Installed redshift desktop file not found!") + desktop_file_path = desktop_files[0] + # Read installed file and modify it + dfile = desktop.DesktopEntry(desktop_file_path) + dfile.set(AUTOSTART_KEY, "false") + dfile.write(filename=autostart_file) + return False else: dfile = desktop.DesktopEntry(autostart_file) if dfile.get(AUTOSTART_KEY) == 'false': -- cgit v1.2.3-70-g09d2