cc_frm_icons: simplify icon handling, code format changes

Origin commit data
------------------
Branch: ni/coolstream
Commit: cecdd4d24a
Author: Thilo Graf <dbt@novatux.de>
Date: 2021-11-14 (Sun, 14 Nov 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
2021-11-14 22:12:27 +01:00
committed by vanhofen
parent 072cc201f3
commit 68f971151b
2 changed files with 51 additions and 43 deletions

View File

@@ -1,9 +1,9 @@
/*
Based up Neutrino-GUI - Tuxbox-Project
Based up Neutrino-GUI - Tuxbox-Project
Copyright (C) 2001 by Steffen Hehn 'McClean'
Classes for generic GUI-related components.
Copyright (C) 2012-2018, Thilo Graf 'dbt'
Copyright (C) 2012-2021, Thilo Graf 'dbt'
License: GPL
@@ -33,9 +33,12 @@ class CComponentsIconForm : public CComponentsFrmChain
protected:
void initMaxHeight(int *pheight);
void initVarIconForm( const int &x_pos, const int &y_pos, const int &w, const int &h,
void initVarIconForm( const int &x_pos,
const int &y_pos,
const int &w,
const int &h,
const std::vector<std::string> &v_icon_names,
CComponentsForm* parent,
CComponentsForm *parent,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
@@ -43,21 +46,25 @@ class CComponentsIconForm : public CComponentsFrmChain
public:
CComponentsIconForm(CComponentsForm *parent = NULL);
CComponentsIconForm( const int &x_pos, const int &y_pos, const int &w, const int &h,
CComponentsIconForm( const int &x_pos,
const int &y_pos,
const int &w,
const int &h,
const std::vector<std::string> &v_icon_names = std::vector<std::string>(),
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_FRAME_PLUS_0,
fb_pixel_t color_body = COL_MENUHEAD_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0);
virtual ~CComponentsIconForm() {};
void addIcon(const std::string& icon_name);
void addIcon(const std::string &icon_name);
void addIcon(std::vector<std::string> icon_name);
void addIcons(const std::string& icon_name, const size_t& count = 1);
void removeIcons(){v_icons.clear();};
void insertIcon(const uint& icon_id, const std::string& icon_name);
void removeIcon(const uint& icon_id);
void addIcons(const std::string &icon_name, const size_t &count = 1);
void removeIcons() {v_icons.clear();};
void insertIcon(const uint &icon_id, const std::string &icon_name);
void removeIcon(const uint &icon_id);
void removeAllIcons();
};