From cd539af1f7e87fd6121e75aed86ef4f378e5ceef Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 14 Sep 2017 22:00:41 +0200 Subject: [PATCH] - icons: rename slider icons to more logical names --- data/icons/slider/Makefile.am | 12 ++++++------ .../{volumeslider2alpha.png => slider_alpha.png} | Bin .../{volumeslider2blue.png => slider_blue.png} | Bin .../slider/{volumebody.png => slider_body.png} | Bin .../{volumeslider2green.png => slider_green.png} | Bin .../{volumeslider2.png => slider_inactive.png} | Bin .../slider/{volumeslider2red.png => slider_red.png} | Bin src/gui/widget/icons.h | 12 ++++++------ 8 files changed, 12 insertions(+), 12 deletions(-) rename data/icons/slider/{volumeslider2alpha.png => slider_alpha.png} (100%) rename data/icons/slider/{volumeslider2blue.png => slider_blue.png} (100%) rename data/icons/slider/{volumebody.png => slider_body.png} (100%) rename data/icons/slider/{volumeslider2green.png => slider_green.png} (100%) rename data/icons/slider/{volumeslider2.png => slider_inactive.png} (100%) rename data/icons/slider/{volumeslider2red.png => slider_red.png} (100%) diff --git a/data/icons/slider/Makefile.am b/data/icons/slider/Makefile.am index ad3b0a21f..57d50c0f9 100644 --- a/data/icons/slider/Makefile.am +++ b/data/icons/slider/Makefile.am @@ -1,9 +1,9 @@ installdir = $(ICONSDIR) install_DATA = \ - volumebody.png \ - volumeslider2.png \ - volumeslider2alpha.png \ - volumeslider2blue.png \ - volumeslider2green.png \ - volumeslider2red.png + slider_alpha.png \ + slider_blue.png \ + slider_body.png \ + slider_green.png \ + slider_inactive.png \ + slider_red.png diff --git a/data/icons/slider/volumeslider2alpha.png b/data/icons/slider/slider_alpha.png similarity index 100% rename from data/icons/slider/volumeslider2alpha.png rename to data/icons/slider/slider_alpha.png diff --git a/data/icons/slider/volumeslider2blue.png b/data/icons/slider/slider_blue.png similarity index 100% rename from data/icons/slider/volumeslider2blue.png rename to data/icons/slider/slider_blue.png diff --git a/data/icons/slider/volumebody.png b/data/icons/slider/slider_body.png similarity index 100% rename from data/icons/slider/volumebody.png rename to data/icons/slider/slider_body.png diff --git a/data/icons/slider/volumeslider2green.png b/data/icons/slider/slider_green.png similarity index 100% rename from data/icons/slider/volumeslider2green.png rename to data/icons/slider/slider_green.png diff --git a/data/icons/slider/volumeslider2.png b/data/icons/slider/slider_inactive.png similarity index 100% rename from data/icons/slider/volumeslider2.png rename to data/icons/slider/slider_inactive.png diff --git a/data/icons/slider/volumeslider2red.png b/data/icons/slider/slider_red.png similarity index 100% rename from data/icons/slider/volumeslider2red.png rename to data/icons/slider/slider_red.png diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index fd9807547..a550bb3e1 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -177,12 +177,12 @@ #define DUMMY_ICON "dummy" /* sliders */ -#define NEUTRINO_ICON_SLIDER_BODY "volumebody" -#define NEUTRINO_ICON_SLIDER_INACTIVE "volumeslider2" -#define NEUTRINO_ICON_SLIDER_RED "volumeslider2red" -#define NEUTRINO_ICON_SLIDER_GREEN "volumeslider2green" -#define NEUTRINO_ICON_SLIDER_BLUE "volumeslider2blue" -#define NEUTRINO_ICON_SLIDER_ALPHA "volumeslider2alpha" +#define NEUTRINO_ICON_SLIDER_BODY "slider_body" +#define NEUTRINO_ICON_SLIDER_INACTIVE "slider_inactive" +#define NEUTRINO_ICON_SLIDER_RED "slider_red" +#define NEUTRINO_ICON_SLIDER_GREEN "slider_green" +#define NEUTRINO_ICON_SLIDER_BLUE "slider_blue" +#define NEUTRINO_ICON_SLIDER_ALPHA "slider_alpha" #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green" #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray"