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

filebrowser: small design reworks ...

Browse Source 
* use OFFSET defines
* use CComponentsScrollbar
* rename some variables

Unfortunately we can't use CComponentsFooter, because
CComponentsFooter can't handle button_label_ext yet


Origin commit data
------------------
Commit: 7a3b4a0f05
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- filebrowser: small design reworks ...

* use OFFSET defines
* use CComponentsScrollbar
* rename some variables

Unfortunately we can't use CComponentsFooter, because
CComponentsFooter can't handle button_label_ext yet
This commit is contained in:
vanhofen
2017-05-30 01:24:21 +02:00
parent 7fd0d2c3f3
commit 58674dbd0e
2 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/gui/filebrowser.cpp
View File

@@ -268,19 +268,18 @@ void CFileBrowser::fontInit()
height = frameBuffer->getScreenHeightRel(); height = frameBuffer->getScreenHeightRel();
x = getScreenStartX(width); x = getScreenStartX(width);
theight = fnt_title->getHeight(); header_height = fnt_title->getHeight();
fheight = fnt_item->getHeight(); item_height = fnt_item->getHeight();
if (fheight == 0) if (item_height == 0)
fheight = 1; /* avoid div by zero on invalid font */ item_height = 1; /* avoid div by zero on invalid font */
//foheight = fnt_foot->getHeight()+6; //initial height value for buttonbar; TODO get value from buttonbar footer_height = paintFoot(false);
foheight = paintFoot(false); smskey_width = fnt_foot->getRenderWidth("M") + OFFSET_INNER_MID;
skwidth = 26;
liststart = 0; liststart = 0;
listmaxshow = std::max(1,(int)(height - theight - foheight)/fheight); listmaxshow = std::max(1,(int)(height - header_height - footer_height)/item_height);
//recalc height //recalc height
height = theight + listmaxshow * fheight + foheight; height = header_height + listmaxshow * item_height + footer_height;
y = getScreenStartY(height); y = getScreenStartY(height);
} }
@@ -1167,8 +1166,8 @@ void CFileBrowser::hide()
void CFileBrowser::paintItem(unsigned int pos) void CFileBrowser::paintItem(unsigned int pos)
{ {
int colwidth1, colwidth2, colwidth3; int col1_width, col2_width, col3_width;
int ypos = y+ theight+0 + pos*fheight; int ypos = y + header_height + pos*item_height;
CFile * actual_file = NULL; CFile * actual_file = NULL;
std::string fileicon; std::string fileicon;
unsigned int currpos = liststart + pos; unsigned int currpos = liststart + pos;
@@ -1176,7 +1175,7 @@ void CFileBrowser::paintItem(unsigned int pos)
if (currpos >= filelist.size()) if (currpos >= filelist.size())
{ {
// just paint an empty line // just paint an empty line
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x, ypos, width - SCROLLBAR_WIDTH, item_height, COL_MENUCONTENT_PLUS_0);
return; return;
} }
@@ -1196,15 +1195,15 @@ void CFileBrowser::paintItem(unsigned int pos)
i_radius = RADIUS_LARGE; i_radius = RADIUS_LARGE;
if (i_radius) if (i_radius)
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x, ypos, width - SCROLLBAR_WIDTH, item_height, COL_MENUCONTENT_PLUS_0);
frameBuffer->paintBoxRel(x,ypos, width- 15, fheight, bgcolor, i_radius); frameBuffer->paintBoxRel(x, ypos, width - SCROLLBAR_WIDTH, item_height, bgcolor, i_radius);
if (g_settings.filebrowser_showrights == 0 && S_ISREG(actual_file->Mode)) if (g_settings.filebrowser_showrights == 0 && S_ISREG(actual_file->Mode))
colwidth2 = 0; col2_width = 0;
else else
colwidth2 = fnt_item->getRenderWidth("rwxrwxrwx"); col2_width = fnt_item->getRenderWidth("rwxrwxrwx");
colwidth3 = fnt_item->getRenderWidth("222.222G"); col3_width = fnt_item->getRenderWidth("222.222G");
colwidth1 = width - 35 - colwidth2 - colwidth3 - 10; col1_width = width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - col3_width - OFFSET_INNER_MID - col2_width - OFFSET_INNER_MID;
if ( !actual_file->Name.empty() ) if ( !actual_file->Name.empty() )
{ {
@@ -1231,9 +1230,15 @@ void CFileBrowser::paintItem(unsigned int pos)
default: default:
fileicon = NEUTRINO_ICON_FILE; fileicon = NEUTRINO_ICON_FILE;
} }
frameBuffer->paintIcon(fileicon, x+5 , ypos + (fheight-16) / 2 );
fnt_item->RenderString(x + 35, ypos + fheight, colwidth1 - 10 , FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()), color); int icon_w = 0;
int icon_h = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_FILE, &icon_w, &icon_h);
frameBuffer->paintIcon(fileicon, x + OFFSET_INNER_MID, ypos, item_height);
int col1_offset = OFFSET_INNER_MID + icon_w + OFFSET_INNER_MID;
fnt_item->RenderString(x + col1_offset, ypos + item_height, col1_width - col1_offset, FILESYSTEM_ENCODING_TO_UTF8_STRING(actual_file->getFileName()), color);
if( S_ISREG(actual_file->Mode) ) if( S_ISREG(actual_file->Mode) )
{ {
@@ -1246,13 +1251,13 @@ void CFileBrowser::paintItem(unsigned int pos)
modestring[9] = 0; modestring[9] = 0;
fnt_item->RenderString(x + width - 25 - colwidth3 - colwidth2 , ypos+ fheight, colwidth2, modestring, color); fnt_item->RenderString(x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - col3_width - OFFSET_INNER_MID - col2_width , ypos + item_height, col2_width, modestring, color);
} }
#define GIGABYTE 1073741824LL #define GIGABYTE 1073741824LL
#define MEGABYTE 1048576LL #define MEGABYTE 1048576LL
#define KILOBYTE 1024LL #define KILOBYTE 1024LL
char tmpstr[256]; char sizestring[256];
const char *unit = ""; const char *unit = "";
int64_t factor = 0; int64_t factor = 0;
if (actual_file->Size >= GIGABYTE) if (actual_file->Size >= GIGABYTE)
@@ -1274,14 +1279,14 @@ void CFileBrowser::paintItem(unsigned int pos)
{ {
int a = actual_file->Size / factor; int a = actual_file->Size / factor;
int b = (actual_file->Size - a * factor) * 1000 / factor; int b = (actual_file->Size - a * factor) * 1000 / factor;
snprintf(tmpstr, sizeof(tmpstr), "%d.%03d%s", a, b, unit); snprintf(sizestring, sizeof(sizestring), "%d.%03d%s", a, b, unit);
} }
else else
snprintf(tmpstr,sizeof(tmpstr),"%d", (int)actual_file->Size); snprintf(sizestring,sizeof(sizestring),"%d", (int)actual_file->Size);
/* right align file size */ /* right align file size */
int sz_w = fnt_item->getRenderWidth(tmpstr); int sz_w = fnt_item->getRenderWidth(sizestring);
fnt_item->RenderString(x + width - sz_w - 25, ypos+ fheight, sz_w, tmpstr, color); fnt_item->RenderString(x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - sz_w, ypos + item_height, sz_w, sizestring, color);
} }
if(actual_file->isDir()) if(actual_file->isDir())
@@ -1292,7 +1297,7 @@ void CFileBrowser::paintItem(unsigned int pos)
strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&rawtime)); strftime(timestring, 18, "%d-%m-%Y %H:%M", gmtime(&rawtime));
/* right align directory time */ /* right align directory time */
int time_w = fnt_item->getRenderWidth(timestring); int time_w = fnt_item->getRenderWidth(timestring);
fnt_item->RenderString(x + width - time_w - 25, ypos+ fheight, time_w, timestring, color); fnt_item->RenderString(x + width - SCROLLBAR_WIDTH - OFFSET_INNER_MID - time_w, ypos + item_height, time_w, timestring, color);
} }
} }
} }
@@ -1317,16 +1322,16 @@ void CFileBrowser::paintHead()
/* too long? Leave out the "Filebrowser" or "Shoutcast" prefix /* too long? Leave out the "Filebrowser" or "Shoutcast" prefix
* the allocated space is sufficient since it is surely shorter than before */ * the allocated space is sufficient since it is surely shorter than before */
if (fnt_title->getRenderWidth(l_name) > width - 11) if (fnt_title->getRenderWidth(l_name) > width - 2*OFFSET_INNER_MID)
l = sprintf(l_name, "%s", FILESYSTEM_ENCODING_TO_UTF8_STRING(name).c_str()); l = sprintf(l_name, "%s", FILESYSTEM_ENCODING_TO_UTF8_STRING(name).c_str());
if (l_name[l - 1] == '/') if (l_name[l - 1] == '/')
l_name[--l] = '\0'; l_name[--l] = '\0';
/* still too long? the last part is probably more interesting than the first part... */ /* still too long? the last part is probably more interesting than the first part... */
while ((fnt_title->getRenderWidth(&l_name[i]) > width - 20) && (i < l)) while ((fnt_title->getRenderWidth(&l_name[i]) > width - 2*OFFSET_INNER_MID) && (i < l))
i++; i++;
CComponentsHeader header(x, y, width, theight, &l_name[i]); CComponentsHeader header(x, y, width, header_height, &l_name[i]);
header.paint(CC_SAVE_SCREEN_NO); header.paint(CC_SAVE_SCREEN_NO);
free(l_name); free(l_name);
@@ -1360,17 +1365,12 @@ bool chooserDir(std::string &setting_dir, bool test_dir, const char *action_str,
return false; return false;
} }
const struct button_label FileBrowserFilterButton[2] =
{
{ NEUTRINO_ICON_BUTTON_BLUE , LOCALE_FILEBROWSER_FILTER_INACTIVE },
{ NEUTRINO_ICON_BUTTON_BLUE , LOCALE_FILEBROWSER_FILTER_ACTIVE },
};
int CFileBrowser::paintFoot(bool show) int CFileBrowser::paintFoot(bool show)
{ {
int cnt,res; int cnt, res;
std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT); std::string sort_text = g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT);
sort_text += " ";
sort_text += g_Locale->getText(sortByNames[g_settings.filebrowser_sortmethod]); sort_text += g_Locale->getText(sortByNames[g_settings.filebrowser_sortmethod]);
int sort_text_len = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT)); int sort_text_len = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getRenderWidth(g_Locale->getText(LOCALE_MOVIEBROWSER_FOOT_SORT));
@@ -1380,65 +1380,72 @@ int CFileBrowser::paintFoot(bool show)
sort_text_len += len; sort_text_len += len;
neutrino_locale_t f_loc = LOCALE_FILEBROWSER_FILTER_INACTIVE; neutrino_locale_t locale_filebrowser_filter = LOCALE_FILEBROWSER_FILTER_INACTIVE;
if (Filter != NULL && use_filter) if (Filter != NULL && use_filter)
f_loc = LOCALE_FILEBROWSER_FILTER_ACTIVE; locale_filebrowser_filter = LOCALE_FILEBROWSER_FILTER_ACTIVE;
button_label_ext footerButtons_pm[] = { button_label_ext buttons_playlistmode[] = {
{ NEUTRINO_ICON_BUTTON_RED, LOCALE_FILEBROWSER_DELETE, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_RED, LOCALE_FILEBROWSER_DELETE, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_GREEN, LOCALE_FILEBROWSER_ADD, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_GREEN, LOCALE_FILEBROWSER_ADD, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_YELLOW, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, { NEUTRINO_ICON_BUTTON_YELLOW, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false },
{ NEUTRINO_ICON_BUTTON_BLUE, LOCALE_AUDIOPLAYER_SHUFFLE, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_BLUE, LOCALE_AUDIOPLAYER_SHUFFLE, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_OKAY, LOCALE_FILEBROWSER_SELECT, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_FILEBROWSER_SELECT, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false },
}; };
button_label_ext footerButtons[] = { button_label_ext buttons_filelistmode[] = {
{ NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false }, { NEUTRINO_ICON_BUTTON_RED, NONEXISTANT_LOCALE, sort_text.c_str(), sort_text_len, false },
{ NEUTRINO_ICON_BUTTON_OKAY, LOCALE_FILEBROWSER_SELECT, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_FILEBROWSER_SELECT, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_MUTE_SMALL, LOCALE_FILEBROWSER_DELETE, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_MUTE_SMALL, LOCALE_FILEBROWSER_DELETE, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_PLAY, LOCALE_FILEBROWSER_MARK, NULL, 0, false },
{ NEUTRINO_ICON_BUTTON_BLUE, f_loc, NULL, 0, false }, { NEUTRINO_ICON_BUTTON_BLUE, locale_filebrowser_filter, NULL, 0, false },
}; };
if (playlistmode) { if (playlistmode) {
cnt = sizeof(footerButtons_pm) / sizeof(button_label_ext); cnt = sizeof(buttons_playlistmode)/sizeof(button_label_ext);
if (!show) if (!show)
return paintButtons(footerButtons_pm, cnt, 0, 0, 0, 0, 0, false, NULL, NULL); return paintButtons(buttons_playlistmode, cnt, 0, 0, 0, 0, 0, false, NULL, NULL);
} else { } else {
cnt = sizeof(footerButtons) / sizeof(button_label_ext); cnt = sizeof(buttons_filelistmode)/sizeof(button_label_ext);
if (!show) if (!show)
return paintButtons(footerButtons, cnt, 0, 0, 0, 0, 0, false, NULL, NULL); return paintButtons(buttons_filelistmode, cnt, 0, 0, 0, 0, 0, false, NULL, NULL);
} }
int fowidth = width - skwidth; int footer_width = width - smskey_width;
if (filelist.empty())
if (filelist.empty()) { {
frameBuffer->paintBoxRel(x, y + height - foheight, width, foheight, COL_MENUFOOT_PLUS_0, RADIUS_MID, CORNER_BOTTOM); // show an empty footer
return foheight; frameBuffer->paintBoxRel(x, y + height - footer_height, width, footer_height, COL_MENUFOOT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
return footer_height;
} }
/*
We can't use CComponentsFooter because
CComponentsFooter can't handle button_label_ext
*/
if (playlistmode) if (playlistmode)
res = paintButtons(footerButtons_pm, Filter ? cnt : cnt - 1, x, y + height - foheight, width, foheight, fowidth); res = paintButtons(buttons_playlistmode, cnt, x, y + height - footer_height, width, footer_height, footer_width);
else else
res = paintButtons(footerButtons, Filter ? cnt : cnt - 1, x, y + height - foheight, width, foheight, fowidth); res = paintButtons(buttons_filelistmode, cnt, x, y + height - footer_height, width, footer_height, footer_width);
paintSMSKey(); paintSMSKey();
return res; return res;
} }
void CFileBrowser::paintSMSKey() void CFileBrowser::paintSMSKey()
{ {
int skheight = fnt_foot->getHeight(); int smskey_height = fnt_foot->getHeight();
//background //background
frameBuffer->paintBoxRel(x + width - skwidth, y + height - foheight, skwidth, foheight, COL_MENUFOOT_PLUS_0, RADIUS_MID, CORNER_BOTTOM_RIGHT); frameBuffer->paintBoxRel(x + width - smskey_width, y + height - footer_height, smskey_width, footer_height, COL_MENUFOOT_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM_RIGHT);
if(m_SMSKeyInput.getOldKey()!=0) if(m_SMSKeyInput.getOldKey()!=0)
{ {
char cKey[2] = {m_SMSKeyInput.getOldKey(), 0}; char cKey[2] = {m_SMSKeyInput.getOldKey(), 0};
cKey[0] = toupper(cKey[0]); cKey[0] = toupper(cKey[0]);
int len = fnt_foot->getRenderWidth(cKey); int len = fnt_foot->getRenderWidth(cKey);
fnt_foot->RenderString(x + width - skwidth, y + height - foheight + foheight/2 + skheight/2, len, cKey, COL_MENUHEAD_TEXT); fnt_foot->RenderString(x + width - smskey_width, y + height - footer_height + footer_height/2 + smskey_height/2, len, cKey, COL_MENUHEAD_TEXT);
} }
} }
@@ -1452,16 +1459,10 @@ void CFileBrowser::paint()
paintItem(count); paintItem(count);
//scrollbar //scrollbar
int ypos = y+ theight; int total_pages = ((filelist.size() - 1) / listmaxshow) + 1;
int sb = fheight* listmaxshow; int current_page = (selected / listmaxshow);
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0);
int sbc= ((filelist.size()- 1)/ listmaxshow)+ 1; paintScrollBar(x + width - SCROLLBAR_WIDTH, y + header_height, SCROLLBAR_WIDTH, item_height*listmaxshow, total_pages, current_page);
int sbs= (selected/listmaxshow);
if (sbc < 1)
sbc = 1;
frameBuffer->paintBoxRel(x+ width- 13, ypos+ 2+ sbs*(sb-4)/sbc, 11, (sb-4)/sbc, COL_SCROLLBAR_ACTIVE_PLUS_0, RADIUS_SMALL);
} }
void CFileBrowser::SMSInput(const neutrino_msg_t msg) void CFileBrowser::SMSInput(const neutrino_msg_t msg)

8
src/gui/filebrowser.h
View File

@@ -162,10 +162,10 @@ class CFileBrowser
unsigned int listmaxshow; unsigned int listmaxshow;
std::vector<unsigned int> selections; std::vector<unsigned int> selections;
int fheight; // Fonthoehe Filelist-Inhalt int item_height;
int theight; // Fonthoehe Filelist-Titel int header_height;
int foheight; // Hoehe der button leiste int footer_height;
int skwidth; // width SMSKey field int smskey_width;
std::string name; std::string name;
std::string base; std::string base;
std::string m_baseurl; std::string m_baseurl;