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

CComponents: add new parameter 'parent'

Browse Source 
Use strictly CComponentsForm as parent parameter in constructors.
Some parts have been cleaned up (Constructors, init methodes removed)

New parameter makes it possible already add current item in constructor.
So in mostly situations is it not necessary to use explicit addCCItem(),
but addCCItem()is still valid and necessary in certain situations.

Affected are all cc-classes and their derivates.
Some classes must or can be adapted later. The function is
not currently restricted, because usage of parent parameter is not explicit
defined in constructors, see CImageInfo, here yet are used addCCItem()
methodes.

Generally this parameter is located in the constructors before bool has_shadow,
but it is not sure whether it would be better to use this parameter as the first.
That remains to be clarified.


Origin commit data
------------------
Commit: 23d7b62cf0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-03 (Mon, 03 Mar 2014)
This commit is contained in:
Thilo Graf
2014-03-03 09:43:39 +01:00
parent 111a2f9946
commit f33efdbdc4
42 changed files with 382 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,14 @@ class CComponentsButton : public CComponentsForm
CComponentsLabel *cc_btn_capt_obj;
///initialize all required attributes and objects
void initVarButton();
void initVarButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
const std::string& icon_name,
CComponentsForm* parent,
bool selected,
bool enabled,
bool has_shadow,
fb_pixel_t color_frame, fb_pixel_t color_body, fb_pixel_t color_shadow);
///property: button text as string, see also setCaption() and getCaptionString()
std::string cc_btn_capt;
@@ -72,13 +79,21 @@ class CComponentsButton : public CComponentsForm
public:
///basic constructor for button object with most needed params, no button icon is definied here
CComponentsButton( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption, const std::string& icon_name = "",
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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);
CComponentsButton( const int x_pos, const int y_pos, const int w, const int h,
const neutrino_locale_t& caption_locale, const std::string& icon_name = "",
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsButton( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
const std::string& icon_name = "",
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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);
///set text color
@@ -108,19 +123,25 @@ Shows a button box with caption and prepared red icon.
class CComponentsButtonRed : public CComponentsButton
{
public:
CComponentsButtonRed( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonRed( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_RED, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_RED, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_RED;
};
CComponentsButtonRed( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonRed( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_RED, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_RED, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_RED;
};
@@ -133,19 +154,25 @@ Shows a button box with caption and prepared green icon.
class CComponentsButtonGreen : public CComponentsButton
{
public:
CComponentsButtonGreen( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonGreen( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_GREEN, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_GREEN, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_GREEN;
};
CComponentsButtonGreen( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonGreen( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_GREEN, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_GREEN, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_GREEN;
};
@@ -158,19 +185,25 @@ Shows a button box with caption and prepared yellow icon.
class CComponentsButtonYellow : public CComponentsButton
{
public:
CComponentsButtonYellow( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonYellow( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_YELLOW, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_YELLOW, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_YELLOW;
};
CComponentsButtonYellow( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonYellow( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_YELLOW, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_YELLOW, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_YELLOW;
};
@@ -183,19 +216,25 @@ Shows a button box with caption and prepared blue icon.
class CComponentsButtonBlue : public CComponentsButton
{
public:
CComponentsButtonBlue( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonBlue( const int& x_pos, const int& y_pos, const int& w, const int& h,
const std::string& caption,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_BLUE, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption, NEUTRINO_ICON_BUTTON_BLUE, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_BLUE;
};
CComponentsButtonBlue( const int x_pos, const int y_pos, const int w, const int h,
CComponentsButtonBlue( const int& x_pos, const int& y_pos, const int& w, const int& h,
const neutrino_locale_t& caption_locale,
bool selected = false, bool enabled = true, bool has_shadow = CC_SHADOW_OFF,
CComponentsForm *parent = NULL,
bool selected = false,
bool enabled = true,
bool has_shadow = 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)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_BLUE, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
:CComponentsButton(x_pos, y_pos, w, h, caption_locale, NEUTRINO_ICON_BUTTON_BLUE, parent, selected, enabled, has_shadow, color_frame, color_body, color_shadow)
{
cc_item_type = CC_ITEMTYPE_BUTTON_BLUE;
};