mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

All icon file names moved to icons.h; .raw extension removed from icon names

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@219 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 95130dee5a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-29 (Fri, 29 Jan 2010)
This commit is contained in:
[CST] Focus
2010-01-29 14:09:57 +00:00
parent d92d178def
commit 2e041bd948
36 changed files with 271 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/widget/colorchooser.cpp
View File

@@ -44,6 +44,7 @@
#include <gui/color.h>
#include <gui/widget/messagebox.h>
#include "gui/widget/icons.h"
#define ROUND_RADIUS 8
@@ -53,10 +54,10 @@
#define VALUE_ALPHA 3
static const char * const iconnames[4] = {
"volumeslider2red.raw",
"volumeslider2green.raw",
"volumeslider2blue.raw",
"volumeslider2alpha.raw"
NEUTRINO_ICON_VOLUMESLIDER2RED,
NEUTRINO_ICON_VOLUMESLIDER2GREEN,
NEUTRINO_ICON_VOLUMESLIDER2BLUE,
NEUTRINO_ICON_VOLUMESLIDER2ALPHA
};
static const neutrino_locale_t colorchooser_names[4] =
@@ -249,8 +250,8 @@ void CColorChooser::paintSlider(int px, int py, unsigned char *spos, const neutr
if (!spos)
return;
frameBuffer->paintBoxRel(px+70,py,120,mheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintIcon("volumebody.raw",px+70,py+2+mheight/4);
frameBuffer->paintIcon(selected ? iconname : "volumeslider2.raw",px+73+(*spos),py+mheight/4);
frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY,px+70,py+2+mheight/4);
frameBuffer->paintIcon(selected ? iconname : NEUTRINO_ICON_VOLUMESLIDER2,px+73+(*spos),py+mheight/4);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px,py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8
}

2
src/gui/widget/hintbox.h
View File

