aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac9
-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.am2
-rw-r--r--src/gtk-redshift/statusicon.py15
13 files changed, 43 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac
index ffcf08b..54450b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,10 +131,10 @@ AS_IF([test "x$enable_gnome_clock" != xno], [
])
AM_CONDITIONAL([ENABLE_GNOME_CLOCK], [test "x$enable_gnome_clock" = xyes])
-# Check for AppIndicator or GTK+ status icon
-AC_MSG_CHECKING([whether to enable AppIndicator or GTK status icon])
+# Check for GUI status icon
+AC_MSG_CHECKING([whether to enable GUI status icon])
AC_ARG_ENABLE([gui], [AC_HELP_STRING([--enable-gui],
- [enable AppIndicator or GTK status icon])],
+ [enable GUI status icon])],
[enable_gui=$enableval],[enable_gui=maybe])
AS_IF([test "x$enable_gui" != xno], [
AS_IF([test $have_python = yes], [
@@ -142,7 +142,7 @@ AS_IF([test "x$enable_gui" != xno], [
], [
AC_MSG_RESULT([missing dependencies])
AS_IF([test "x$enable_gui" = xyes], [
- AC_MSG_ERROR([appindicator and status icon script requires Python 2.6])
+ AC_MSG_ERROR([GUI status icon script requires Python 2.6])
])
enable_gui=no
])
@@ -151,6 +151,7 @@ AS_IF([test "x$enable_gui" != xno], [
])
AM_CONDITIONAL([ENABLE_GUI], [test "x$enable_gui" != xno])
+
# Checks for header files.
AC_CHECK_HEADERS([locale.h stdint.h stdlib.h string.h unistd.h sys/signal.h])
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 5101cef..bb69459 100644
--- a/src/gtk-redshift/Makefile.am
+++ b/src/gtk-redshift/Makefile.am
@@ -12,9 +12,9 @@ dist_bin_SCRIPTS = gtk-redshift
endif
EXTRA_DIST = defs.py.in
-
CLEANFILES = defs.py
+
# Local python definitions
defs.py: defs.py.in
sed -e "s|\@bindir\@|$(bindir)|g" \
diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py
index 8c084a8..859a1b9 100644
--- a/src/gtk-redshift/statusicon.py
+++ b/src/gtk-redshift/statusicon.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# statusicon.py -- Application panel indicator / 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
@@ -49,10 +55,9 @@ def run():
try:
if appindicator:
# Create indicator
- indicator = appindicator.Indicator ("redshift",
- "redshift",
- appindicator.CATEGORY_APPLICATION_STATUS)
- indicator.set_status (appindicator.STATUS_ACTIVE)
+ indicator = appindicator.Indicator('redshift', 'redshift',
+ appindicator.CATEGORY_APPLICATION_STATUS)
+ indicator.set_status(appindicator.STATUS_ACTIVE)
else:
# Create status icon
status_icon = gtk.StatusIcon()
generated by cgit v1.2.3-70-g09d2 (git 2.48.0) at 2025-04-08 02:44:36 +0000