From 5dab2033e1cf4ce6fbb855bb051cc25232970bcc Mon Sep 17 00:00:00 2001
From: David <dbphillipsnz@gmail.com>
Date: Thu, 18 Sep 2014 22:12:49 +1200
Subject: Renamed icon files
---
bat_tray.c | 8 ++++----
themes/default/bat-0-charging.png | Bin 0 -> 1270 bytes
themes/default/bat-0.png | Bin 0 -> 922 bytes
themes/default/bat-100-charging.png | Bin 0 -> 1261 bytes
themes/default/bat-100.png | Bin 0 -> 839 bytes
themes/default/bat-20-charging.png | Bin 0 -> 1297 bytes
themes/default/bat-20.png | Bin 0 -> 923 bytes
themes/default/bat-40-charging.png | Bin 0 -> 1288 bytes
themes/default/bat-40.png | Bin 0 -> 925 bytes
themes/default/bat-60-charging.png | Bin 0 -> 1305 bytes
themes/default/bat-60.png | Bin 0 -> 912 bytes
themes/default/bat-80-charging.png | Bin 0 -> 1280 bytes
themes/default/bat-80.png | Bin 0 -> 872 bytes
themes/default/bat-charged.png | Bin 0 -> 1913 bytes
themes/default/cpu-0.png | Bin 0 -> 939 bytes
themes/default/cpu-100.png | Bin 0 -> 1057 bytes
themes/default/cpu-25.png | Bin 0 -> 942 bytes
themes/default/cpu-50.png | Bin 0 -> 988 bytes
themes/default/cpu-75.png | Bin 0 -> 1014 bytes
themes/default/cpufreq-0.png | Bin 939 -> 0 bytes
themes/default/cpufreq-100.png | Bin 1057 -> 0 bytes
themes/default/cpufreq-25.png | Bin 942 -> 0 bytes
themes/default/cpufreq-50.png | Bin 988 -> 0 bytes
themes/default/cpufreq-75.png | Bin 1014 -> 0 bytes
themes/default/traybat-0-charging.png | Bin 1270 -> 0 bytes
themes/default/traybat-0.png | Bin 922 -> 0 bytes
themes/default/traybat-100-charging.png | Bin 1261 -> 0 bytes
themes/default/traybat-100.png | Bin 839 -> 0 bytes
themes/default/traybat-20-charging.png | Bin 1297 -> 0 bytes
themes/default/traybat-20.png | Bin 923 -> 0 bytes
themes/default/traybat-40-charging.png | Bin 1288 -> 0 bytes
themes/default/traybat-40.png | Bin 925 -> 0 bytes
themes/default/traybat-60-charging.png | Bin 1305 -> 0 bytes
themes/default/traybat-60.png | Bin 912 -> 0 bytes
themes/default/traybat-80-charging.png | Bin 1280 -> 0 bytes
themes/default/traybat-80.png | Bin 872 -> 0 bytes
themes/default/traybat-charged.png | Bin 1913 -> 0 bytes
tray.c | 4 ++--
38 files changed, 6 insertions(+), 6 deletions(-)
create mode 100644 themes/default/bat-0-charging.png
create mode 100644 themes/default/bat-0.png
create mode 100644 themes/default/bat-100-charging.png
create mode 100644 themes/default/bat-100.png
create mode 100644 themes/default/bat-20-charging.png
create mode 100644 themes/default/bat-20.png
create mode 100644 themes/default/bat-40-charging.png
create mode 100644 themes/default/bat-40.png
create mode 100644 themes/default/bat-60-charging.png
create mode 100644 themes/default/bat-60.png
create mode 100644 themes/default/bat-80-charging.png
create mode 100644 themes/default/bat-80.png
create mode 100644 themes/default/bat-charged.png
create mode 100644 themes/default/cpu-0.png
create mode 100644 themes/default/cpu-100.png
create mode 100644 themes/default/cpu-25.png
create mode 100644 themes/default/cpu-50.png
create mode 100644 themes/default/cpu-75.png
delete mode 100644 themes/default/cpufreq-0.png
delete mode 100644 themes/default/cpufreq-100.png
delete mode 100644 themes/default/cpufreq-25.png
delete mode 100644 themes/default/cpufreq-50.png
delete mode 100644 themes/default/cpufreq-75.png
delete mode 100644 themes/default/traybat-0-charging.png
delete mode 100644 themes/default/traybat-0.png
delete mode 100644 themes/default/traybat-100-charging.png
delete mode 100644 themes/default/traybat-100.png
delete mode 100644 themes/default/traybat-20-charging.png
delete mode 100644 themes/default/traybat-20.png
delete mode 100644 themes/default/traybat-40-charging.png
delete mode 100644 themes/default/traybat-40.png
delete mode 100644 themes/default/traybat-60-charging.png
delete mode 100644 themes/default/traybat-60.png
delete mode 100644 themes/default/traybat-80-charging.png
delete mode 100644 themes/default/traybat-80.png
delete mode 100644 themes/default/traybat-charged.png
diff --git a/bat_tray.c b/bat_tray.c
index 3b2b698..274009b 100644
--- a/bat_tray.c
+++ b/bat_tray.c
@@ -94,15 +94,15 @@ gboolean update_icon(gpointer user_data)
switch ( get_battery_state() )
{
case STATE_DISCHARGING:
- asprintf(&icon_file,"%s/traybat-%d.png",_DEFAULT_THEME,rounded);
+ asprintf(&icon_file,"%s/bat-%d.png",_DEFAULT_THEME,rounded);
break;
case STATE_CHARGING:
- asprintf(&icon_file,"%s/traybat-%d-charging.png",_DEFAULT_THEME,rounded);
+ asprintf(&icon_file,"%s/bat-%d-charging.png",_DEFAULT_THEME,rounded);
break;
default:
- asprintf(&icon_file,"%s/traybat-charged.png",_DEFAULT_THEME);
+ asprintf(&icon_file,"%s/bat-charged.png",_DEFAULT_THEME);
break;
}
@@ -131,7 +131,7 @@ void bat_tray_init()
debug("Spawning new status icon\n");
tray = gtk_status_icon_new();
- asprintf(&icon_file,"%s/traybat-charged.png",_DEFAULT_THEME);
+ asprintf(&icon_file,"%s/bat-charged.png",_DEFAULT_THEME);
gtk_status_icon_set_from_file(tray, icon_file);
free(icon_file);
gtk_status_icon_set_has_tooltip (tray, TRUE);
diff --git a/themes/default/bat-0-charging.png b/themes/default/bat-0-charging.png
new file mode 100644
index 0000000..9255e66
Binary files /dev/null and b/themes/default/bat-0-charging.png differ
diff --git a/themes/default/bat-0.png b/themes/default/bat-0.png
new file mode 100644
index 0000000..2554a6a
Binary files /dev/null and b/themes/default/bat-0.png differ
diff --git a/themes/default/bat-100-charging.png b/themes/default/bat-100-charging.png
new file mode 100644
index 0000000..bae3a43
Binary files /dev/null and b/themes/default/bat-100-charging.png differ
diff --git a/themes/default/bat-100.png b/themes/default/bat-100.png
new file mode 100644
index 0000000..fe4ba7f
Binary files /dev/null and b/themes/default/bat-100.png differ
diff --git a/themes/default/bat-20-charging.png b/themes/default/bat-20-charging.png
new file mode 100644
index 0000000..aabd778
Binary files /dev/null and b/themes/default/bat-20-charging.png differ
diff --git a/themes/default/bat-20.png b/themes/default/bat-20.png
new file mode 100644
index 0000000..83e7065
Binary files /dev/null and b/themes/default/bat-20.png differ
diff --git a/themes/default/bat-40-charging.png b/themes/default/bat-40-charging.png
new file mode 100644
index 0000000..c016a28
Binary files /dev/null and b/themes/default/bat-40-charging.png differ
diff --git a/themes/default/bat-40.png b/themes/default/bat-40.png
new file mode 100644
index 0000000..3245106
Binary files /dev/null and b/themes/default/bat-40.png differ
diff --git a/themes/default/bat-60-charging.png b/themes/default/bat-60-charging.png
new file mode 100644
index 0000000..1667458
Binary files /dev/null and b/themes/default/bat-60-charging.png differ
diff --git a/themes/default/bat-60.png b/themes/default/bat-60.png
new file mode 100644
index 0000000..aa25803
Binary files /dev/null and b/themes/default/bat-60.png differ
diff --git a/themes/default/bat-80-charging.png b/themes/default/bat-80-charging.png
new file mode 100644
index 0000000..b9c6991
Binary files /dev/null and b/themes/default/bat-80-charging.png differ
diff --git a/themes/default/bat-80.png b/themes/default/bat-80.png
new file mode 100644
index 0000000..e649be0
Binary files /dev/null and b/themes/default/bat-80.png differ
diff --git a/themes/default/bat-charged.png b/themes/default/bat-charged.png
new file mode 100644
index 0000000..1e61940
Binary files /dev/null and b/themes/default/bat-charged.png differ
diff --git a/themes/default/cpu-0.png b/themes/default/cpu-0.png
new file mode 100644
index 0000000..9a1b3b4
Binary files /dev/null and b/themes/default/cpu-0.png differ
diff --git a/themes/default/cpu-100.png b/themes/default/cpu-100.png
new file mode 100644
index 0000000..6b63453
Binary files /dev/null and b/themes/default/cpu-100.png differ
diff --git a/themes/default/cpu-25.png b/themes/default/cpu-25.png
new file mode 100644
index 0000000..ae2acf6
Binary files /dev/null and b/themes/default/cpu-25.png differ
diff --git a/themes/default/cpu-50.png b/themes/default/cpu-50.png
new file mode 100644
index 0000000..03ab5e3
Binary files /dev/null and b/themes/default/cpu-50.png differ
diff --git a/themes/default/cpu-75.png b/themes/default/cpu-75.png
new file mode 100644
index 0000000..49e9342
Binary files /dev/null and b/themes/default/cpu-75.png differ
diff --git a/themes/default/cpufreq-0.png b/themes/default/cpufreq-0.png
deleted file mode 100644
index 9a1b3b4..0000000
Binary files a/themes/default/cpufreq-0.png and /dev/null differ
diff --git a/themes/default/cpufreq-100.png b/themes/default/cpufreq-100.png
deleted file mode 100644
index 6b63453..0000000
Binary files a/themes/default/cpufreq-100.png and /dev/null differ
diff --git a/themes/default/cpufreq-25.png b/themes/default/cpufreq-25.png
deleted file mode 100644
index ae2acf6..0000000
Binary files a/themes/default/cpufreq-25.png and /dev/null differ
diff --git a/themes/default/cpufreq-50.png b/themes/default/cpufreq-50.png
deleted file mode 100644
index 03ab5e3..0000000
Binary files a/themes/default/cpufreq-50.png and /dev/null differ
diff --git a/themes/default/cpufreq-75.png b/themes/default/cpufreq-75.png
deleted file mode 100644
index 49e9342..0000000
Binary files a/themes/default/cpufreq-75.png and /dev/null differ
diff --git a/themes/default/traybat-0-charging.png b/themes/default/traybat-0-charging.png
deleted file mode 100644
index 9255e66..0000000
Binary files a/themes/default/traybat-0-charging.png and /dev/null differ
diff --git a/themes/default/traybat-0.png b/themes/default/traybat-0.png
deleted file mode 100644
index 2554a6a..0000000
Binary files a/themes/default/traybat-0.png and /dev/null differ
diff --git a/themes/default/traybat-100-charging.png b/themes/default/traybat-100-charging.png
deleted file mode 100644
index bae3a43..0000000
Binary files a/themes/default/traybat-100-charging.png and /dev/null differ
diff --git a/themes/default/traybat-100.png b/themes/default/traybat-100.png
deleted file mode 100644
index fe4ba7f..0000000
Binary files a/themes/default/traybat-100.png and /dev/null differ
diff --git a/themes/default/traybat-20-charging.png b/themes/default/traybat-20-charging.png
deleted file mode 100644
index aabd778..0000000
Binary files a/themes/default/traybat-20-charging.png and /dev/null differ
diff --git a/themes/default/traybat-20.png b/themes/default/traybat-20.png
deleted file mode 100644
index 83e7065..0000000
Binary files a/themes/default/traybat-20.png and /dev/null differ
diff --git a/themes/default/traybat-40-charging.png b/themes/default/traybat-40-charging.png
deleted file mode 100644
index c016a28..0000000
Binary files a/themes/default/traybat-40-charging.png and /dev/null differ
diff --git a/themes/default/traybat-40.png b/themes/default/traybat-40.png
deleted file mode 100644
index 3245106..0000000
Binary files a/themes/default/traybat-40.png and /dev/null differ
diff --git a/themes/default/traybat-60-charging.png b/themes/default/traybat-60-charging.png
deleted file mode 100644
index 1667458..0000000
Binary files a/themes/default/traybat-60-charging.png and /dev/null differ
diff --git a/themes/default/traybat-60.png b/themes/default/traybat-60.png
deleted file mode 100644
index aa25803..0000000
Binary files a/themes/default/traybat-60.png and /dev/null differ
diff --git a/themes/default/traybat-80-charging.png b/themes/default/traybat-80-charging.png
deleted file mode 100644
index b9c6991..0000000
Binary files a/themes/default/traybat-80-charging.png and /dev/null differ
diff --git a/themes/default/traybat-80.png b/themes/default/traybat-80.png
deleted file mode 100644
index e649be0..0000000
Binary files a/themes/default/traybat-80.png and /dev/null differ
diff --git a/themes/default/traybat-charged.png b/themes/default/traybat-charged.png
deleted file mode 100644
index 1e61940..0000000
Binary files a/themes/default/traybat-charged.png and /dev/null differ
diff --git a/tray.c b/tray.c
index 83b1504..10e9668 100644
--- a/tray.c
+++ b/tray.c
@@ -306,7 +306,7 @@ void tray_init()
{
tray_set_defaults();
tray = gtk_status_icon_new();
- char* icon_file = g_strconcat(_DEFAULT_THEME, "/cpufreq-0.png", NULL);
+ char* icon_file = g_strconcat(_DEFAULT_THEME, "/cpu-0.png", NULL);
debug("Setting icon to '%s'\n",icon_file);
gtk_status_icon_set_from_file(tray, icon_file);
@@ -362,7 +362,7 @@ void tray_update_icon_percent()
}
debug("Rounded/adjusted CPU percentage: %d\n",adjusted_percent);
- asprintf(&file, "%s/cpufreq-%d.png", _DEFAULT_THEME,adjusted_percent);
+ asprintf(&file, "%s/cpu-%d.png", _DEFAULT_THEME,adjusted_percent);
debug("Setting tray icon to '%s'\n",file);
gtk_status_icon_set_from_file(tray, file);
--
cgit v1.1