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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
This commit is contained in:
vanhofen
2017-09-14 16:23:15 +02:00
parent 8d21a64f35 2889d6a454
commit fb0a25d759
21 changed files with 50104 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,6 +528,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
CComponentsInfoBox *info_box;
int hint_height;
CComponentsHeader *header;
CComponentsFooter *footer;
unsigned int saveScreen_width ;
unsigned int saveScreen_height;
unsigned int saveScreen_y;
@@ -561,8 +562,8 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
bool brief_hints;
bool hint_painted; // is hint painted
int fbutton_width;
int fbutton_height;
int footer_width;
int footer_height;
int fbutton_count;
const struct button_label *fbutton_labels;