diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index 126146459..af678dc7c 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -276,8 +276,8 @@ unsigned int CFrameBuffer::getScreenHeight(bool real) unsigned int CFrameBuffer::getScreenWidthRel(bool force_small) { int percent = force_small ? WINDOW_SIZE_MIN_FORCED : g_settings.window_width; - // always reduce a possible detailline - return (g_settings.screen_EndX - g_settings.screen_StartX - 2*ConnectLineBox_Width) * percent / 100; + // always reduce a possible detailsline + return (g_settings.screen_EndX - g_settings.screen_StartX - 2*DETAILSLINE_WIDTH) * percent / 100; } unsigned int CFrameBuffer::getScreenHeightRel(bool force_small) diff --git a/src/driver/fb_generic.h b/src/driver/fb_generic.h index 2209e7f2d..b355377ce 100644 --- a/src/driver/fb_generic.h +++ b/src/driver/fb_generic.h @@ -75,7 +75,6 @@ typedef struct gradientData_t #define WINDOW_SIZE_MAX 100 // % #define WINDOW_SIZE_MIN 50 // % #define WINDOW_SIZE_MIN_FORCED 80 // % -#define ConnectLineBox_Width 16 // px /** Ausfuehrung als Singleton */ class CFrameBuffer : public sigc::trackable diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 20ff5a506..f3139410b 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -457,8 +457,8 @@ unsigned int CFrameBuffer::getScreenHeight(bool real) unsigned int CFrameBuffer::getScreenWidthRel(bool force_small) { int percent = force_small ? WINDOW_SIZE_MIN_FORCED : g_settings.window_width; - // always reduce a possible detailline - return (g_settings.screen_EndX - g_settings.screen_StartX - 2*ConnectLineBox_Width) * percent / 100; + // always reduce a possible detailsline + return (g_settings.screen_EndX - g_settings.screen_StartX - 2*DETAILSLINE_WIDTH) * percent / 100; } unsigned int CFrameBuffer::getScreenHeightRel(bool force_small) diff --git a/src/driver/framebuffer.h b/src/driver/framebuffer.h index 87d6375f0..74977914d 100644 --- a/src/driver/framebuffer.h +++ b/src/driver/framebuffer.h @@ -70,7 +70,6 @@ typedef struct gradientData_t #define WINDOW_SIZE_MAX 100 // % #define WINDOW_SIZE_MIN 50 // % #define WINDOW_SIZE_MIN_FORCED 80 // % -#define ConnectLineBox_Width 16 // px /** Ausfuehrung als Singleton */ class CFrameBuffer : public sigc::trackable diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 46ab4b8b9..673c8103c 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -270,8 +270,8 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey) m_height = m_theight + m_info_height + m_title_height + 2*m_buttonHeight + m_listmaxshow * m_fheight; // recalc height m_x = getScreenStartX( m_width ); - if (m_x < ConnectLineBox_Width) - m_x = ConnectLineBox_Width; + if (m_x < DETAILSLINE_WIDTH) + m_x = DETAILSLINE_WIDTH; m_y = getScreenStartY( m_height ); m_idletime=time(NULL); @@ -1467,8 +1467,8 @@ void CAudioPlayerGui::hide() // printf("hide(){\n"); if (m_visible) { - m_frameBuffer->paintBackgroundBoxRel(m_x - ConnectLineBox_Width, m_y + m_title_height, - m_width + ConnectLineBox_Width, m_height - m_title_height); + m_frameBuffer->paintBackgroundBoxRel(m_x - DETAILSLINE_WIDTH, m_y + m_title_height, + m_width + DETAILSLINE_WIDTH, m_height - m_title_height); clearItemID3DetailsLine(); m_frameBuffer->paintBackgroundBoxRel(m_x, m_y, m_width, m_title_height); m_visible = false; @@ -1788,7 +1788,7 @@ void CAudioPlayerGui::clearItemID3DetailsLine () void CAudioPlayerGui::paintItemID3DetailsLine (int pos) { - int xpos = m_x - ConnectLineBox_Width; + int xpos = m_x - DETAILSLINE_WIDTH; int ypos1 = m_y + m_title_height + m_theight + pos*m_fheight; int ypos2 = m_y + (m_height - m_info_height) + OFFSET_INTER; int ypos1a = ypos1 + (m_fheight / 2); @@ -1806,7 +1806,7 @@ void CAudioPlayerGui::paintItemID3DetailsLine (int pos) { //details line if (dline == NULL) - dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, m_fheight/2, m_info_height-RADIUS_LARGE*2); + dline = new CComponentsDetailsLine(xpos, ypos1a, ypos2a, m_fheight/2, m_info_height-RADIUS_LARGE*2); dline->paint(false); // paint id3 infobox diff --git a/src/gui/audioplayer.h b/src/gui/audioplayer.h index 7905d6e1c..af7c10df8 100644 --- a/src/gui/audioplayer.h +++ b/src/gui/audioplayer.h @@ -139,7 +139,7 @@ class CAudioPlayerGui : public CMenuTarget int m_idletime; bool m_screensaver; bool m_inetmode; - CComponentsDetailLine *dline; + CComponentsDetailsLine *dline; CComponentsInfoBox *ibox; SMSKeyInput m_SMSKeyInput; diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index 8fea35409..2c87de088 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -231,7 +231,7 @@ void CBEChannelWidget::paintDetails(int index) void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/) { - int xpos = x - ConnectLineBox_Width; + int xpos = x - DETAILSLINE_WIDTH; int ypos1 = y + theight+0 + pos*iheight; int ypos2 = y + height + OFFSET_INTER; int ypos1a = ypos1 + (fheight/2); @@ -244,7 +244,7 @@ void CBEChannelWidget::initItem2DetailsLine (int pos, int /*ch_index*/) if (pos >= 0) { if (dline == NULL) - dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, fheight/2, info_height-RADIUS_LARGE*2); + dline = new CComponentsDetailsLine(xpos, ypos1a, ypos2a, fheight/2, info_height-RADIUS_LARGE*2); dline->setYPos(ypos1a); //infobox @@ -318,8 +318,8 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* height = theight+footerHeight+listmaxshow*iheight; // recalc height x = getScreenStartX(width); - if (x < ConnectLineBox_Width) - x = ConnectLineBox_Width; + if (x < DETAILSLINE_WIDTH) + x = DETAILSLINE_WIDTH; y = getScreenStartY(height + info_height); diff --git a/src/gui/bedit/bouqueteditor_channels.h b/src/gui/bedit/bouqueteditor_channels.h index 09394fc64..8ee180710 100644 --- a/src/gui/bedit/bouqueteditor_channels.h +++ b/src/gui/bedit/bouqueteditor_channels.h @@ -48,7 +48,7 @@ class CBEChannelWidget : public CMenuTarget, public CListHelpers private: CFrameBuffer *frameBuffer; - CComponentsDetailLine *dline; + CComponentsDetailsLine *dline; CComponentsInfoBox *ibox; CComponentsFooter footer; enum state_ diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index c60372450..c80a182b2 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -202,8 +202,8 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & action height = theight+footerHeight+listmaxshow*iheight; // recalc height x = getScreenStartX(width); - if (x < ConnectLineBox_Width) - x = ConnectLineBox_Width; + if (x < DETAILSLINE_WIDTH) + x = DETAILSLINE_WIDTH; y = getScreenStartY(height + info_height); bouquetChannels = mode == CZapitClient::MODE_TV ? &(bouquet->tvChannels) : &(bouquet->radioChannels); @@ -288,7 +288,7 @@ void CBEChannelSelectWidget::paintDetails(int index) void CBEChannelSelectWidget::initItem2DetailsLine (int pos, int /*ch_index*/) { - int xpos = x - ConnectLineBox_Width; + int xpos = x - DETAILSLINE_WIDTH; int ypos1 = y + theight+0 + pos*iheight; int ypos2 = y + height + OFFSET_INTER; int ypos1a = ypos1 + (fheight/2); @@ -301,7 +301,7 @@ void CBEChannelSelectWidget::initItem2DetailsLine (int pos, int /*ch_index*/) if (pos >= 0) { if (dline == NULL) - dline = new CComponentsDetailLine(xpos, ypos1a, ypos2a, fheight/2, info_height-RADIUS_LARGE*2); + dline = new CComponentsDetailsLine(xpos, ypos1a, ypos2a, fheight/2, info_height-RADIUS_LARGE*2); dline->setYPos(ypos1a); //infobox diff --git a/src/gui/bedit/bouqueteditor_chanselect.h b/src/gui/bedit/bouqueteditor_chanselect.h index 91ed9fdb3..519b16397 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.h +++ b/src/gui/bedit/bouqueteditor_chanselect.h @@ -49,7 +49,7 @@ class CBEChannelSelectWidget : public CListBox enum{SORT_ALPHA,SORT_FREQ,SORT_SAT,SORT_CH_NUMBER, SORT_END}; CZapitClient::channelsMode mode; bool isChannelInBouquet( int index); - CComponentsDetailLine *dline; + CComponentsDetailsLine *dline; CComponentsInfoBox *ibox; CComponentsFooter footer; uint getItemCount(); diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 9f8fc22be..bb016b2e1 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -485,7 +485,7 @@ void CChannelList::calcSize() pig_on_win = ( (g_settings.channellist_additional == 2) /* with miniTV */ && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) ); // calculate width - full_width = pig_on_win ? (frameBuffer->getScreenWidth()-2*ConnectLineBox_Width) : frameBuffer->getScreenWidthRel(); + full_width = pig_on_win ? (frameBuffer->getScreenWidth()-2*DETAILSLINE_WIDTH) : frameBuffer->getScreenWidthRel(); if (g_settings.channellist_additional) width = full_width / 3 * 2; @@ -502,8 +502,8 @@ void CChannelList::calcSize() // calculate x position x = getScreenStartX(full_width); - if (x < ConnectLineBox_Width) - x = ConnectLineBox_Width; + if (x < DETAILSLINE_WIDTH) + x = DETAILSLINE_WIDTH; // calculate header height const int pic_h = 39; @@ -1652,14 +1652,14 @@ void CChannelList::paintItem2DetailsLine (int pos) if (!g_settings.channellist_show_infobox) return; - int xpos = x - ConnectLineBox_Width; + int xpos = x - DETAILSLINE_WIDTH; int ypos1 = y + theight + pos*fheight + (fheight/2); int ypos2 = y + height + OFFSET_INTER + (info_height/2); // paint Line if detail info (and not valid list pos) if (pos >= 0) { if (dline == NULL) - dline = new CComponentsDetailLine(xpos, ypos1, ypos2, fheight/2, info_height-RADIUS_LARGE*2); + dline = new CComponentsDetailsLine(xpos, ypos1, ypos2, fheight/2, info_height-RADIUS_LARGE*2); dline->paint(false); } } diff --git a/src/gui/channellist.h b/src/gui/channellist.h index aa9933030..f5addbe68 100644 --- a/src/gui/channellist.h +++ b/src/gui/channellist.h @@ -104,7 +104,7 @@ private: ZapitChannelList *chanlist; CBouquet *bouquet; CZapProtection* zapProtection; - CComponentsDetailLine *dline; + CComponentsDetailsLine *dline; int full_width; int width; diff --git a/src/gui/components/cc_detailsline.cpp b/src/gui/components/cc_detailsline.cpp index cb86eb14a..81da16c5e 100644 --- a/src/gui/components/cc_detailsline.cpp +++ b/src/gui/components/cc_detailsline.cpp @@ -35,15 +35,15 @@ using namespace std; -//sub class CComponentsDetailLine from CComponents -CComponentsDetailLine::CComponentsDetailLine( const int& x_pos, const int& y_pos_top, +//sub class CComponentsDetailsLine from CComponents +CComponentsDetailsLine::CComponentsDetailsLine( const int& x_pos, const int& y_pos_top, const int& y_pos_down, const int& h_mark_top_, const int& h_mark_down_, fb_pixel_t color_line, fb_pixel_t color_shadow) { initVarDline(x_pos, y_pos_top, y_pos_down, h_mark_top_, h_mark_down_, color_line, color_shadow); } -void CComponentsDetailLine::initVarDline( const int& x_pos, const int& y_pos_top, +void CComponentsDetailsLine::initVarDline( const int& x_pos, const int& y_pos_top, const int& y_pos_down, const int& h_mark_top_, const int& h_mark_down_, fb_pixel_t color_line, fb_pixel_t color_shadow) { @@ -53,20 +53,20 @@ void CComponentsDetailLine::initVarDline( const int& x_pos, const int& y_pos_top col_shadow = color_shadow; col_body = color_line; - //CComponentsDetailLine + //CComponentsDetailsLine y_down = y_pos_down; h_mark_top = h_mark_top_; h_mark_down = h_mark_down_; shadow_w = 1; - //CComponentsDetailLine + //CComponentsDetailsLine thickness = 4; /* MUST be an even value! */ cc_body_gradient_enable = false; } -CComponentsDetailLine::~CComponentsDetailLine() +CComponentsDetailsLine::~CComponentsDetailsLine() { } @@ -86,7 +86,7 @@ CComponentsDetailLine::~CComponentsDetailLine() //paint details line with current parameters -void CComponentsDetailLine::paint(bool do_save_bg) +void CComponentsDetailsLine::paint(bool do_save_bg) { hide(); if (hasChanges()) @@ -139,7 +139,7 @@ void CComponentsDetailLine::paint(bool do_save_bg) //synchronize colors for details line //This is usefull if the system colors are changed during runtime //so you can ensure correct applied system colors in relevant objects with unchanged instances. -void CComponentsDetailLine::syncSysColors() +void CComponentsDetailsLine::syncSysColors() { col_body = COL_FRAME_PLUS_0; col_shadow = COL_SHADOW_PLUS_0; diff --git a/src/gui/components/cc_detailsline.h b/src/gui/components/cc_detailsline.h index dfea467bd..be07ef57f 100644 --- a/src/gui/components/cc_detailsline.h +++ b/src/gui/components/cc_detailsline.h @@ -37,7 +37,7 @@ Not usable as CCItem! */ -class CComponentsDetailLine : public CComponents +class CComponentsDetailsLine : public CComponents { private: ///property: line thickness @@ -55,10 +55,10 @@ class CComponentsDetailLine : public CComponents fb_pixel_t color_line, fb_pixel_t color_shadow); public: - CComponentsDetailLine( const int& x_pos = 1,const int& y_pos_top = 1, const int& y_pos_down = 1, + CComponentsDetailsLine( const int& x_pos = 1,const int& y_pos_top = 1, const int& y_pos_down = 1, const int& h_mark_top_ = CC_HEIGHT_MIN , const int& h_mark_down_ = CC_HEIGHT_MIN, fb_pixel_t color_line = COL_FRAME_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0); - ~CComponentsDetailLine(); + ~CComponentsDetailsLine(); ///set colors void setColors(fb_pixel_t color_line, fb_pixel_t color_shadow){col_body = color_line; col_shadow = color_shadow;}; diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 2e3c0780f..f55f994ab 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -1530,12 +1530,12 @@ void CMovieBrowser::refreshDetailsLine(int pos) int hheight = m_pcBrowser->getHeaderListHeight(); int theight = m_pcBrowser->getTitleHeight(); - int xpos = m_cBoxFrameBrowserList.iX - ConnectLineBox_Width; + int xpos = m_cBoxFrameBrowserList.iX - DETAILSLINE_WIDTH; int ypos1 = m_cBoxFrameBrowserList.iY + hheight + theight + OFFSET_INNER_MID + pos*fheight + (fheight/2); int ypos2 = m_cBoxFrameInfo1.iY + (m_cBoxFrameInfo1.iHeight/2); if (m_detailsLine == NULL) - m_detailsLine = new CComponentsDetailLine(); + m_detailsLine = new CComponentsDetailsLine(); m_detailsLine->setDimensionsAll(xpos, ypos1, ypos2, fheight/2, m_cBoxFrameInfo1.iHeight-2*RADIUS_LARGE); m_detailsLine->paint(true); diff --git a/src/gui/moviebrowser/mb.h b/src/gui/moviebrowser/mb.h index 762fba5c6..dd1d1fd41 100644 --- a/src/gui/moviebrowser/mb.h +++ b/src/gui/moviebrowser/mb.h @@ -164,7 +164,7 @@ class CMovieBrowser : public CMenuTarget, public CProgressSignals CBox m_cBoxFrameTitleRel; CComponentsHeader *m_header; - CComponentsDetailLine *m_detailsLine; + CComponentsDetailsLine *m_detailsLine; CComponentsChannelLogo *m_channelLogo; CComponentsPicture *m_movieCover; diff --git a/src/gui/upnpbrowser.cpp b/src/gui/upnpbrowser.cpp index dfa79f6c9..2ace35ee8 100644 --- a/src/gui/upnpbrowser.cpp +++ b/src/gui/upnpbrowser.cpp @@ -146,8 +146,8 @@ void CUpnpBrowserGui::Init() footer.enableShadow(CC_SHADOW_ON, -1, true); m_x=getScreenStartX(m_width); - if (m_x < ConnectLineBox_Width) // shouldn't happen - m_x = ConnectLineBox_Width; + if (m_x < DETAILSLINE_WIDTH) // shouldn't happen + m_x = DETAILSLINE_WIDTH; m_y=getScreenStartY(m_height); // calc positions @@ -1235,14 +1235,14 @@ void CUpnpBrowserGui::paintItem2DetailsLine(int pos) if (pos < 0) return; - int xpos = m_x - ConnectLineBox_Width; + int xpos = m_x - DETAILSLINE_WIDTH; int ypos1 = m_item_y + pos*m_item_height; int ypos2 = infobox.getYPos() + infobox.getHeight() - infobox.getHeight()/2; int ypos1a = ypos1 + (m_item_height/2); if (!dline) - dline = new CComponentsDetailLine(); + dline = new CComponentsDetailsLine(); dline->setDimensionsAll(xpos, ypos1a, ypos2, m_item_height/2, infobox.getHeight() - RADIUS_LARGE*2); dline->paint(); } diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h index 105ec5fa1..123c9fe0e 100644 --- a/src/gui/upnpbrowser.h +++ b/src/gui/upnpbrowser.h @@ -97,7 +97,7 @@ class CUpnpBrowserGui : public CMenuTarget, public CListHelpers time_t m_time_played; bool m_playing_entry_is_shown; time_t timeout; - CComponentsDetailLine * dline; + CComponentsDetailsLine * dline; CComponentsFooter footer; CComponentsInfoBox topbox, infobox, timebox; CComponentsPicture *image; diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 473c29c40..807c26442 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1191,13 +1191,13 @@ void CMenuWidget::calcSize() if(total_pages > 1) sb_width=SCROLLBAR_WIDTH; - full_width = /*ConnectLineBox_Width+*/width+sb_width+OFFSET_SHADOW; + full_width = /*DETAILSLINE_WIDTH+*/width+sb_width+OFFSET_SHADOW; full_height = height+RADIUS_LARGE+OFFSET_SHADOW*2 /*+hint_height+OFFSET_INTER*/; - /* + ConnectLineBox_Width for the hintbox connection line + /* + DETAILSLINE_WIDTH for the hintbox connection line * + center_offset for symmetry * + 20 for setMenuPos calculates 10 pixels border left and right */ - int center_offset = (g_settings.menu_pos == MENU_POS_CENTER) ? ConnectLineBox_Width : 0; - int max_possible = (int)frameBuffer->getScreenWidth() - ConnectLineBox_Width - center_offset - 20; + int center_offset = (g_settings.menu_pos == MENU_POS_CENTER) ? DETAILSLINE_WIDTH : 0; + int max_possible = (int)frameBuffer->getScreenWidth() - DETAILSLINE_WIDTH - center_offset - 20; if (full_width > max_possible) { width = max_possible - sb_width - OFFSET_SHADOW; @@ -1277,13 +1277,13 @@ void CMenuWidget::setMenuPos(const int& menu_width) case MENU_POS_CENTER: x = offx + scr_x + ((scr_w - menu_width ) >> 1 ); y = offy + scr_y + ((scr_h - real_h) >> 1 ); - x += ConnectLineBox_Width; + x += DETAILSLINE_WIDTH; break; case MENU_POS_TOP_LEFT: y = offy + scr_y + 10; x = offx + scr_x + 10; - x += ConnectLineBox_Width; + x += DETAILSLINE_WIDTH; break; case MENU_POS_TOP_RIGHT: @@ -1294,7 +1294,7 @@ void CMenuWidget::setMenuPos(const int& menu_width) case MENU_POS_BOTTOM_LEFT: y = /*offy +*/ scr_y + scr_h - real_h - 10; x = offx + scr_x + 10; - x += ConnectLineBox_Width; + x += DETAILSLINE_WIDTH; break; case MENU_POS_BOTTOM_RIGHT: @@ -1394,14 +1394,14 @@ void CMenuWidget::saveScreen() saveScreen_x = x; background = new fb_pixel_t [saveScreen_height * saveScreen_width]; if(background) - frameBuffer->SaveScreen(saveScreen_x /*-ConnectLineBox_Width*/, saveScreen_y, saveScreen_width, saveScreen_height, background); + frameBuffer->SaveScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background); } void CMenuWidget::restoreScreen() { if(background) { if(savescreen) - frameBuffer->RestoreScreen(saveScreen_x /*-ConnectLineBox_Width*/, saveScreen_y, saveScreen_width, saveScreen_height, background); + frameBuffer->RestoreScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background); } } @@ -1458,7 +1458,7 @@ void CMenuWidget::paintHint(int pos) int iheight = item->getHeight(); int rad = RADIUS_LARGE; - int xpos = x - ConnectLineBox_Width; + int xpos = x - DETAILSLINE_WIDTH; int ypos2 = y + height + fbutton_height + rad + OFFSET_SHADOW + OFFSET_INTER; int iwidth = width+sb_width; @@ -1471,7 +1471,7 @@ void CMenuWidget::paintHint(int pos) //init details line if (details_line == NULL) - details_line = new CComponentsDetailLine(); + details_line = new CComponentsDetailsLine(); details_line->setXPos(xpos); details_line->setYPos(ypos1a); diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index 6a174ea18..ff4f3e008 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -494,7 +494,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals private: mn_widget_id_t widget_index; CMenuGlobal *mglobal; - CComponentsDetailLine *details_line; + CComponentsDetailsLine *details_line; CComponentsInfoBox *info_box; int hint_height; CComponentsHeader *header; diff --git a/src/system/settings.h b/src/system/settings.h index 3a063669e..70280a589 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -930,6 +930,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO #define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN +#define DETAILSLINE_WIDTH 16 // TODO: scale2Res() ? + struct SglobalInfo { unsigned char box_Type;