From 8b0dc24e905fa4c3b573f841ea91e2c7bf8202d0 Mon Sep 17 00:00:00 2001 From: striper Date: Fri, 21 Oct 2011 09:39:08 +0000 Subject: [PATCH] - add new info buttons and use them git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1763 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/icons/Makefile.am | 2 ++ data/icons/info.png | Bin 334 -> 353 bytes data/icons/info_small.png | Bin 0 -> 330 bytes data/icons/information.png | Bin 0 -> 334 bytes src/gui/widget/icons.h | 4 +++- src/neutrino_menue.cpp | 4 ++-- 6 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 data/icons/info_small.png create mode 100644 data/icons/information.png diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index d5090991c..1a7804222 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -74,6 +74,8 @@ install_DATA = \ icon_red.png \ icon_yellow.png \ info.png \ + info_small.png \ + information.png \ ird_green.png \ ird_white.png \ ird_yellow.png \ diff --git a/data/icons/info.png b/data/icons/info.png index 5393adb6495a009a0353928804ac9611d3809e9a..633a82cf62ec1c5308219371e5158da20e7a6590 100644 GIT binary patch delta 326 zcmV-M0lEIp0^tIXB!2;OQb$4nuFf3k0000mP)t-stf{O_Mof5kc#@KmVq#)%ZEuBx zg`1t5+}hm4zQp|g{9IXF)Y8;!W^AOQq zL;#2d9Y_EG010qNS#tmY3labT3lag+-G2N4000McNliru+kXlR6gLAqy(7*5005my zL_t&-(~ZwP3IZ_@1>o@p{;<2Hn95GPLlzdqB7uRl+t^##i(RghZqDIBY_`q5i5Rfk z*L}QUm?2u0)uv`m&7;Oq$L!51-;g_X@1m(-XPNo<)anfM%pvNa!ea1Z@&vTWUOBvU z$4IT93elrdBtL6IWMlG3dx3_i>p!#=5e2G4K~i|20c41Jhx-DPxZ{VUcK}@D{-0Zx Y8O7`RG;{DS|(0K=v;I_H6+oCO|{#S9GGLLkg|>2BR0 zpx`=B7sn8Z%b^n%@*Oe|XsdUecGl6U?V)77fr>=V<||4c+%L^J{-B^^=hbU{+Yh{* zS;6>gyJmBjS^U0x^LINx_~=_T;hk67hq-3)D|)>c?QJ$GUCCcCm8b3obGTN3Or!N` zhmTe{QDKcqHQ(AA7u;a9W!|{qB186Ktrb2Y2i7WAq!-URmfy%VV+vyN=}9g4_yje-3fuxSG0k&hcyWH~tq33j4~~Ra3RO+~$Bh(CrMKu6{1-oD!M< DCTojo diff --git a/data/icons/info_small.png b/data/icons/info_small.png new file mode 100644 index 0000000000000000000000000000000000000000..e2daf75abc4557c320d16ed5e4678a7fcde632a9 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFlFc7lzOp+!|I@k3^^>bP0l+XkKd>VIG literal 0 HcmV?d00001 diff --git a/data/icons/information.png b/data/icons/information.png new file mode 100644 index 0000000000000000000000000000000000000000..5393adb6495a009a0353928804ac9611d3809e9a GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ipR~9Cgl`Se?4w+n7qH|!1 z%9MPWZQUyKYgCTR()si6&+DDWch>35DU)B*rSj*L$(eaNPQOb&1NCy11o;L3hXIC7 zXLQa3ML7#RB8wRqxP?HN@zUM8KS05Co-U3d5|=|KEaW?6AkbFtIPI*XQ`j9!%Naaf{an^LB{Ts5Dxr)+ literal 0 HcmV?d00001 diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 771353d69..5681d8ba8 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -33,6 +33,8 @@ #define NEUTRINO_ICON_BUTTON_DBOX_SMALL "dbox_small" #define NEUTRINO_ICON_BUTTON_HELP "help" #define NEUTRINO_ICON_BUTTON_HELP_SMALL "help_small" +#define NEUTRINO_ICON_BUTTON_INFO "info" +#define NEUTRINO_ICON_BUTTON_INFO_SMALL "info_small" #define NEUTRINO_ICON_BUTTON_HOME "home" #define NEUTRINO_ICON_BUTTON_MUTE "mute" #define NEUTRINO_ICON_BUTTON_MUTE_SMALL "mute_small" @@ -83,7 +85,7 @@ #define NEUTRINO_ICON_FILE "file" #define NEUTRINO_ICON_FOLDER "folder" #define NEUTRINO_ICON_GAMES "games" -#define NEUTRINO_ICON_INFO "info" +#define NEUTRINO_ICON_INFO "information" #define NEUTRINO_ICON_KEYBINDING "keybinding" #define NEUTRINO_ICON_LOCK "lock" #define NEUTRINO_ICON_HIDDEN "hidden" diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index d6639cf51..57d5c43ac 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -131,7 +131,7 @@ void CNeutrinoApp::InitMainMenu(CMenuWidget &mainMenu, CMenuWidget &mainSettings mainMenu.addItem( new CMenuSeparator(CMenuSeparator::LINE) ); // start of infomenu if (g_settings.show_infomenu == 0) - mainMenu.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL )); + mainMenu.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info, NEUTRINO_ICON_BUTTON_INFO_SMALL )); // end of infomenu /*if(system_rev != 10)*/ @@ -262,7 +262,7 @@ void CNeutrinoApp::InitServiceSettings(CMenuWidget &service) // // start infomenu in service if (g_settings.show_infomenu == 1) - service.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP_SMALL )); + service.addItem(new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info, NEUTRINO_ICON_BUTTON_INFO_SMALL )); // end of infomenu in service //softupdate