From a5874125ee6f6124fa7e0952d4844a072b14a685 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Mon, 18 Oct 2010 00:36:57 +0200 Subject: [PATCH] Separate the redshift.svg icon into an application icon and a status icon (redshift-status-on.svg). Rename redshift-idle.svg to redshift-status-off.svg. --- Makefile.am | 13 +- ...shift-idle.svg => redshift-status-off.svg} | 0 .../scalable/apps/redshift-status-on.svg | 2185 +++++++++++++++++ ...shift-idle.svg => redshift-status-off.svg} | 0 .../{redshift.svg => redshift-status-on.svg} | 0 ...shift-idle.svg => redshift-status-off.svg} | 0 .../{redshift.svg => redshift-status-on.svg} | 0 src/gtk-redshift/statusicon.py | 10 +- 8 files changed, 2198 insertions(+), 10 deletions(-) rename data/icons/hicolor/scalable/apps/{redshift-idle.svg => redshift-status-off.svg} (100%) create mode 100644 data/icons/hicolor/scalable/apps/redshift-status-on.svg rename data/icons/ubuntu-mono-dark/scalable/apps/{redshift-idle.svg => redshift-status-off.svg} (100%) rename data/icons/ubuntu-mono-dark/scalable/apps/{redshift.svg => redshift-status-on.svg} (100%) rename data/icons/ubuntu-mono-light/scalable/apps/{redshift-idle.svg => redshift-status-off.svg} (100%) rename data/icons/ubuntu-mono-light/scalable/apps/{redshift.svg => redshift-status-on.svg} (100%) diff --git a/Makefile.am b/Makefile.am index a4cd32b..89055e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,15 +5,18 @@ ACLOCAL_AMFLAGS = -I m4 # Icons hicolor_icondir = @datadir@/icons/hicolor/scalable/apps hicolor_icon_DATA = data/icons/hicolor/scalable/apps/redshift.svg \ - data/icons/hicolor/scalable/apps/redshift-idle.svg + data/icons/hicolor/scalable/apps/redshift-status-on.svg \ + data/icons/hicolor/scalable/apps/redshift-status-off.svg ubuntu_mono_dark_icondir = @datadir@/icons/ubuntu-mono-dark/scalable/apps -ubuntu_mono_dark_icon_DATA = data/icons/ubuntu-mono-dark/scalable/apps/redshift.svg \ - data/icons/ubuntu-mono-dark/scalable/apps/redshift-idle.svg +ubuntu_mono_dark_icon_DATA = \ + data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg \ + data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg ubuntu_mono_light_icondir = @datadir@/icons/ubuntu-mono-light/scalable/apps -ubuntu_mono_light_icon_DATA = data/icons/ubuntu-mono-light/scalable/apps/redshift.svg \ - data/icons/ubuntu-mono-light/scalable/apps/redshift-idle.svg +ubuntu_mono_light_icon_DATA = \ + data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg \ + data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg # Desktop file diff --git a/data/icons/hicolor/scalable/apps/redshift-idle.svg b/data/icons/hicolor/scalable/apps/redshift-status-off.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/redshift-idle.svg rename to data/icons/hicolor/scalable/apps/redshift-status-off.svg diff --git a/data/icons/hicolor/scalable/apps/redshift-status-on.svg b/data/icons/hicolor/scalable/apps/redshift-status-on.svg new file mode 100644 index 0000000..68cee9f --- /dev/null +++ b/data/icons/hicolor/scalable/apps/redshift-status-on.svg @@ -0,0 +1,2185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/ubuntu-mono-dark/scalable/apps/redshift-idle.svg b/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg similarity index 100% rename from data/icons/ubuntu-mono-dark/scalable/apps/redshift-idle.svg rename to data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-off.svg diff --git a/data/icons/ubuntu-mono-dark/scalable/apps/redshift.svg b/data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg similarity index 100% rename from data/icons/ubuntu-mono-dark/scalable/apps/redshift.svg rename to data/icons/ubuntu-mono-dark/scalable/apps/redshift-status-on.svg diff --git a/data/icons/ubuntu-mono-light/scalable/apps/redshift-idle.svg b/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg similarity index 100% rename from data/icons/ubuntu-mono-light/scalable/apps/redshift-idle.svg rename to data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg diff --git a/data/icons/ubuntu-mono-light/scalable/apps/redshift.svg b/data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg similarity index 100% rename from data/icons/ubuntu-mono-light/scalable/apps/redshift.svg rename to data/icons/ubuntu-mono-light/scalable/apps/redshift-status-on.svg diff --git a/src/gtk-redshift/statusicon.py b/src/gtk-redshift/statusicon.py index c5c12ac..29801e8 100644 --- a/src/gtk-redshift/statusicon.py +++ b/src/gtk-redshift/statusicon.py @@ -60,21 +60,21 @@ def run(): else: # Create status icon status_icon = gtk.StatusIcon() - status_icon.set_from_icon_name('redshift') + status_icon.set_from_icon_name('redshift-status-on') status_icon.set_tooltip('Redshift') def toggle_cb(widget, data=None): process.send_signal(signal.SIGUSR1) if appindicator: if indicator.get_icon() == 'redshift': - indicator.set_icon('redshift-idle') + indicator.set_icon('redshift-status-off') else: - indicator.set_icon('redshift') + indicator.set_icon('redshift-status-on') else: if status_icon.get_icon_name() == 'redshift': - status_icon.set_from_icon_name('redshift-idle') + status_icon.set_from_icon_name('redshift-status-off') else: - status_icon.set_from_icon_name('redshift') + status_icon.set_from_icon_name('redshift-status-on') def autostart_cb(widget, data=None): utils.set_autostart(widget.get_active())