diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index b57bb8840..ad0ee13fe 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -50,17 +50,10 @@ extern CAudioSetupNotifier * audioSetupNotifier; CAudioSetup::CAudioSetup(bool wizard_mode) { - frameBuffer = CFrameBuffer::getInstance(); - is_wizard = wizard_mode; width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); } CAudioSetup::~CAudioSetup() @@ -83,11 +76,6 @@ int CAudioSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) return res; } -void CAudioSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - #define AUDIOMENU_ANALOGOUT_OPTION_COUNT 3 const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT_OPTION_COUNT] = diff --git a/src/gui/audio_setup.h b/src/gui/audio_setup.h index 2f785ad40..8e7474511 100644 --- a/src/gui/audio_setup.h +++ b/src/gui/audio_setup.h @@ -33,21 +33,15 @@ #include -#include - #include class CAudioSetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - - int x, y, width, height, hheight, mheight, selected; - - void hide(); - void showAudioSetup(); - + int width, selected; bool is_wizard; + + void showAudioSetup(); public: enum AUDIO_SETUP_MODE diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp index c3011e75c..2b7036a65 100644 --- a/src/gui/audioplayer_setup.cpp +++ b/src/gui/audioplayer_setup.cpp @@ -54,8 +54,6 @@ CAudioPlayerSetup::CAudioPlayerSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (40, 10); selected = -1; } diff --git a/src/gui/audioplayer_setup.h b/src/gui/audioplayer_setup.h index 7fd6e098a..9fa06a369 100644 --- a/src/gui/audioplayer_setup.h +++ b/src/gui/audioplayer_setup.h @@ -33,16 +33,12 @@ #include -#include - #include class CAudioPlayerSetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - int width, selected; void showAudioPlayerSetup(); diff --git a/src/gui/cam_menu.h b/src/gui/cam_menu.h index 576f360eb..78b8f3749 100644 --- a/src/gui/cam_menu.h +++ b/src/gui/cam_menu.h @@ -25,6 +25,7 @@ #include "widget/menue.h" +#include "widget/hintbox.h" #include #include diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp index 17b15dc27..59431f924 100644 --- a/src/gui/cec_setup.cpp +++ b/src/gui/cec_setup.cpp @@ -50,15 +50,8 @@ extern cVideo *videoDecoder; CCECSetup::CCECSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (40, 10); //% - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); } CCECSetup::~CCECSetup() @@ -79,11 +72,6 @@ int CCECSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) return res; } -void CCECSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width, height); -} - #define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 3 const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] = diff --git a/src/gui/cec_setup.h b/src/gui/cec_setup.h index 2c0d702ec..1578101bc 100644 --- a/src/gui/cec_setup.h +++ b/src/gui/cec_setup.h @@ -38,12 +38,10 @@ class CCECSetup : public CMenuTarget, CChangeObserver { private: - CFrameBuffer *frameBuffer; CMenuOptionChooser *cec1, *cec2; - int x, y, width, height, hheight, mheight, selected; + int width, selected; - void hide(); void showMenu(); diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 345dec908..57dcafff3 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -53,18 +53,11 @@ CKeybindSetup::CKeybindSetup() { - frameBuffer = CFrameBuffer::getInstance(); - keySetupNotifier = new CKeySetupNotifier; keySetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL); width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); } CKeybindSetup::~CKeybindSetup() @@ -113,10 +106,6 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey) return res; } -void CKeybindSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} #define KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT 3 const CMenuOptionChooser::keyval KEYBINDINGMENU_BOUQUETHANDLING_OPTIONS[KEYBINDINGMENU_BOUQUETHANDLING_OPTION_COUNT] = diff --git a/src/gui/keybind_setup.h b/src/gui/keybind_setup.h index 4a3765937..4e7505028 100644 --- a/src/gui/keybind_setup.h +++ b/src/gui/keybind_setup.h @@ -35,8 +35,6 @@ #include #include -#include - #include #include @@ -85,9 +83,8 @@ class CKeybindSetup : public CMenuTarget CKeySetupNotifier *keySetupNotifier; CKeyChooser * keychooser[KEYBINDS_COUNT]; - int x, y, width, height, hheight, mheight, selected; + int width, selected; - void hide(); void showKeySetup(); void showKeyBindSetup(CMenuWidget *bindSettings); void showKeyBindModeSetup(CMenuWidget *bindSettings_modes); diff --git a/src/gui/mediaplayer.cpp b/src/gui/mediaplayer.cpp index 25d804377..ab60de663 100644 --- a/src/gui/mediaplayer.cpp +++ b/src/gui/mediaplayer.cpp @@ -50,19 +50,11 @@ CMediaPlayerMenu::CMediaPlayerMenu() { - frameBuffer = CFrameBuffer::getInstance(); - setMenuTitel(); setUsageMode(); width = w_max (40, 10); //% - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - - x = getScreenStartX (width); - y = getScreenStartY (height); audioPlayer = NULL; inetPlayer = NULL; @@ -115,11 +107,6 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey) return res; } -void CMediaPlayerMenu::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width, height); -} - //show selectable mediaplayer items void CMediaPlayerMenu::showMenu() { diff --git a/src/gui/mediaplayer.h b/src/gui/mediaplayer.h index 7d2f8d92c..605684086 100644 --- a/src/gui/mediaplayer.h +++ b/src/gui/mediaplayer.h @@ -31,21 +31,18 @@ #include #include "gui/audioplayer.h" -#include #include class CMediaPlayerMenu : public CMenuTarget { private: - CFrameBuffer *frameBuffer; CAudioPlayerGui *audioPlayer; CAudioPlayerGui *inetPlayer; - int x, y, width, height, hheight, mheight, selected, usage_mode; + int width, selected, usage_mode; neutrino_locale_t menu_title; - void hide(); void showMenu(); void showMoviePlayer(CMenuWidget *menu_movieplayer); diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp index cf338d2fd..8a15b2590 100644 --- a/src/gui/mediaplayer_setup.cpp +++ b/src/gui/mediaplayer_setup.cpp @@ -56,8 +56,6 @@ CMediaPlayerSetup::CMediaPlayerSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (40, 10); selected = -1; } diff --git a/src/gui/mediaplayer_setup.h b/src/gui/mediaplayer_setup.h index 054944572..c05757dfa 100644 --- a/src/gui/mediaplayer_setup.h +++ b/src/gui/mediaplayer_setup.h @@ -35,16 +35,11 @@ #include -#include - - #include class CMediaPlayerSetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - int width, selected; void showMediaPlayerSetup(); diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 7947745eb..4a65d5146 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -53,18 +53,12 @@ CNetworkSetup::CNetworkSetup(bool wizard_mode) { - frameBuffer = CFrameBuffer::getInstance(); networkConfig = CNetworkConfig::getInstance(); is_wizard = wizard_mode; width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); readNetworkSettings(); } @@ -128,11 +122,6 @@ int CNetworkSetup::exec(CMenuTarget* parent, const std::string &actionKey) return res; } -void CNetworkSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width, height); -} - void CNetworkSetup::readNetworkSettings() { diff --git a/src/gui/network_setup.h b/src/gui/network_setup.h index 98d8d6c90..8fced31bb 100644 --- a/src/gui/network_setup.h +++ b/src/gui/network_setup.h @@ -34,8 +34,6 @@ #include #include -#include - #include #include @@ -45,10 +43,9 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver { private: - CFrameBuffer *frameBuffer; CNetworkConfig *networkConfig; - int x, y, width, height, hheight, mheight, selected; + int width, selected; bool is_wizard; @@ -70,7 +67,6 @@ class CNetworkSetup : public CMenuTarget, CChangeObserver std::string old_network_gateway; std::string old_network_hostname; - void hide(); void restoreNetworkSettings(); void prepareSettings(); void readNetworkSettings(); diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 76b20fa64..49fdb85d3 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -61,8 +61,6 @@ extern std::string ttx_font_file; COsdSetup::COsdSetup(bool wizard_mode) { - frameBuffer = CFrameBuffer::getInstance(); - colorSetupNotifier = new CColorSetupNotifier(); colorSetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL); @@ -71,12 +69,6 @@ COsdSetup::COsdSetup(bool wizard_mode) is_wizard = wizard_mode; width = w_max (40, 10); //% - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; - x = getScreenStartX (width); - y = getScreenStartY (height); - } COsdSetup::~COsdSetup() @@ -85,11 +77,6 @@ COsdSetup::~COsdSetup() delete fontsizenotifier; } -void COsdSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) { diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index 90cc778dc..ceff4d396 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -43,16 +43,13 @@ class COsdSetup : public CMenuTarget { private: - - CFrameBuffer *frameBuffer; CColorSetupNotifier *colorSetupNotifier; CFontSizeNotifier *fontsizenotifier; - int x, y, width, height, hheight, mheight, selected; + int width, selected; bool is_wizard; - void hide(); void showOsdSetup(); void showOsdMenueColorSetup(CMenuWidget *menu_colors); void showOsdFontSizeSetup(CMenuWidget *menu_fonts); diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 1e4dfed26..5199f509c 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -54,17 +54,10 @@ COsdLangSetup::COsdLangSetup(bool wizard_mode) { - frameBuffer = CFrameBuffer::getInstance(); - is_wizard = wizard_mode; width = w_max (45, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); } COsdLangSetup::~COsdLangSetup() @@ -72,12 +65,6 @@ COsdLangSetup::~COsdLangSetup() } -void COsdLangSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - - int COsdLangSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) { dprintf(DEBUG_DEBUG, "init international setup\n"); diff --git a/src/gui/osdlang_setup.h b/src/gui/osdlang_setup.h index 2970651f0..1689a3375 100644 --- a/src/gui/osdlang_setup.h +++ b/src/gui/osdlang_setup.h @@ -36,8 +36,6 @@ #include -#include - #include #include @@ -52,15 +50,11 @@ class CLangSelectNotifier : public CChangeObserver class COsdLangSetup : public CMenuTarget, CChangeObserver { - private: - - CFrameBuffer *frameBuffer; - - int x, y, width, height, menue_width, hheight, mheight, selected; + private: + int width, selected; bool is_wizard; - void hide(); void showLocalSetup(); void showLanguageSetup(CMenuWidget *osdl_setup); void showPrefMenu(CMenuWidget *prefMenu, CLangSelectNotifier *langNotifier); diff --git a/src/gui/parentallock_setup.cpp b/src/gui/parentallock_setup.cpp index 506256f52..26b90ec26 100644 --- a/src/gui/parentallock_setup.cpp +++ b/src/gui/parentallock_setup.cpp @@ -49,15 +49,8 @@ CParentalSetup::CParentalSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (40, 10); //% - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); } CParentalSetup::~CParentalSetup() @@ -80,11 +73,6 @@ int CParentalSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) return res; } -void CParentalSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width, height); -} - #if 1 #define PARENTALLOCK_PROMPT_OPTION_COUNT 3 diff --git a/src/gui/parentallock_setup.h b/src/gui/parentallock_setup.h index 021c1cd26..f3006a858 100644 --- a/src/gui/parentallock_setup.h +++ b/src/gui/parentallock_setup.h @@ -33,21 +33,15 @@ #include -#include - #include class CParentalSetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - - int x, y, width, height, hheight, mheight, selected; + int width, selected; - void hide(); void showParentalSetup(); - public: CParentalSetup(); ~CParentalSetup(); diff --git a/src/gui/pictureviewer_setup.cpp b/src/gui/pictureviewer_setup.cpp index 1f2b6d0fd..72d33319c 100644 --- a/src/gui/pictureviewer_setup.cpp +++ b/src/gui/pictureviewer_setup.cpp @@ -53,8 +53,6 @@ CPictureViewerSetup::CPictureViewerSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (40, 10); selected = -1; } diff --git a/src/gui/pictureviewer_setup.h b/src/gui/pictureviewer_setup.h index d28d68c48..911463025 100644 --- a/src/gui/pictureviewer_setup.h +++ b/src/gui/pictureviewer_setup.h @@ -41,8 +41,6 @@ class CPictureViewerSetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - int width, selected; void showPictureViewerSetup(); diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp index b77222ea4..f0ea32eaa 100644 --- a/src/gui/proxyserver_setup.cpp +++ b/src/gui/proxyserver_setup.cpp @@ -46,18 +46,10 @@ CProxySetup::CProxySetup(const neutrino_locale_t title, const char * const IconName ) { - frameBuffer = CFrameBuffer::getInstance(); - menue_title = title; menue_icon = IconName; width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; - x = getScreenStartX (width); - y = getScreenStartY (height); - } CProxySetup::~CProxySetup() @@ -80,11 +72,6 @@ int CProxySetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) return res; } -void CProxySetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - /* shows entries for proxy settings */ void CProxySetup::showProxySetup() { diff --git a/src/gui/proxyserver_setup.h b/src/gui/proxyserver_setup.h index de923b794..b2978989e 100644 --- a/src/gui/proxyserver_setup.h +++ b/src/gui/proxyserver_setup.h @@ -34,24 +34,18 @@ #include #include -#include - #include class CProxySetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - - int x, y, width, height, hheight, mheight; + int width; neutrino_locale_t menue_title; std::string menue_icon; - void hide(); void showProxySetup(); - public: CProxySetup(const neutrino_locale_t title = LOCALE_FLASHUPDATE_PROXYSERVER_SEP, const char * const IconName = NEUTRINO_ICON_SETTINGS); ~CProxySetup(); diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index c30951c40..6d390ccd6 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -55,16 +55,7 @@ CRecordSetup::CRecordSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (50, 10); //% - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; - selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); - selected = -1; } @@ -73,11 +64,6 @@ CRecordSetup::~CRecordSetup() } -void CRecordSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width, height); -} - int CRecordSetup::exec(CMenuTarget* parent, const std::string &actionKey) { dprintf(DEBUG_DEBUG, "init record setup\n"); diff --git a/src/gui/record_setup.h b/src/gui/record_setup.h index c146d01e1..8ab476ac5 100644 --- a/src/gui/record_setup.h +++ b/src/gui/record_setup.h @@ -34,19 +34,13 @@ #include -#include - - #include class CRecordSetup : public CMenuTarget { private: - CFrameBuffer *frameBuffer; - - int x, y, width, height, hheight, mheight, selected; + int width, selected; - void hide(); void showRecordSetup(); void showRecordTimerSetup(CMenuWidget *menu_timersettings); void showRecordAudioSetup(CMenuWidget *menu_audiosettings); diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 2baa748d0..f87ce7158 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -55,16 +55,8 @@ extern CFrontend * frontend; CTestMenu::CTestMenu() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (50, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); - } CTestMenu::~CTestMenu() @@ -318,11 +310,6 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) return res; } -void CTestMenu::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - /* shows entries for proxy settings */ void CTestMenu::showTestMenu() { diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index 3afbfbc15..81418ccb9 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -54,13 +54,7 @@ CThemes::CThemes() : themefile('\t') { - frameBuffer = CFrameBuffer::getInstance(); width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; - x = getScreenStartX (width); - y = getScreenStartY (height); hasThemeChanged = false; } @@ -104,11 +98,6 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey) return res; } -void CThemes::hide() -{ - frameBuffer->paintBackgroundBoxRel(x, y, width, height); -} - void CThemes::readThemes(CMenuWidget &themes) { struct dirent **themelist; diff --git a/src/gui/themes.h b/src/gui/themes.h index 3ee8778ea..99c3df488 100644 --- a/src/gui/themes.h +++ b/src/gui/themes.h @@ -26,17 +26,15 @@ #define __cthemes__ #include #include -#include #include class CThemes : public CMenuTarget, CChangeObserver { private: - CFrameBuffer *frameBuffer; CConfigFile themefile; CColorSetupNotifier *notifier; - int x, y, width, height, hheight, mheight; + int width; int oldThemeValues[40]; bool hasThemeChanged; @@ -49,7 +47,6 @@ class CThemes : public CMenuTarget, CChangeObserver public: CThemes(); - void hide(); void setupDefaultColors(); int exec(CMenuTarget* parent, const std::string & actionKey); }; diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 6fb86cae9..ab97dc011 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -50,17 +50,10 @@ CUserMenuSetup::CUserMenuSetup(neutrino_locale_t menue_title, int menue_button) { - frameBuffer = CFrameBuffer::getInstance(); - local = menue_title; button = menue_button; width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; - x = getScreenStartX (width); - y = getScreenStartY (height); } CUserMenuSetup::~CUserMenuSetup() @@ -68,10 +61,6 @@ CUserMenuSetup::~CUserMenuSetup() } -void CUserMenuSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} #define USERMENU_ITEM_OPTION_COUNT SNeutrinoSettings::ITEM_MAX const CMenuOptionChooser::keyval USERMENU_ITEM_OPTIONS[USERMENU_ITEM_OPTION_COUNT] = diff --git a/src/gui/user_menue_setup.h b/src/gui/user_menue_setup.h index 414c672b3..874312813 100644 --- a/src/gui/user_menue_setup.h +++ b/src/gui/user_menue_setup.h @@ -34,22 +34,16 @@ #include -#include - #include class CUserMenuSetup : public CMenuTarget { private: - - CFrameBuffer *frameBuffer; - - int x, y, width, height, menue_width, hheight, mheight; + int width; int button; neutrino_locale_t local; - void hide(); void showSetup(); public: diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 7021239c3..316c8afa0 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -51,15 +51,8 @@ CVfdSetup::CVfdSetup() { - frameBuffer = CFrameBuffer::getInstance(); - width = w_max (40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); } CVfdSetup::~CVfdSetup() @@ -67,11 +60,6 @@ CVfdSetup::~CVfdSetup() } -void CVfdSetup::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - int CVfdSetup::exec(CMenuTarget* parent, const std::string &) { diff --git a/src/gui/vfd_setup.h b/src/gui/vfd_setup.h index ee090d7d7..614b5f710 100644 --- a/src/gui/vfd_setup.h +++ b/src/gui/vfd_setup.h @@ -33,19 +33,13 @@ #include -#include - #include class CVfdSetup : public CMenuTarget { private: + int width, selected; - CFrameBuffer *frameBuffer; - - int x, y, width, height, hheight, mheight, selected; - - void hide(); void showSetup(); public: diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index a8035274f..cc30687e3 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -67,12 +67,7 @@ CVideoSettings::CVideoSettings(bool wizard_mode) VcrVideoOutSignalOptionChooser = NULL; width = w_max (35, 20); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight+13*mheight+ 10; selected = -1; - x = getScreenStartX (width); - y = getScreenStartY (height); prev_video_mode = g_settings.video_Mode; @@ -100,11 +95,6 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/) return res; } -void CVideoSettings::hide() -{ - frameBuffer->paintBackgroundBoxRel(x,y, width,height); -} - #define VIDEOMENU_43MODE_OPTION_COUNT 4 const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[VIDEOMENU_43MODE_OPTION_COUNT] = { diff --git a/src/gui/videosettings.h b/src/gui/videosettings.h index b2c420ebe..801aac629 100644 --- a/src/gui/videosettings.h +++ b/src/gui/videosettings.h @@ -47,7 +47,7 @@ class CVideoSettings : public CMenuWidget, CChangeObserver bool is_wizard; - int x, y, width, height, hheight, mheight, selected; + int width, selected; void showVideoSetup(); public: @@ -72,8 +72,6 @@ public: bool getWizardMode() {return is_wizard;}; void setWizardMode(bool mode); - void hide(); - int exec(CMenuTarget* parent, const std::string & actionKey); }; #endif diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index cd6713746..f48421da6 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -36,119 +36,53 @@ //#define TEST_MENU -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include - - #include "global.h" #include "neutrino.h" +#include "mymenu.h" -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include -#include -#include - -#include "gui/alphasetup.h" #include "gui/audio_setup.h" -#include "gui/audioplayer.h" +#include "gui/audio_select.h" #include "gui/bedit/bouqueteditor_bouquets.h" #include "gui/bouquetlist.h" -#include "gui/channellist.h" +#include "gui/cam_menu.h" #include "gui/cec_setup.h" -#include "gui/color.h" -#include "gui/customcolor.h" +#include "gui/dboxinfo.h" #include "gui/epg_menu.h" -#include "gui/epgview.h" -#include "gui/eventlist.h" +#include #include "gui/favorites.h" -#include "gui/filebrowser.h" +#include "gui/hdd_menu.h" #include "gui/imageinfo.h" -#include "gui/infoviewer.h" #include "gui/keybind_setup.h" #include "gui/mediaplayer.h" #include "gui/mediaplayer_setup.h" #include "gui/motorcontrol.h" #include "gui/movieplayer.h" -#include "gui/network_setup.h" #include "gui/osd_setup.h" #include "gui/osdlang_setup.h" #include "gui/parentallock_setup.h" -#include "gui/pictureviewer.h" #include "gui/pluginlist.h" #include "gui/plugins.h" -#include "gui/rc_lock.h" #include "gui/record_setup.h" #include "gui/scan.h" #include "gui/sleeptimer.h" +#include #ifdef TEST_MENU #include "gui/test_menu.h" #endif /*TEST_MENU*/ -#include "gui/timerlist.h" #include "gui/update.h" -#include "gui/user_menue_setup.h" -#include "gui/user_menue_setup.h" #include "gui/vfd_setup.h" -#include "gui/videosettings.h" -#include "gui/widget/colorchooser.h" -#include "gui/widget/hintbox.h" -#include "gui/widget/icons.h" -#include "gui/widget/keychooser.h" -#include "gui/widget/menue.h" -#include "gui/widget/messagebox.h" -#include "gui/widget/mountchooser.h" #include "gui/widget/stringinput.h" #include "gui/widget/stringinput_ext.h" -#include -#include -#include -#include -#include - -#include -#include -#include +#include #include -#include - -#include -#include "gui/infoclock.h" -#include "mymenu.h" -#include "gui/dboxinfo.h" -#include "gui/hdd_menu.h" -#include "gui/audio_select.h" -#include "gui/cam_menu.h" - #include #include -#include -#include - extern CFrontend * frontend; @@ -160,11 +94,6 @@ extern Zapit_config zapitCfg; extern char zapit_lat[20]; extern char zapit_long[20]; extern char current_timezone[50]; -extern cVideo *videoDecoder; -extern cAudio *audioDecoder; -// extern bool parentallocked; -//extern const char * locale_real_names[]; -//extern CFontSizeNotifier fontsizenotifier; extern CFanControlNotifier * funNotifier; extern CRemoteControl * g_RemoteControl; extern CCAMMenuHandler * g_CamHandler;