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