aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac50
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/cs.po6
-rw-r--r--po/da.po6
-rw-r--r--po/de.po6
-rw-r--r--po/es.po6
-rw-r--r--po/fi.po6
-rw-r--r--po/it.po6
-rw-r--r--po/pt_BR.po6
-rw-r--r--po/redshift.pot6
-rw-r--r--po/ru.po6
-rw-r--r--src/gtk-redshift/Makefile.am29
-rw-r--r--src/gtk-redshift/gtk-redshift (renamed from src/gtk-redshift/gtk-redshift.in)2
-rw-r--r--src/gtk-redshift/rsappindicator.py114
-rw-r--r--src/gtk-redshift/statusicon.py63
15 files changed, 91 insertions, 222 deletions
diff --git a/configure.ac b/configure.ac
index 15f67d1..54450b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,49 +131,25 @@ AS_IF([test "x$enable_gnome_clock" != xno], [
])
AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" = xyes])
-
-# Check for GUI
-# There doesn't seem to be an easy way of detecting the presence
-# of a python module. For that reason, statusicon is the default GUI.
-AC_MSG_CHECKING([which GUI to enable])
+# Check for GUI status icon
+AC_MSG_CHECKING([whether to enable GUI status icon])
AC_ARG_ENABLE([gui], [AC_HELP_STRING([--enable-gui],
- [enable GUI (appindicator, statusicon or none)])],
+ [enable GUI status icon])],
[enable_gui=$enableval],[enable_gui=maybe])
-
-# Statusicon GUI
-AS_IF([test "x$enable_gui" = xstatusicon -o "x$enable_gui" = xmaybe], [
- AS_IF([test "x$have_python" != xyes], [
- AS_IF([test "x$enable_gui" = xstatusicon], [
- AC_MSG_ERROR([status icon script requires Python 2.6])
- ])
- enable_gui=maybe
+AS_IF([test "x$enable_gui" != xno], [
+ AS_IF([test $have_python = yes], [
+ AC_MSG_RESULT([yes])
], [
- enable_gui=statusicon
- ])
-])
-
-# Appindicator GUI
-AS_IF([test "x$enable_gui" = xappindicator -o "x$enable_gui" = xmaybe], [
- AS_IF([test "x$have_python" != xyes], [
- AS_IF([test "x$enable_gui" = xappindicator], [
- AC_MSG_ERROR([application indicator script requires Python 2.6])
+ AC_MSG_RESULT([missing dependencies])
+ AS_IF([test "x$enable_gui" = xyes], [
+ AC_MSG_ERROR([GUI status icon script requires Python 2.6])
])
- enable_gui=maybe
- ], [
- enable_gui=appindicator
+ enable_gui=no
])
+], [
+ AC_MSG_RESULT([no])
])
-
-# Fall back to no GUI
-AS_IF([test "x$enable_gui" != xappindicator -a "x$enable_gui" != xstatusicon], [
- enable_gui=none
-])
-
-AC_MSG_RESULT([$enable_gui])
-
-AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xnone])
-AM_CONDITIONAL([ENABLE_STATUSICON], [test "x$enable_gui" = xstatusicon])
-AM_CONDITIONAL([ENABLE_APPINDICATOR], [test "x$enable_gui" = xappindicator])
+AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xno])
# Checks for header files.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6bd7210..a46a9d4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,4 +10,3 @@ src/location-gnome-clock.c
src/location-manual.c
src/gtk-redshift/statusicon.py
-src/gtk-redshift/rsappindicator.py
diff --git a/po/cs.po b/po/cs.po
index fccf662..73599d8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: clever_fox <clever_fox@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -414,10 +414,10 @@ msgstr "Nevhodný argument.\n"
msgid "Too many arguments.\n"
msgstr "Příliš mnoho argumentů.\n"
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Přepnout"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/da.po b/po/da.po
index 397f636..1beae36 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -429,11 +429,11 @@ msgstr "Fejl i parameteren.\n"
msgid "Too many arguments.\n"
msgstr "For mange parametre.\n"
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Slå til/fra"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 210cb7f..0d35609 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: Jan-Christoph Borchardt <inquata@gmail.com>\n"
"Language-Team: German <de@li.org>\n"
@@ -426,10 +426,10 @@ msgstr "Fehlerhaftes Kommando.\n"
msgid "Too many arguments.\n"
msgstr "Zu viele Kommandos.\n"
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Umschalten"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 011ecf4..7528f40 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-14 17:15+0000\n"
"Last-Translator: Fernando Ossandon <ferossan@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -431,10 +431,10 @@ msgstr "Parámetro no válido.\n"
msgid "Too many arguments.\n"
msgstr "Demasiados parámetros.\n"
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Cambiar"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 8c6bd58..41b5e6b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: Ilari Oras <happo1472583@gmail.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -411,10 +411,10 @@ msgstr ""
msgid "Too many arguments.\n"
msgstr ""
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Kytke"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 374ebde..d70e78f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: Andrea Amoroso <andrea.amoroso@alice.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -432,10 +432,10 @@ msgstr "Argomento malformato.\n"
msgid "Too many arguments.\n"
msgstr "Troppi argomenti.\n"
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Verifica"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0c56800..84dee7e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-13 20:24+0000\n"
"Last-Translator: Jon Lund Steffensen <Unknown>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -403,10 +403,10 @@ msgstr ""
msgid "Too many arguments.\n"
msgstr ""
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr ""
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/redshift.pot b/po/redshift.pot
index e0f1918..4b2e294 100644
--- a/po/redshift.pot
+++ b/po/redshift.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift 1.4.1\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -402,10 +402,10 @@ msgstr ""
msgid "Too many arguments.\n"
msgstr ""
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr ""
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 029998c..f708084 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: redshift\n"
"Report-Msgid-Bugs-To: https://bugs.launchpad.net/redshift\n"
-"POT-Creation-Date: 2010-06-30 20:28+0200\n"
+"POT-Creation-Date: 2010-07-28 00:45+0200\n"
"PO-Revision-Date: 2010-06-14 11:22+0000\n"
"Last-Translator: Чистый <klaider@yandex.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -420,11 +420,11 @@ msgstr ""
msgid "Too many arguments.\n"
msgstr "Слишком много аргументов.\n"
-#: src/gtk-redshift/statusicon.py:69 src/gtk-redshift/rsappindicator.py:74
+#: src/gtk-redshift/statusicon.py:92
msgid "Toggle"
msgstr "Включить / Выключить"
-#: src/gtk-redshift/statusicon.py:73 src/gtk-redshift/rsappindicator.py:78
+#: src/gtk-redshift/statusicon.py:96
msgid "Autostart"
msgstr ""
diff --git a/src/gtk-redshift/Makefile.am b/src/gtk-redshift/Makefile.am
index 5896f1b..bb69459 100644
--- a/src/gtk-redshift/Makefile.am
+++ b/src/gtk-redshift/Makefile.am
@@ -1,6 +1,5 @@
-if ENABLE_STATUSICON
-gui_module=statusicon
+if ENABLE_GUI
gtk_redshift_PYTHON = \
__init__.py \
utils.py \
@@ -9,32 +8,12 @@ nodist_gtk_redshift_PYTHON = \
defs.py
gtk_redshiftdir = $(pythondir)/gtk_redshift
-bin_SCRIPTS = gtk-redshift
+dist_bin_SCRIPTS = gtk-redshift
endif
-if ENABLE_APPINDICATOR
-gui_module=rsappindicator
-gtk_redshift_PYTHON = \
- __init__.py \
- utils.py \
- rsappindicator.py
-nodist_gtk_redshift_PYTHON = \
- defs.py
-gtk_redshiftdir = $(pythondir)/gtk_redshift
-
-bin_SCRIPTS = gtk-redshift
-endif
-
-EXTRA_DIST = gtk-redshift.in \
- defs.py.in
-
-CLEANFILES = defs.py \
- gtk-redshift
-
+EXTRA_DIST = defs.py.in
+CLEANFILES = defs.py
-# Main GUI script
-gtk-redshift: gtk-redshift.in
- sed -e "s|\@gui_module\@|$(gui_module)|g" $< > $@
# Local python definitions
defs.py: defs.py.in
diff --git a/src/gtk-redshift/gtk-redshift.in b/src/gtk-redshift/gtk-redshift
index 120e05c..56d940e 100644
--- a/src/gtk-redshift/gtk-redshift.in
+++ b/src/gtk-redshift/gtk-redshift
@@ -19,5 +19,5 @@
if __name__ == '__main__':
- from gtk_redshift.@gui_module@ import run
+ from gtk_redshift.statusicon import run
run()
diff --git a/src/gtk-redshift/rsappindicator.py b/src/gtk-redshift/rsappindicator.py
deleted file mode 100644
index 23f1ac8..0000000
--- a/src/gtk-redshift/rsappindicator.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env python
-# rsappindicator.py -- Application Panel Indicator 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 <http://www.gnu.org/licenses/>.
-
-# Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com>
-
-
-import sys, os
-import subprocess, signal
-import gettext
-
-import pygtk
-pygtk.require("2.0")
-
-import gtk, glib
-try:
- import appindicator
-except ImportError as ie:
- # No module named appindicator
- sys.exit(str(ie))
-
-import defs
-import utils
-
-
-def run():
- # Internationalisation
- gettext.bindtextdomain('redshift', defs.LOCALEDIR)
- gettext.textdomain('redshift')
- _ = gettext.gettext
-
- # Start redshift with arguments from the command line
- args = sys.argv[1:]
- args.insert(0, os.path.join(defs.BINDIR, 'redshift'))
- process = subprocess.Popen(args)
-
- try:
- # Create status icon
- indicator = appindicator.Indicator ("redshift",
- "redshift",
- appindicator.CATEGORY_APPLICATION_STATUS)
- indicator.set_status (appindicator.STATUS_ACTIVE)
-
- def toggle_cb(widget, data=None):
- if indicator.get_icon() == 'redshift':
- indicator.set_icon('redshift-idle')
- else:
- 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
-
- # Create popup menu
- status_menu = gtk.Menu()
-
- toggle_item = gtk.ImageMenuItem(_('Toggle'))
- toggle_item.connect('activate', toggle_cb)
- status_menu.append(toggle_item)
-
- autostart_item = gtk.CheckMenuItem(_('Autostart'))
- 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)
- status_menu.append(quit_item)
-
- status_menu.show_all()
-
- # Set the menu
- indicator.set_menu(status_menu)
-
- def child_cb(pid, cond, data=None):
- sys.exit(-1)
-
- # Add watch on child process
- glib.child_watch_add(process.pid, child_cb)
-
- # Run main loop
- gtk.main()
-
- except KeyboardInterrupt:
- # Ignore user interruption
- pass
-
- finally:
- # Always terminate redshift
- process.terminate()
- process.wait()
diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py
index 82b5cd6..859a1b9 100644
--- a/src/gtk-redshift/statusicon.py
+++ b/src/gtk-redshift/statusicon.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# statusicon.py -- GTK+ status icon source
+# statusicon.py -- GUI status icon source
# This file is part of Redshift.
# Redshift is free software: you can redistribute it and/or modify
@@ -18,6 +18,12 @@
# Copyright (c) 2010 Jon Lund Steffensen <jonlst@gmail.com>
+'''GUI status icon for Redshift.
+
+The run method will try to start an appindicator for Redshift. If the
+appindicator module isn't present it will fall back to a GTK status icon.
+'''
+
import sys, os
import subprocess, signal
import gettext
@@ -26,6 +32,10 @@ import pygtk
pygtk.require("2.0")
import gtk, glib
+try:
+ import appindicator
+except ImportError:
+ appindicator = None
import defs
import utils
@@ -43,23 +53,36 @@ def run():
process = subprocess.Popen(args)
try:
- # Create status icon
- status_icon = gtk.StatusIcon()
- status_icon.set_from_icon_name('redshift')
- status_icon.set_tooltip('Redshift')
+ if appindicator:
+ # Create indicator
+ indicator = appindicator.Indicator('redshift', 'redshift',
+ appindicator.CATEGORY_APPLICATION_STATUS)
+ indicator.set_status(appindicator.STATUS_ACTIVE)
+ else:
+ # Create status icon
+ status_icon = gtk.StatusIcon()
+ status_icon.set_from_icon_name('redshift')
+ status_icon.set_tooltip('Redshift')
def toggle_cb(widget, data=None):
process.send_signal(signal.SIGUSR1)
- if status_icon.get_icon_name() == 'redshift':
- status_icon.set_from_icon_name('redshift-idle')
- else:
- status_icon.set_from_icon_name('redshift')
+ if appindicator:
+ if indicator.get_icon() == 'redshift':
+ indicator.set_icon('redshift-idle')
+ else:
+ indicator.set_icon('redshift')
+ else:
+ if status_icon.get_icon_name() == 'redshift':
+ status_icon.set_from_icon_name('redshift-idle')
+ else:
+ status_icon.set_from_icon_name('redshift')
def autostart_cb(widget, data=None):
utils.set_autostart(widget.get_active())
def destroy_cb(widget, data=None):
- status_icon.set_visible(False)
+ if not appindicator:
+ status_icon.set_visible(False)
gtk.main_quit()
return False
@@ -85,15 +108,21 @@ def run():
quit_item.connect('activate', destroy_cb)
status_menu.append(quit_item)
- def popup_menu_cb(widget, button, time, data=None):
+ if appindicator:
status_menu.show_all()
- status_menu.popup(None, None, gtk.status_icon_position_menu,
- button, time, status_icon)
- # Connect signals for status icon and show
- status_icon.connect('activate', toggle_cb)
- status_icon.connect('popup-menu', popup_menu_cb)
- status_icon.set_visible(True)
+ # Set the menu
+ indicator.set_menu(status_menu)
+ else:
+ def popup_menu_cb(widget, button, time, data=None):
+ status_menu.show_all()
+ status_menu.popup(None, None, gtk.status_icon_position_menu,
+ button, time, status_icon)
+
+ # Connect signals for status icon and show
+ status_icon.connect('activate', toggle_cb)
+ status_icon.connect('popup-menu', popup_menu_cb)
+ status_icon.set_visible(True)
def child_cb(pid, cond, data=None):
sys.exit(-1)
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-07 21:52:44 +0000