From c355361668a3efc27d957861162bef4e077a1485 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Wed, 23 Nov 2011 18:23:41 +0100 Subject: solved some conflicts with sensors-applet --- pixmaps/Makefile.am | 22 +++++++++++----------- pixmaps/mate-sensors-applet-battery.png | Bin 0 -> 821 bytes pixmaps/mate-sensors-applet-case.png | Bin 0 -> 583 bytes pixmaps/mate-sensors-applet-chip.png | Bin 0 -> 807 bytes pixmaps/mate-sensors-applet-cpu.png | Bin 0 -> 979 bytes pixmaps/mate-sensors-applet-drive-harddisk.png | Bin 0 -> 518 bytes pixmaps/mate-sensors-applet-fan.png | Bin 0 -> 1544 bytes pixmaps/mate-sensors-applet-gpu.png | Bin 0 -> 1003 bytes pixmaps/mate-sensors-applet-memory.png | Bin 0 -> 636 bytes pixmaps/mate-sensors-applet.png | Bin 0 -> 3114 bytes pixmaps/sensors-applet-battery.png | Bin 821 -> 0 bytes pixmaps/sensors-applet-case.png | Bin 583 -> 0 bytes pixmaps/sensors-applet-chip.png | Bin 807 -> 0 bytes pixmaps/sensors-applet-cpu.png | Bin 979 -> 0 bytes pixmaps/sensors-applet-drive-harddisk.png | Bin 518 -> 0 bytes pixmaps/sensors-applet-fan.png | Bin 1544 -> 0 bytes pixmaps/sensors-applet-gpu.png | Bin 1003 -> 0 bytes pixmaps/sensors-applet-memory.png | Bin 636 -> 0 bytes pixmaps/sensors-applet.png | Bin 3114 -> 0 bytes 19 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 pixmaps/mate-sensors-applet-battery.png create mode 100644 pixmaps/mate-sensors-applet-case.png create mode 100644 pixmaps/mate-sensors-applet-chip.png create mode 100644 pixmaps/mate-sensors-applet-cpu.png create mode 100644 pixmaps/mate-sensors-applet-drive-harddisk.png create mode 100644 pixmaps/mate-sensors-applet-fan.png create mode 100644 pixmaps/mate-sensors-applet-gpu.png create mode 100644 pixmaps/mate-sensors-applet-memory.png create mode 100644 pixmaps/mate-sensors-applet.png delete mode 100644 pixmaps/sensors-applet-battery.png delete mode 100644 pixmaps/sensors-applet-case.png delete mode 100644 pixmaps/sensors-applet-chip.png delete mode 100644 pixmaps/sensors-applet-cpu.png delete mode 100644 pixmaps/sensors-applet-drive-harddisk.png delete mode 100644 pixmaps/sensors-applet-fan.png delete mode 100644 pixmaps/sensors-applet-gpu.png delete mode 100644 pixmaps/sensors-applet-memory.png delete mode 100644 pixmaps/sensors-applet.png (limited to 'pixmaps') diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 8ff4d4e..7c4afc2 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,4 +1,4 @@ -pixmapsdir = $(datadir)/pixmaps/sensors-applet +pixmapsdir = $(datadir)/pixmaps/mate-sensors-applet pixmaps_DATA = \ very-low-temp-icon.png \ low-temp-icon.png \ @@ -8,17 +8,17 @@ pixmaps_DATA = \ deviceiconsdir = $(datadir)/icons/hicolor/22x22/devices deviceicons_DATA = \ - sensors-applet-battery.png \ - sensors-applet-case.png \ - sensors-applet-chip.png \ - sensors-applet-cpu.png \ - sensors-applet-gpu.png \ - sensors-applet-fan.png \ - sensors-applet-drive-harddisk.png \ - sensors-applet-memory.png + mate-sensors-applet-battery.png \ + mate-sensors-applet-case.png \ + mate-sensors-applet-chip.png \ + mate-sensors-applet-cpu.png \ + mate-sensors-applet-gpu.png \ + mate-sensors-applet-fan.png \ + mate-sensors-applet-drive-harddisk.png \ + mate-sensors-applet-memory.png appicondir = $(datadir)/icons/hicolor/48x48/apps -appicon_DATA = sensors-applet.png +appicon_DATA = mate-sensors-applet.png gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor @@ -36,4 +36,4 @@ update_icon_cache: EXTRA_DIST = \ $(pixmaps_DATA) \ $(deviceicons_DATA) \ - $(appicon_DATA) \ No newline at end of file + $(appicon_DATA) diff --git a/pixmaps/mate-sensors-applet-battery.png b/pixmaps/mate-sensors-applet-battery.png new file mode 100644 index 0000000..d49e6c8 Binary files /dev/null and b/pixmaps/mate-sensors-applet-battery.png differ diff --git a/pixmaps/mate-sensors-applet-case.png b/pixmaps/mate-sensors-applet-case.png new file mode 100644 index 0000000..8cca2b7 Binary files /dev/null and b/pixmaps/mate-sensors-applet-case.png differ diff --git a/pixmaps/mate-sensors-applet-chip.png b/pixmaps/mate-sensors-applet-chip.png new file mode 100644 index 0000000..2829ac8 Binary files /dev/null and b/pixmaps/mate-sensors-applet-chip.png differ diff --git a/pixmaps/mate-sensors-applet-cpu.png b/pixmaps/mate-sensors-applet-cpu.png new file mode 100644 index 0000000..0a04039 Binary files /dev/null and b/pixmaps/mate-sensors-applet-cpu.png differ diff --git a/pixmaps/mate-sensors-applet-drive-harddisk.png b/pixmaps/mate-sensors-applet-drive-harddisk.png new file mode 100644 index 0000000..648bcc2 Binary files /dev/null and b/pixmaps/mate-sensors-applet-drive-harddisk.png differ diff --git a/pixmaps/mate-sensors-applet-fan.png b/pixmaps/mate-sensors-applet-fan.png new file mode 100644 index 0000000..36a0da9 Binary files /dev/null and b/pixmaps/mate-sensors-applet-fan.png differ diff --git a/pixmaps/mate-sensors-applet-gpu.png b/pixmaps/mate-sensors-applet-gpu.png new file mode 100644 index 0000000..9fc9463 Binary files /dev/null and b/pixmaps/mate-sensors-applet-gpu.png differ diff --git a/pixmaps/mate-sensors-applet-memory.png b/pixmaps/mate-sensors-applet-memory.png new file mode 100644 index 0000000..446f84a Binary files /dev/null and b/pixmaps/mate-sensors-applet-memory.png differ diff --git a/pixmaps/mate-sensors-applet.png b/pixmaps/mate-sensors-applet.png new file mode 100644 index 0000000..908dce9 Binary files /dev/null and b/pixmaps/mate-sensors-applet.png differ diff --git a/pixmaps/sensors-applet-battery.png b/pixmaps/sensors-applet-battery.png deleted file mode 100644 index d49e6c8..0000000 Binary files a/pixmaps/sensors-applet-battery.png and /dev/null differ diff --git a/pixmaps/sensors-applet-case.png b/pixmaps/sensors-applet-case.png deleted file mode 100644 index 8cca2b7..0000000 Binary files a/pixmaps/sensors-applet-case.png and /dev/null differ diff --git a/pixmaps/sensors-applet-chip.png b/pixmaps/sensors-applet-chip.png deleted file mode 100644 index 2829ac8..0000000 Binary files a/pixmaps/sensors-applet-chip.png and /dev/null differ diff --git a/pixmaps/sensors-applet-cpu.png b/pixmaps/sensors-applet-cpu.png deleted file mode 100644 index 0a04039..0000000 Binary files a/pixmaps/sensors-applet-cpu.png and /dev/null differ diff --git a/pixmaps/sensors-applet-drive-harddisk.png b/pixmaps/sensors-applet-drive-harddisk.png deleted file mode 100644 index 648bcc2..0000000 Binary files a/pixmaps/sensors-applet-drive-harddisk.png and /dev/null differ diff --git a/pixmaps/sensors-applet-fan.png b/pixmaps/sensors-applet-fan.png deleted file mode 100644 index 36a0da9..0000000 Binary files a/pixmaps/sensors-applet-fan.png and /dev/null differ diff --git a/pixmaps/sensors-applet-gpu.png b/pixmaps/sensors-applet-gpu.png deleted file mode 100644 index 9fc9463..0000000 Binary files a/pixmaps/sensors-applet-gpu.png and /dev/null differ diff --git a/pixmaps/sensors-applet-memory.png b/pixmaps/sensors-applet-memory.png deleted file mode 100644 index 446f84a..0000000 Binary files a/pixmaps/sensors-applet-memory.png and /dev/null differ diff --git a/pixmaps/sensors-applet.png b/pixmaps/sensors-applet.png deleted file mode 100644 index a4bcd4e..0000000 Binary files a/pixmaps/sensors-applet.png and /dev/null differ -- cgit v1.2.1