@@ -63,7 +63,7 @@ class CHintBox
public:
// Text is UTF-8 encoded
CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = "info.raw");
CHintBox(const neutrino_locale_t Caption, const char * const Text, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
~CHintBox(void);
bool has_scrollbar(void);

3
src/gui/widget/hintboxext.h
View File

@@ -37,6 +37,7 @@
#include <system/localize.h>
#include <gui/widget/drawable.h>
#include <gui/widget/icons.h>
#include <string>
#include <vector>
@@ -67,7 +68,7 @@ class CHintBoxExt
public:
CHintBoxExt(const neutrino_locale_t Caption, const char * const Text, const int Width, const char * const Icon);
CHintBoxExt(const neutrino_locale_t Caption, ContentLines& lines, const int Width = 450, const char * const Icon = "info.raw");
CHintBoxExt(const neutrino_locale_t Caption, ContentLines& lines, const int Width = 450, const char * const Icon = NEUTRINO_ICON_INFO);
~CHintBoxExt(void);

142
src/gui/widget/icons.h
View File

@@ -2,7 +2,7 @@
#define __gui_widget_icons_h__
/*
* $Header: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/widget/icons.h,v 1.18 2009/10/13 19:08:12 dbt Exp $
* $Header: /cvs/tuxbox/apps/tuxbox/neutrino/src/gui/widget/icons.h,v 1.21 2009/12/15 09:51:23 dbt Exp $
*
* (C) 2003 by thegoodguy <thegoodguy@berlios.de>
*
@@ -24,62 +24,106 @@
/* icon files */
#define NEUTRINO_ICON_BUTTON_BLUE "blau.raw"
#define NEUTRINO_ICON_BUTTON_GREEN "gruen.raw"
#define NEUTRINO_ICON_BUTTON_RED "rot.raw"
#define NEUTRINO_ICON_BUTTON_YELLOW "gelb.raw"
#define NEUTRINO_ICON_BUTTON_BLUE "blau"
#define NEUTRINO_ICON_BUTTON_GREEN "gruen"
#define NEUTRINO_ICON_BUTTON_RED "rot"
#define NEUTRINO_ICON_BUTTON_YELLOW "gelb"
#define NEUTRINO_ICON_BUTTON_DBOX "dbox.raw"
#define NEUTRINO_ICON_BUTTON_DBOX_SMALL "dbox_small.raw"
#define NEUTRINO_ICON_BUTTON_HELP "help.raw"
#define NEUTRINO_ICON_BUTTON_HELP_SMALL "help_small.raw"
#define NEUTRINO_ICON_BUTTON_HOME "home.raw"
#define NEUTRINO_ICON_BUTTON_MUTE "mute.raw"
#define NEUTRINO_ICON_BUTTON_MUTE_SMALL "mute_small.raw"
#define NEUTRINO_ICON_BUTTON_POWER "power.raw"
#define NEUTRINO_ICON_BUTTON_DBOX "dbox"
#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_HOME "home"
#define NEUTRINO_ICON_BUTTON_MUTE "mute"
#define NEUTRINO_ICON_BUTTON_MUTE_SMALL "mute_small"
#define NEUTRINO_ICON_BUTTON_POWER "power"
#define NEUTRINO_ICON_BUTTON_OKAY "ok.raw"
#define NEUTRINO_ICON_BUTTON_OKAY_SMALL "ok_small.raw"
#define NEUTRINO_ICON_BUTTON_OKAY "ok"
#define NEUTRINO_ICON_BUTTON_OKAY_SMALL "ok_small"
#define NEUTRINO_ICON_BUTTON_0 "0.raw"
#define NEUTRINO_ICON_BUTTON_1 "1.raw"
#define NEUTRINO_ICON_BUTTON_2 "2.raw"
#define NEUTRINO_ICON_BUTTON_3 "3.raw"
#define NEUTRINO_ICON_BUTTON_4 "4.raw"
#define NEUTRINO_ICON_BUTTON_5 "5.raw"
#define NEUTRINO_ICON_BUTTON_6 "6.raw"
#define NEUTRINO_ICON_BUTTON_7 "7.raw"
#define NEUTRINO_ICON_BUTTON_8 "8.raw"
#define NEUTRINO_ICON_BUTTON_9 "9.raw"
#define NEUTRINO_ICON_BUTTON_0 "0"
#define NEUTRINO_ICON_BUTTON_1 "1"
#define NEUTRINO_ICON_BUTTON_2 "2"
#define NEUTRINO_ICON_BUTTON_3 "3"
#define NEUTRINO_ICON_BUTTON_4 "4"
#define NEUTRINO_ICON_BUTTON_5 "5"
#define NEUTRINO_ICON_BUTTON_6 "6"
#define NEUTRINO_ICON_BUTTON_7 "7"
#define NEUTRINO_ICON_BUTTON_8 "8"
#define NEUTRINO_ICON_BUTTON_9 "9"
#define NEUTRINO_ICON_BUTTON_TOP "up.raw"
#define NEUTRINO_ICON_BUTTON_TOP_SMALL "up_small.raw"
#define NEUTRINO_ICON_BUTTON_RIGHT "right.raw"
#define NEUTRINO_ICON_BUTTON_DOWN "down.raw"
#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small.raw"
#define NEUTRINO_ICON_BUTTON_LEFT "left.raw"
#define NEUTRINO_ICON_BUTTON_TOP "up"
#define NEUTRINO_ICON_BUTTON_TOP_SMALL "up_small"
#define NEUTRINO_ICON_BUTTON_RIGHT "right"
#define NEUTRINO_ICON_BUTTON_DOWN "down"
#define NEUTRINO_ICON_BUTTON_DOWN_SMALL "down_small"
#define NEUTRINO_ICON_BUTTON_LEFT "left"
#define NEUTRINO_ICON_BUTTON_PLUS "plus.raw"
#define NEUTRINO_ICON_BUTTON_MINUS "minus.raw"
#define NEUTRINO_ICON_BUTTON_PLUS "plus"
#define NEUTRINO_ICON_BUTTON_MINUS "minus"
#define NEUTRINO_ICON_ERROR "error.raw"
#define NEUTRINO_ICON_FILE "file.raw"
#define NEUTRINO_ICON_GAMES "games.raw"
#define NEUTRINO_ICON_INFO "info.raw"
#define NEUTRINO_ICON_MOUNTED "mounted.raw"
#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted.raw"
#define NEUTRINO_ICON_RECORDING "recording.raw"
#define NEUTRINO_ICON_SETTINGS "settings.raw"
#define NEUTRINO_ICON_SHELL "shell.raw"
#define NEUTRINO_ICON_UPNP "upnp.raw"
#define NEUTRINO_ICON_PROTECTING "protecting.raw"
#define NEUTRINO_ICON_EPGINFO "epginfo.raw"
#define NEUTRINO_ICON_UPDATE "softupdate.raw"
#define NEUTRINO_ICON_FEATURES "features.raw"
#define NEUTRINO_ICON_16_9 "16_9"
#define NEUTRINO_ICON_16_9_GREY "16_9_gray"
#define NEUTRINO_ICON_AUDIO "audio"
#define NEUTRINO_ICON_COLORS "colors"
#define NEUTRINO_ICON_DD "dd"
#define NEUTRINO_ICON_DD_AVAIL "dd_avail"
#define NEUTRINO_ICON_DD_GREY "dd_gray"
#define NEUTRINO_ICON_EPGINFO "epginfo"
#define NEUTRINO_ICON_ERROR "error"
#define NEUTRINO_ICON_FEATURES "features"
#define NEUTRINO_ICON_FILE "file"
#define NEUTRINO_ICON_FOLDER "folder"
#define NEUTRINO_ICON_GAMES "games"
#define NEUTRINO_ICON_INFO "info"
#define NEUTRINO_ICON_KEYBINDING "keybinding"
#define NEUTRINO_ICON_LOCK "lock"
#define NEUTRINO_ICON_HIDDEN "hidden"
#define NEUTRINO_ICON_MOUNTED "mounted"
#define NEUTRINO_ICON_MP3 "mp3"
#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted"
#define NEUTRINO_ICON_PAUSE "pause"
#define NEUTRINO_ICON_PLAY "play"
#define NEUTRINO_ICON_PROTECTING "protecting"
#define NEUTRINO_ICON_QUESTION "question"
#define NEUTRINO_ICON_RADIOMODE "radiomode"
#define NEUTRINO_ICON_RECORDING "recording"
#define NEUTRINO_ICON_SETTINGS "settings"
#define NEUTRINO_ICON_SHELL "shell"
#define NEUTRINO_ICON_STREAMING "streaming"
#define NEUTRINO_ICON_TIMER "timer"
#define NEUTRINO_ICON_UPDATE "softupdate"
#define NEUTRINO_ICON_UPNP "upnp"
#define NEUTRINO_ICON_VIDEO "video"
#define NEUTRINO_ICON_VOLUMEBODY "volumebody"
#define NEUTRINO_ICON_VOLUMESLIDER2 "volumeslider2"
#define NEUTRINO_ICON_VOLUMESLIDER2ALPHA "volumeslider2alpha"
#define NEUTRINO_ICON_VOLUMESLIDER2BLUE "volumeslider2blue"
#define NEUTRINO_ICON_VOLUMESLIDER2GREEN "volumeslider2green"
#define NEUTRINO_ICON_VOLUMESLIDER2RED "volumeslider2red"
#define NEUTRINO_ICON_VTXT "vtxt"
#define NEUTRINO_ICON_VTXT_GREY "vtxt_gray"
#define NEUTRINO_ICON_PARTITION "partition"
#define NEUTRINO_ICON_SUBT "subt"
#define NEUTRINO_ICON_SUBT_GREY "subt_gray"
#define NEUTRINO_ICON_AUTO_SHIFT "ats"
#define NEUTRINO_ICON_NUMERIC_PAD "numericpad"
#define NEUTRINO_ICON_SCRAMBLED "ca"
#define NEUTRINO_ICON_BOOKMARK_MANAGER "bookmarkmanager"
#define NEUTRINO_ICON_BORDER_UL "border_ul"
#define NEUTRINO_ICON_BORDER_LR "border_lr"
#define NEUTRINO_ICON_MAINMENU "mainmenue"
#define NEUTRINO_ICON_LANGUAGE "language"
#define NEUTRINO_ICON_NETWORK "network"
#define NEUTRINO_ICON_LCD "lcd"
#define NEUTRINO_ICON_VOLUME "volume"
#define DUMMY_ICON "dummy.raw"
#define DUMMY_ICON "dummy"
#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green"
#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray"
/* icon widths */
#define NEUTRINO_ICON_BUTTON_BLUE_WIDTH 16
@@ -87,8 +131,6 @@
#define NEUTRINO_ICON_BUTTON_RED_WIDTH 16
#define NEUTRINO_ICON_BUTTON_YELLOW_WIDTH 16
#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green.raw"
#define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray.raw"
/* misc */

4
src/gui/widget/lcdcontroler.cpp
View File

@@ -326,8 +326,8 @@ void CLcdControler::paintSlider(int x, int y, unsigned int spos, float factor, c
char wert[5];
frameBuffer->paintBoxRel(x + startx, y, 120, mheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintIcon("volumebody.raw", x + startx, y+2+mheight/4);
frameBuffer->paintIcon(selected ? "volumeslider2blue.raw" : "volumeslider2.raw", (int)(x + (startx+3)+(spos / factor)), y+mheight/4);
frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, x + startx, y+2+mheight/4);
frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(x + (startx+3)+(spos / factor)), y+mheight/4);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(x, y+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8
sprintf(wert, "%3d", spos); // UTF-8 encoded

2
src/gui/widget/messagebox.cpp
View File

@@ -297,5 +297,5 @@ int ShowMsgUTF(const neutrino_locale_t Caption, const std::string & Text, const
void DisplayErrorMessage(const char * const ErrorMsg)
{
ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, "error.raw");
ShowMsgUTF(LOCALE_MESSAGEBOX_ERROR, ErrorMsg, CMessageBox::mbrCancel, CMessageBox::mbCancel, NEUTRINO_ICON_ERROR);
}

5
src/gui/widget/rgbcsynccontroler.cpp
View File

@@ -41,6 +41,7 @@
#include <gui/color.h>
#include <gui/widget/messagebox.h>
#include "gui/widget/icons.h"
#include <global.h>
#include <neutrino.h>
@@ -179,8 +180,8 @@ void CRGBCSyncControler::paintSlider(int px, int py, unsigned int spos, float fa
char wert[5];
frameBuffer->paintBoxRel(px + startx, py, 120, mheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintIcon("volumebody.raw", px + startx, py+2+mheight/4);
frameBuffer->paintIcon(selected ? "volumeslider2blue.raw" : "volumeslider2.raw", (int)(px + (startx+3)+(spos / factor)), py+mheight/4);
frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, px + startx, py+2+mheight/4);
frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(px + (startx+3)+(spos / factor)), py+mheight/4);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8
sprintf(wert, "%3d", spos); // UTF-8 encoded

2
src/gui/widget/stringinput.cpp
View File

@@ -683,7 +683,7 @@ void CStringInputSMS::paint()
{
CStringInput::paint();
frameBuffer->paintIcon("numericpad.raw", x+20+140, y+ hheight+ mheight+ iheight* 3+ 30, 0, COL_MENUCONTENT);
frameBuffer->paintIcon(NEUTRINO_ICON_NUMERIC_PAD, x+20+140, y+ hheight+ mheight+ iheight* 3+ 30, 0, COL_MENUCONTENT);
frameBuffer->paintBoxRel(x,y+height-25, width,25, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_BOTTOM);
frameBuffer->paintHLine(x, x+width, y+height-25, COL_INFOBAR_SHADOW_PLUS_0);

5
src/gui/widget/stringinput.h
View File

@@ -37,6 +37,7 @@
#include <driver/framebuffer.h>
#include <system/localize.h>
#include <gui/widget/icons.h>
#include <string>
@@ -128,9 +129,9 @@ class CPINInput : public CStringInput
virtual void paintChar(int pos);
public:
CPINInput(const neutrino_locale_t Name, char* Value, int Size, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE, const char * const Valid_Chars= (const char *)"0123456789", CChangeObserver* Observ = NULL)
: CStringInput(Name, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *)"lock.raw") {};
: CStringInput(Name, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *) NEUTRINO_ICON_LOCK) {};
CPINInput(char * Head, char* Value, int Size, const neutrino_locale_t Hint_1 = NONEXISTANT_LOCALE, const neutrino_locale_t Hint_2 = NONEXISTANT_LOCALE, const char * const Valid_Chars= (const char *)"0123456789", CChangeObserver* Observ = NULL)
: CStringInput(Head, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *)"lock.raw") {};
: CStringInput(Head, (char *)Value, Size, Hint_1, Hint_2, Valid_Chars, Observ, (char *) NEUTRINO_ICON_LOCK) {};
int exec( CMenuTarget* parent, const std::string & actionKey );
};

