From 3aaeec393a1fe89e7219fb4782c7a0ccef5440a2 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Wed, 2 May 2018 15:17:17 -0400 Subject: netspeed: Use theme icons instead of embedded This removes old icons included with the applet and instead uses icons from the current theme. Known issues: * Loopback interface does not have an icon, instead we use a "reload" icon to simulate it. * PLIP/SLIP interfaces do not have proper icons, I managed to find an old PLIP icon in the hicolor theme and re-purposed it. * Since not all icons have the same levels of scaling, I'm capping the size at 48px to keep all interfaces consistent. * There are no icons for Wireless Quality, so I retained the existing ones for now. --- netspeed/icons/16x16/devices/Makefile.am | 4 +--- netspeed/icons/16x16/devices/mate-netspeed-loopback.png | Bin 237 -> 0 bytes netspeed/icons/16x16/devices/mate-netspeed-ppp.png | Bin 589 -> 0 bytes netspeed/icons/22x22/Makefile.am | 2 +- netspeed/icons/22x22/devices/Makefile.am | 11 +++++++++++ netspeed/icons/22x22/devices/mate-netspeed-plip.png | Bin 0 -> 6379 bytes netspeed/icons/24x24/Makefile.am | 2 +- netspeed/icons/24x24/devices/Makefile.am | 11 +++++++++++ netspeed/icons/24x24/devices/mate-netspeed-plip.png | Bin 0 -> 5108 bytes netspeed/icons/32x32/Makefile.am | 2 +- netspeed/icons/32x32/devices/Makefile.am | 11 +++++++++++ netspeed/icons/32x32/devices/mate-netspeed-plip.png | Bin 0 -> 2911 bytes netspeed/icons/48x48/Makefile.am | 2 +- netspeed/icons/48x48/devices/Makefile.am | 11 +++++++++++ netspeed/icons/48x48/devices/mate-netspeed-plip.png | Bin 0 -> 1681 bytes 15 files changed, 49 insertions(+), 7 deletions(-) delete mode 100644 netspeed/icons/16x16/devices/mate-netspeed-loopback.png delete mode 100644 netspeed/icons/16x16/devices/mate-netspeed-ppp.png create mode 100644 netspeed/icons/22x22/devices/Makefile.am create mode 100644 netspeed/icons/22x22/devices/mate-netspeed-plip.png create mode 100644 netspeed/icons/24x24/devices/Makefile.am create mode 100644 netspeed/icons/24x24/devices/mate-netspeed-plip.png create mode 100644 netspeed/icons/32x32/devices/Makefile.am create mode 100644 netspeed/icons/32x32/devices/mate-netspeed-plip.png create mode 100644 netspeed/icons/48x48/devices/Makefile.am create mode 100644 netspeed/icons/48x48/devices/mate-netspeed-plip.png (limited to 'netspeed/icons') diff --git a/netspeed/icons/16x16/devices/Makefile.am b/netspeed/icons/16x16/devices/Makefile.am index ce1c32dd..f5dfcbdd 100644 --- a/netspeed/icons/16x16/devices/Makefile.am +++ b/netspeed/icons/16x16/devices/Makefile.am @@ -5,9 +5,7 @@ context = devices iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ - mate-netspeed-loopback.png \ - mate-netspeed-plip.png \ - mate-netspeed-ppp.png + mate-netspeed-plip.png EXTRA_DIST = \ $(icons_DATA) diff --git a/netspeed/icons/16x16/devices/mate-netspeed-loopback.png b/netspeed/icons/16x16/devices/mate-netspeed-loopback.png deleted file mode 100644 index 7b065246..00000000 Binary files a/netspeed/icons/16x16/devices/mate-netspeed-loopback.png and /dev/null differ diff --git a/netspeed/icons/16x16/devices/mate-netspeed-ppp.png b/netspeed/icons/16x16/devices/mate-netspeed-ppp.png deleted file mode 100644 index e819577a..00000000 Binary files a/netspeed/icons/16x16/devices/mate-netspeed-ppp.png and /dev/null differ diff --git a/netspeed/icons/22x22/Makefile.am b/netspeed/icons/22x22/Makefile.am index be70ac5b..b23c45c8 100644 --- a/netspeed/icons/22x22/Makefile.am +++ b/netspeed/icons/22x22/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = apps +SUBDIRS = apps devices diff --git a/netspeed/icons/22x22/devices/Makefile.am b/netspeed/icons/22x22/devices/Makefile.am new file mode 100644 index 00000000..074503e2 --- /dev/null +++ b/netspeed/icons/22x22/devices/Makefile.am @@ -0,0 +1,11 @@ +themedir = $(datadir)/icons/hicolor +size = 22x22 +context = devices + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + mate-netspeed-plip.png + +EXTRA_DIST = \ + $(icons_DATA) diff --git a/netspeed/icons/22x22/devices/mate-netspeed-plip.png b/netspeed/icons/22x22/devices/mate-netspeed-plip.png new file mode 100644 index 00000000..9ea518d6 Binary files /dev/null and b/netspeed/icons/22x22/devices/mate-netspeed-plip.png differ diff --git a/netspeed/icons/24x24/Makefile.am b/netspeed/icons/24x24/Makefile.am index 3385c299..f34f5bb5 100644 --- a/netspeed/icons/24x24/Makefile.am +++ b/netspeed/icons/24x24/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = apps status +SUBDIRS = apps devices status diff --git a/netspeed/icons/24x24/devices/Makefile.am b/netspeed/icons/24x24/devices/Makefile.am new file mode 100644 index 00000000..6e8604be --- /dev/null +++ b/netspeed/icons/24x24/devices/Makefile.am @@ -0,0 +1,11 @@ +themedir = $(datadir)/icons/hicolor +size = 24x24 +context = devices + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + mate-netspeed-plip.png + +EXTRA_DIST = \ + $(icons_DATA) diff --git a/netspeed/icons/24x24/devices/mate-netspeed-plip.png b/netspeed/icons/24x24/devices/mate-netspeed-plip.png new file mode 100644 index 00000000..acad66d5 Binary files /dev/null and b/netspeed/icons/24x24/devices/mate-netspeed-plip.png differ diff --git a/netspeed/icons/32x32/Makefile.am b/netspeed/icons/32x32/Makefile.am index be70ac5b..b23c45c8 100644 --- a/netspeed/icons/32x32/Makefile.am +++ b/netspeed/icons/32x32/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = apps +SUBDIRS = apps devices diff --git a/netspeed/icons/32x32/devices/Makefile.am b/netspeed/icons/32x32/devices/Makefile.am new file mode 100644 index 00000000..c763c4b9 --- /dev/null +++ b/netspeed/icons/32x32/devices/Makefile.am @@ -0,0 +1,11 @@ +themedir = $(datadir)/icons/hicolor +size = 32x32 +context = devices + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + mate-netspeed-plip.png + +EXTRA_DIST = \ + $(icons_DATA) diff --git a/netspeed/icons/32x32/devices/mate-netspeed-plip.png b/netspeed/icons/32x32/devices/mate-netspeed-plip.png new file mode 100644 index 00000000..b2035439 Binary files /dev/null and b/netspeed/icons/32x32/devices/mate-netspeed-plip.png differ diff --git a/netspeed/icons/48x48/Makefile.am b/netspeed/icons/48x48/Makefile.am index be70ac5b..b23c45c8 100644 --- a/netspeed/icons/48x48/Makefile.am +++ b/netspeed/icons/48x48/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = apps +SUBDIRS = apps devices diff --git a/netspeed/icons/48x48/devices/Makefile.am b/netspeed/icons/48x48/devices/Makefile.am new file mode 100644 index 00000000..d2e476dc --- /dev/null +++ b/netspeed/icons/48x48/devices/Makefile.am @@ -0,0 +1,11 @@ +themedir = $(datadir)/icons/hicolor +size = 48x48 +context = devices + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + mate-netspeed-plip.png + +EXTRA_DIST = \ + $(icons_DATA) diff --git a/netspeed/icons/48x48/devices/mate-netspeed-plip.png b/netspeed/icons/48x48/devices/mate-netspeed-plip.png new file mode 100644 index 00000000..99e737b0 Binary files /dev/null and b/netspeed/icons/48x48/devices/mate-netspeed-plip.png differ -- cgit v1.2.1