mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- ccomponents: use COL_SHADOW for shadows

Browse Source
This commit is contained in:
svenhoefer
2016-08-16 08:37:38 +02:00
parent b1eab6a23e
commit 1f60557e0b
22 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_detailsline.cpp
View File

@@ -140,5 +140,5 @@ void CComponentsDetailLine::paint(bool do_save_bg)
void CComponentsDetailLine::syncSysColors()
{
col_body = COL_MENUCONTENT_PLUS_6;
col_shadow = COL_MENUCONTENTDARK_PLUS_0;
col_shadow = COL_SHADOW_PLUS_0;
}

2
src/gui/components/cc_detailsline.h
View File

@@ -57,7 +57,7 @@ class CComponentsDetailLine : public CComponents
public:
CComponentsDetailLine( 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_MENUCONTENT_PLUS_6, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_line = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
~CComponentsDetailLine();
///set colors

2
src/gui/components/cc_draw.cpp
View File

@@ -38,7 +38,7 @@ CCDraw::CCDraw() : COSDFader(g_settings.theme.menu_Content_alpha)
width = width_old = CC_WIDTH_MIN;
col_body = col_body_old = COL_MENUCONTENT_PLUS_0;
col_shadow = col_shadow_old = COL_MENUCONTENTDARK_PLUS_0;
col_shadow = col_shadow_old = COL_SHADOW_PLUS_0;
col_frame = col_frame_old = COL_MENUCONTENT_PLUS_6;
col_frame_sel = col_frame_sel_old = COL_MENUCONTENTSELECTED_PLUS_0;

16
src/gui/components/cc_extra.h
View File

@@ -63,7 +63,7 @@
* @li CFrameBuffer::advanced
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_MENUCONTENTDARK_PLUS_0
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
* @return
* True if painted
@@ -88,7 +88,7 @@ bool paintBoxRel( const int& x,
const int& w_frame = 0,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_MENUCONTENTDARK_PLUS_0);
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
/** Paint a box on screen.
* @param[in] x position
@@ -110,7 +110,7 @@ bool paintBoxRel( const int& x,
* @li CORNER_ALL
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_MENUCONTENTDARK_PLUS_0
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
* @return
* True if painted
@@ -131,7 +131,7 @@ bool paintBoxRel0( const int& x,
const int& w_frame = 0,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_MENUCONTENTDARK_PLUS_0);
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
/** Paint a text box on screen.
* @param[in] std::string& text
@@ -175,7 +175,7 @@ bool paintBoxRel0( const int& x,
* @li CFrameBuffer::advanced
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_MENUCONTENTDARK_PLUS_0
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
* @return
* True if painted
@@ -206,7 +206,7 @@ bool paintTextBoxRel( const std::string& text,
const int& gradient_intensity = CColorGradient::normal,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_MENUCONTENTDARK_PLUS_0);
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
/** Paint an image on screen.
* @param[in] std::string& full path or filename
@@ -250,7 +250,7 @@ bool paintTextBoxRel( const std::string& text,
* @li CFrameBuffer::advanced
* @param[in] color_frame color of frame around box, default = COL_MENUCONTENT_PLUS_6
* @param[in] shadow_mode enable/disable shadow behind box, default = CC_SHADOW_OFF
* @param[in] color_shadow color of shadow, default = COL_MENUCONTENTDARK_PLUS_0
* @param[in] color_shadow color of shadow, default = COL_SHADOW_PLUS_0
*
* @return
* True if painted
@@ -272,5 +272,5 @@ bool paintImage( const std::string& image_name,
const int& corner_type = CORNER_NONE,
const fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
int shadow_mode = CC_SHADOW_OFF,
const fb_pixel_t& color_shadow = COL_MENUCONTENTDARK_PLUS_0);
const fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
#endif

2
src/gui/components/cc_frm.h
View File

@@ -68,7 +68,7 @@ class CComponentsForm : public CComponentsItem
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
virtual ~CComponentsForm();
///paints current form on screen, for paint a page use paintPage()

24
src/gui/components/cc_frm_button.h
View File

@@ -103,7 +103,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
@@ -112,7 +112,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
@@ -121,7 +121,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
@@ -130,7 +130,7 @@ class CComponentsButton : public CComponentsFrmChain, public CCTextScreen
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_DARK_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///set text color
virtual void setButtonTextColor(fb_pixel_t text_color, fb_pixel_t text_color_disabled = COL_MENUCONTENTINACTIVE_TEXT){cc_btn_capt_col = text_color; cc_btn_capt_disable_col = text_color_disabled;}
@@ -204,7 +204,7 @@ class CComponentsButtonRed : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_RED, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_RED;
@@ -215,7 +215,7 @@ class CComponentsButtonRed : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_RED, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_RED;
@@ -235,7 +235,7 @@ class CComponentsButtonGreen : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_GREEN, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_GREEN;
@@ -246,7 +246,7 @@ class CComponentsButtonGreen : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_GREEN, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_GREEN;
@@ -266,7 +266,7 @@ class CComponentsButtonYellow : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_YELLOW, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_YELLOW;
@@ -277,7 +277,7 @@ class CComponentsButtonYellow : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_YELLOW, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_YELLOW;
@@ -297,7 +297,7 @@ class CComponentsButtonBlue : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_BLUE, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_BLUE;
@@ -308,7 +308,7 @@ class CComponentsButtonBlue : public CComponentsButton
bool selected = false,
bool enabled = true,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_frame = COL_LIGHT_GRAY, fb_pixel_t color_body = COL_BUTTON_BODY, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_BLUE, parent, selected, enabled, shadow_mode, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_BLUE;

2
src/gui/components/cc_frm_chain.h
View File

@@ -69,7 +69,7 @@ class CComponentsFrmChain : public CComponentsForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t& color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t& color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsFrmChain(); //inherited from CComponentsForm
///defines mode for arrangement direction of items, see also chn_direction

2
src/gui/components/cc_frm_clock.h
View File

@@ -104,7 +104,7 @@ class CComponentsFrmClock : public CComponentsForm, public CCTextScreen
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_LIGHT_GRAY,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int font_style = CNeutrinoFonts::FONT_STYLE_BOLD
);
virtual ~CComponentsFrmClock();

4
src/gui/components/cc_frm_ext_text.h
View File

@@ -84,7 +84,7 @@ class CComponentsExtTextForm : public CComponentsForm, public CCTextScreen
fb_pixel_t text_color = COL_MENUCONTENT_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsExtTextForm(); //inherited from CComponentsForm
///assigns texts for label and text, parameter as string, parameter Font is optional for required font type, default font is dependently from defined item height
@@ -145,7 +145,7 @@ class CComponentsExtTextFormLocalized : public CComponentsExtTextForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t label_color = COL_MENUCONTENTINACTIVE_TEXT,
fb_pixel_t text_color = COL_MENUCONTENT_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
};
#endif

4
src/gui/components/cc_frm_footer.h
View File

@@ -66,7 +66,7 @@ class CComponentsFooter : public CComponentsHeader
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUFOOT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///show button frame and background, default false
bool btn_contour;
@@ -87,7 +87,7 @@ class CComponentsFooter : public CComponentsHeader
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUFOOT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///add button labels with string label type as content, count as size_t, chain_width as int, label width as int
void setButtonLabels(const struct button_label_s * const content, const size_t& label_count, const int& chain_width = 0, const int& label_width = 0);

6
src/gui/components/cc_frm_header.h
View File

@@ -48,7 +48,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
protected:
///object: icon object, see also setIcon()
@@ -126,7 +126,7 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
virtual ~CComponentsHeader();
@@ -264,7 +264,7 @@ class CComponentsHeaderLocalized : public CComponentsHeader
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
};
#endif

4
src/gui/components/cc_frm_icons.h
View File

@@ -39,7 +39,7 @@ class CComponentsIconForm : public CComponentsFrmChain
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
public:
CComponentsIconForm(CComponentsForm *parent = NULL);
@@ -48,7 +48,7 @@ class CComponentsIconForm : public CComponentsFrmChain
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsIconForm(); //inherited from CComponentsForm
void addIcon(const std::string& icon_name);

2
src/gui/components/cc_frm_scrollbar.h
View File

@@ -65,7 +65,7 @@ class CComponentsScrollBar : public CComponentsFrmChain
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_3,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsScrollBar(); //inherited from CComponentsForm
///set marked segment, 1st = 0, 2nd = 1 ...

2
src/gui/components/cc_frm_slider.h
View File

@@ -69,7 +69,7 @@ class CComponentsSlider : public CComponentsForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t& color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t& color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t& color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t& color_shadow = COL_SHADOW_PLUS_0);
// ~CComponentsSlider(); //inherited from CComponentsForm
void setValuePos(const int& current_value);

10
src/gui/components/cc_frm_window.h
View File

@@ -112,7 +112,7 @@ class CComponentsWindow : public CComponentsForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///initialize width and height
void initWindowSize();
///initialize position
@@ -137,7 +137,7 @@ class CComponentsWindow : public CComponentsForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///advanced constructor for CComponentsWindow, provides parameters for the most required properties, and caption from locales, x_pos or y_pos = 0 will center window
CComponentsWindow( const int& x_pos, const int& y_pos, const int& w, const int& h,
@@ -147,7 +147,7 @@ class CComponentsWindow : public CComponentsForm
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///add item to body object, also usable is addCCItem() to add items to the windo object
int addWindowItem(CComponentsItem* cc_Item);
@@ -233,7 +233,7 @@ class CComponentsWindowMax : public CComponentsWindow
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///simple constructor for CComponentsWindow, provides parameters for caption from locales and icon, this shows a centered window based up current screen settings
CComponentsWindowMax( neutrino_locale_t locale_caption, const std::string& iconname = "",
@@ -241,7 +241,7 @@ class CComponentsWindowMax : public CComponentsWindow
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
};
#endif

2
src/gui/components/cc_item.cpp
View File

@@ -145,7 +145,7 @@ void CComponentsItem::kill(const fb_pixel_t& bg_color, bool ignore_parent, const
void CComponentsItem::syncSysColors()
{
col_body = COL_MENUCONTENT_PLUS_0;
col_shadow = COL_MENUCONTENTDARK_PLUS_0;
col_shadow = COL_SHADOW_PLUS_0;
col_frame = COL_MENUCONTENT_PLUS_6;
}

2
src/gui/components/cc_item_infobox.h
View File

@@ -74,7 +74,7 @@ class CComponentsInfoBox : public CComponentsText
fb_pixel_t color_text = COL_MENUCONTENT_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
~CComponentsInfoBox();

12
src/gui/components/cc_item_picture.h
View File

@@ -114,7 +114,7 @@ class CComponentsPicture : public CComponentsItem
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_NONE);
/*!
@@ -130,7 +130,7 @@ class CComponentsPicture : public CComponentsItem
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_NONE);
virtual~CComponentsPicture()
{
@@ -198,7 +198,7 @@ class CComponentsPictureScalable : public CComponentsPicture
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_NONE)
: CComponentsPicture(x_pos, y_pos, 0, 0, image_name, parent, shadow_mode, color_frame, color_background, color_shadow, transparent){};
};
@@ -233,7 +233,7 @@ class CComponentsChannelLogo : public CComponentsPicture
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_BLACK);
/*!
@@ -249,7 +249,7 @@ class CComponentsChannelLogo : public CComponentsPicture
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_BLACK);
///set channel id and/or channel name, NOTE: channel name is prefered
@@ -282,7 +282,7 @@ class CComponentsChannelLogoScalable : public CComponentsChannelLogo
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_background = 0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
int transparent = CFrameBuffer::TM_BLACK)
: CComponentsChannelLogo(x_pos, y_pos, 0, 0, channelName, channelId, parent, shadow_mode, color_frame, color_background, color_shadow, transparent){};
};

2
src/gui/components/cc_item_progressbar.h
View File

@@ -100,7 +100,7 @@ class CProgressBar : public CComponentsItem
const int h = -1,
fb_pixel_t color_frame = 0,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
const fb_pixel_t active_col = COL_INFOBAR_PLUS_7,
const fb_pixel_t passive_col = COL_INFOBAR_PLUS_3,
const int R = 40,

4
src/gui/components/cc_item_shapes.h
View File

@@ -47,7 +47,7 @@ class CComponentsShapeCircle : public CComponentsItem
CComponentsShapeCircle( const int x_pos, const int y_pos, const int diam,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
///set property: diam
inline void setDiam(const int& diam){d=width=height=diam, corner_rad=d/2;};
@@ -64,7 +64,7 @@ class CComponentsShapeSquare : public CComponentsItem
CComponentsShapeSquare( const int x_pos, const int y_pos, const int w, const int h,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
void paint(bool do_save_bg = CC_SAVE_SCREEN_YES);
};

8
src/gui/components/cc_item_text.h
View File

@@ -109,7 +109,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
const int& font_style = CComponentsText::FONT_STYLE_REGULAR,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
CComponentsText( CComponentsForm *parent,
const int x_pos = 10, const int y_pos = 10, const int w = 150, const int h = 50,
@@ -118,7 +118,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
Font* font_text = NULL,
const int& font_style = CComponentsText::FONT_STYLE_REGULAR,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_text = COL_MENUCONTENT_TEXT, fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6, fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
virtual ~CComponentsText();
@@ -134,7 +134,7 @@ class CComponentsText : public CCTextScreen, public CComponentsItem, public CBox
virtual void setTextColor(const fb_pixel_t& color_text);
///set all basic framebuffer element colors at once
///Note: Possible color values are defined in "gui/color.h" and "gui/customcolor.h"
virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0, fb_pixel_t color_text = COL_MENUCONTENT_TEXT)
virtual void setColorAll(fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0, fb_pixel_t color_text = COL_MENUCONTENT_TEXT)
{
CCDraw::setColorAll(color_frame, color_body, color_shadow);
setTextColor(color_text);
@@ -256,7 +256,7 @@ class CComponentsLabel : public CComponentsText
fb_pixel_t color_text = COL_MENUCONTENTINACTIVE_TEXT,
fb_pixel_t color_frame = COL_MENUCONTENT_PLUS_6,
fb_pixel_t color_body = COL_MENUCONTENT_PLUS_0,
fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0)
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0)
:CComponentsText(x_pos, y_pos, w, h, text, mode, font_text, font_style, parent, shadow_mode, color_text, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_LABEL;

2
src/gui/components/cc_item_tvpic.h
View File

@@ -54,7 +54,7 @@ class CComponentsPIP : public CComponentsItem
CComponentsPIP( const int x_pos = 0, const int y_pos = 0, const int percent = 30,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_BLACK, fb_pixel_t color_body = COL_BACKGROUND_PLUS_0, fb_pixel_t color_shadow = COL_MENUCONTENTDARK_PLUS_0);
fb_pixel_t color_frame = COL_BLACK, fb_pixel_t color_body = COL_BACKGROUND_PLUS_0, fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
~CComponentsPIP();
///set property: width of tv box in pixel