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

CMenuWidget: remove dub code from init

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-02-09 16:35:03 +01:00
parent f6ea40a11e
commit e1edcb1187
2 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/gui/widget/menue.cpp
View File

@@ -534,47 +534,57 @@ CMenuGlobal* CMenuGlobal::getInstance()
CMenuWidget::CMenuWidget() CMenuWidget::CMenuWidget()
{ {
nameString = ""; Init("", "", 0, 0);
iconfile = ""; }
selected = -1;
CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
{
Init(g_Locale->getText(Name), Icon, mwidth, w_index);
}
CMenuWidget::CMenuWidget(const std::string &Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
{
Init(Name, Icon, mwidth, w_index);
}
void CMenuWidget::Init(const std::string &NameString, const std::string &Icon, const int mwidth, const mn_widget_id_t &w_index)
{
//pos
x = y = 0;
//caption and icon
nameString = NameString;
iconfile = Icon;
//basic attributes
iconOffset = 0; iconOffset = 0;
offx = offy = 0; offx = offy = 0;
from_wizard = SNeutrinoSettings::WIZARD_OFF; from_wizard = SNeutrinoSettings::WIZARD_OFF;
fade = true; fade = true;
sb_width = 0; sb_width = 0;
savescreen = false; savescreen = false;
background = NULL;
preselected = -1; preselected = -1;
details_line = NULL;
info_box = NULL;
header = NULL;
nextShortcut = 1; nextShortcut = 1;
x = y = 0; current_page = 0;
} has_hints = false;
brief_hints = BRIEF_HINT_NO;
hint_painted = false;
hint_height = 0;
fbutton_count = 0;
fbutton_labels = NULL;
fbutton_width = 0;
fbutton_height = 0;
saveScreen_width = 0;
saveScreen_height = 0;
CMenuWidget::CMenuWidget(const neutrino_locale_t Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index) //objects
{ background = NULL;
nameString = g_Locale->getText(Name);
preselected = -1;
Init(Icon, mwidth, w_index);
}
CMenuWidget::CMenuWidget(const std::string &Name, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index)
{
nameString = Name;
preselected = -1;
Init(Icon, mwidth, w_index);
}
void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widget_id_t &w_index)
{
mglobal = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here
frameBuffer = CFrameBuffer::getInstance();
iconfile = Icon;
details_line = NULL; details_line = NULL;
info_box = NULL; info_box = NULL;
header = NULL; header = NULL;
frameBuffer = CFrameBuffer::getInstance();
mglobal = CMenuGlobal::getInstance(); //create CMenuGlobal instance only here
//handle select values //handle select values
if(w_index > MN_WIDGET_ID_MAX){ if(w_index > MN_WIDGET_ID_MAX){
//error //error
@@ -589,40 +599,18 @@ void CMenuWidget::Init(const std::string &Icon, const int mwidth, const mn_widge
//overwrite preselected value with global select value //overwrite preselected value with global select value
selected = (widget_index == NO_WIDGET_ID ? preselected : mglobal->v_selected[widget_index]); selected = (widget_index == NO_WIDGET_ID ? preselected : mglobal->v_selected[widget_index]);
//dimension
min_width = 0; min_width = 0;
width = 0; /* is set in paint() */ width = 0; /* is set in paint() */
if (mwidth > 100){
if (mwidth > 100)
{
/* warn about abuse until we found all offenders... */ /* warn about abuse until we found all offenders... */
fprintf(stderr, "Warning: %s (%s) (%s) mwidth over 100%%: %d\n", __FUNCTION__, nameString.c_str(), Icon.c_str(), mwidth); fprintf(stderr, "Warning: %s (%s) (%s) mwidth over 100%%: %d\n", __FUNCTION__, nameString.c_str(), Icon.c_str(), mwidth);
} }
else else{
{
min_width = frameBuffer->getScreenWidth(true) * mwidth / 100; min_width = frameBuffer->getScreenWidth(true) * mwidth / 100;
if(min_width > (int) frameBuffer->getScreenWidth()) if(min_width > (int) frameBuffer->getScreenWidth())
min_width = frameBuffer->getScreenWidth(); min_width = frameBuffer->getScreenWidth();
} }
current_page = 0;
offx = offy = 0;
from_wizard = SNeutrinoSettings::WIZARD_OFF;
fade = true;
savescreen = false;
background = NULL;
has_hints = false;
brief_hints = BRIEF_HINT_NO;
hint_painted = false;
hint_height = 0;
fbutton_count = 0;
fbutton_labels = NULL;
fbutton_width = 0;
fbutton_height = 0;
nextShortcut = 1;
saveScreen_width = 0;
saveScreen_height = 0;
x = y = 0;
} }
void CMenuWidget::move(int xoff, int yoff) void CMenuWidget::move(int xoff, int yoff)

2
src/gui/widget/menue.h
View File

@@ -544,7 +544,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
bool washidden; bool washidden;
int nextShortcut; int nextShortcut;
void Init(const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index); void Init(const std::string &NameString, const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index);
virtual void paintItems(); virtual void paintItems();
void checkHints(); void checkHints();
void calcSize(); void calcSize();