5
src/gui/widget/vfdcontroler.cpp
View File

@@ -41,6 +41,7 @@
#include <gui/color.h>
#include <gui/widget/messagebox.h>
#include "gui/widget/icons.h"
#include <global.h>
#include <neutrino.h>
@@ -260,8 +261,8 @@ void CVfdControler::paintSlider(int px, int py, unsigned int spos, float factor,
char wert[5];
frameBuffer->paintBoxRel(px + startx, py, 120, mheight, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintIcon("volumebody.raw", px + startx, py+2+mheight/4);
frameBuffer->paintIcon(selected ? "volumeslider2blue.raw" : "volumeslider2.raw", (int)(px + (startx+3)+(spos / factor)), py+mheight/4);
frameBuffer->paintIcon(NEUTRINO_ICON_VOLUMEBODY, px + startx, py+2+mheight/4);
frameBuffer->paintIcon(selected ? NEUTRINO_ICON_VOLUMESLIDER2BLUE : NEUTRINO_ICON_VOLUMESLIDER2, (int)(px + (startx+3)+(spos / factor)), py+mheight/4);
g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(px, py+mheight, width, g_Locale->getText(text), COL_MENUCONTENT, 0, true); // UTF-8
sprintf(wert, "%3d", spos); // UTF-8 encoded