mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-18 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h

Browse Source
This commit is contained in:
svenhoefer
2015-05-06 10:36:56 +02:00
parent 6e6d7ad765
commit 89a11de651
10 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_item_tvpic.cpp
View File

@@ -51,8 +51,8 @@ CComponentsPIP::CComponentsPIP( const int x_pos, const int y_pos, const int perc
//CComponentsPIP
screen_w = frameBuffer->getScreenWidth(true);
screen_h = frameBuffer->getScreenHeight(true);
pic_name = DATADIR;
pic_name += "/neutrino/icons/start.jpg";
pic_name = ICONSDIR;
pic_name += "/start.jpg";
//CComponents
x = x_pos;

2
src/gui/screensaver.cpp
View File

@@ -188,7 +188,7 @@ bool CScreenSaver::ReadDir()
str += "/";
str += (*dirpointer).d_name;
if ((string) dir_name == DATADIR "/neutrino/icons")
if ((string) dir_name == ICONSDIR)
{
/*
backward compatiblity:

4
src/gui/test_menu.cpp
View File

@@ -405,7 +405,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
}
else if (actionKey == "picture"){
if (pic == NULL)
pic = new CComponentsPicture (100, 100, 200, 100, DATADIR "/neutrino/icons/mp3-5.jpg");
pic = new CComponentsPicture (100, 100, 200, 100, ICONSDIR "/mp3-5.jpg");
if (!pic->isPainted() && !pic->isPicPainted())
pic->paint();
@@ -527,7 +527,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
// remove text item
// header->removeCCItem(CComponentsHeader::CC_HEADER_ITEM_TEXT); //then remove text item
// create picture object with the last x position of text
// CComponentsPicture *logo = new CComponentsPicture(logo_x, 0, 100, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(), "/share/tuxbox/neutrino/icons/hint_tvmode.png");
// CComponentsPicture *logo = new CComponentsPicture(logo_x, 0, 100, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(), ICONSDIR "/hint_tvmode.png");
// set the transparent background for picture item
// logo->doPaintBg(false);
// insert the ne object

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

@@ -292,6 +292,4 @@
#define NEUTRINO_ICON_BUTTON_LONGPRESS "longpress"
#define NEUTRINO_ICON_VARPATH "/var/share/tuxbox/neutrino/icons/" //alternatively path for user-defined icons
#endif /* __gui_widget_icons_h__ */