diff --git a/data/icons/status/various/Makefile.am b/data/icons/status/various/Makefile.am index bd4a7bf75..7d22b9cdf 100644 --- a/data/icons/status/various/Makefile.am +++ b/data/icons/status/various/Makefile.am @@ -4,7 +4,7 @@ install_DATA = \ ats.png \ ats_gray.png \ mounted.png \ - mute.png \ + muted.png \ not_mounted.png \ rclock.png \ rec.png \ diff --git a/data/icons/status/various/mute.png b/data/icons/status/various/muted.png similarity index 100% rename from data/icons/status/various/mute.png rename to data/icons/status/various/muted.png diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp index 51a047c64..41de6b899 100644 --- a/src/gui/audiomute.cpp +++ b/src/gui/audiomute.cpp @@ -37,7 +37,7 @@ #include -CAudioMute::CAudioMute():CComponentsPicture(0, 0, NEUTRINO_ICON_BUTTON_MUTE) +CAudioMute::CAudioMute():CComponentsPicture(0, 0, NEUTRINO_ICON_MUTED) { y_old = -1; paint_bg = false; diff --git a/src/gui/volumebar.cpp b/src/gui/volumebar.cpp index 34925f0c8..1f057b6e0 100644 --- a/src/gui/volumebar.cpp +++ b/src/gui/volumebar.cpp @@ -345,7 +345,7 @@ void CVolumeHelper::initInfoClock(Font* font) void CVolumeHelper::initMuteIcon() { - frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE, &mute_dx, &mute_dy); + frameBuffer->getIconSize(NEUTRINO_ICON_MUTED, &mute_dx, &mute_dy); mute_ax = sw - mute_dx; mute_ay = y; } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 66a33c9a2..48598f695 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -111,7 +111,6 @@ #define NEUTRINO_ICON_NETWORK "network" #define NEUTRINO_ICON_LCD "lcd" #define NEUTRINO_ICON_VOLUME "volume" -#define NEUTRINO_ICON_RCLOCK "rclock" #define NEUTRINO_ICON_PERSONALIZE "personalize" #define NEUTRINO_ICON_STAR_ON "star-on" #define NEUTRINO_ICON_STAR_OFF "star-off" @@ -273,6 +272,10 @@ #define NEUTRINO_ICON_PLAY_REPEAT_TRACK "mp_play_repeat_track" #define NEUTRINO_ICON_REW "mp_b-skip" +/* misc */ +#define NEUTRINO_ICON_MUTED "muted" +#define NEUTRINO_ICON_RCLOCK "rclock" + /* opkg manager */ #define NEUTRINO_ICON_CHECKMARK "checkmark" #define NEUTRINO_ICON_WARNING "warning"