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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-09-01 19:46:10 +02:00
parent 3dd97a9884 bfd2b2da05
commit 2dcc32acd2
163 changed files with 4066 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/filebrowser.cpp
View File

@@ -846,8 +846,12 @@ bool CFileBrowser::exec(const char * const dirname)
std::replace(name.begin(), name.end(), '\\', '/');
paintHead();
ChangeDir(name);
paint();
int selection = -1;
if (name == Path)
selection = selected;
ChangeDir(name, selection);
//paint();
paintFoot();
frameBuffer->blit();
@@ -1073,7 +1077,10 @@ bool CFileBrowser::exec(const char * const dirname)
ChangeDir(filelist[selected].Url);
else
#endif
{
selections.push_back(selected);
ChangeDir(filelist[selected].Name);
}
}
else
{
@@ -1236,7 +1243,7 @@ void CFileBrowser::paintItem(unsigned int pos)
{
int colwidth1, colwidth2, colwidth3;
int c_rad_small;
uint8_t color;
fb_pixel_t color;
fb_pixel_t bgcolor;
int ypos = y+ theight+0 + pos*fheight;
CFile * actual_file = NULL;
@@ -1244,14 +1251,14 @@ void CFileBrowser::paintItem(unsigned int pos)
if (liststart + pos == selected)
{
color = COL_MENUCONTENTSELECTED;
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
c_rad_small = RADIUS_SMALL;
// paintFoot();
}
else
{
color = COL_MENUCONTENT;//DARK;
color = COL_MENUCONTENT_TEXT;//DARK;
bgcolor = COL_MENUCONTENT_PLUS_0;//DARK;
c_rad_small = 0;
}
@@ -1264,8 +1271,14 @@ void CFileBrowser::paintItem(unsigned int pos)
actual_file = &filelist[liststart+pos];
if (actual_file->Marked)
{
color = COL_MENUCONTENTINACTIVE; //+= 2; FIXME
bgcolor = (liststart + pos == selected) ? COL_MENUCONTENTSELECTED_PLUS_2 : COL_MENUCONTENT_PLUS_2;
if (liststart + pos == selected) {
color = COL_MENUCONTENTINACTIVE_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_2;
}
else {
color = COL_MENUCONTENT_TEXT;
bgcolor = COL_MENUCONTENT_PLUS_2;
}
}
if (g_settings.filebrowser_showrights == 0 && S_ISREG(actual_file->Mode))
@@ -1290,7 +1303,7 @@ void CFileBrowser::paintItem(unsigned int pos)
case CFile::FILE_FLAC:
#endif
fileicon = NEUTRINO_ICON_MP3;
// color = COL_MENUCONTENT;
// color = COL_MENUCONTENT_TEXT;
break;
case CFile::FILE_DIR:
@@ -1502,7 +1515,7 @@ void CFileBrowser::paintFoot()
char cKey[2]={m_SMSKeyInput.getOldKey(),0};
cKey[0] = toupper(cKey[0]);
int len = fnt_small->getRenderWidth(cKey);
fnt_small->RenderString(x + width - 10 - len, by2 + foheight, len, cKey, COL_MENUHEAD, 0, true);
fnt_small->RenderString(x + width - 10 - len, by2 + foheight, len, cKey, COL_MENUHEAD_TEXT, 0, true);
}
}
}