From 4eee095aadd2567a8c2cf031a3376cf01902fa75 Mon Sep 17 00:00:00 2001 From: thilo Date: Fri, 6 May 2011 18:15:53 +0000 Subject: [PATCH] *neutrino osd settings: use enums git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1435 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/osd_setup.h | 16 ++++++++++++---- src/gui/osdlang_setup.h | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/gui/osd_setup.h b/src/gui/osd_setup.h index a9afecd6f..ddf4b0053 100644 --- a/src/gui/osd_setup.h +++ b/src/gui/osd_setup.h @@ -60,10 +60,6 @@ void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry); public: - COsdSetup(bool wizard_mode = false); - ~COsdSetup(); - int exec(CMenuTarget* parent, const std::string & actionKey); - enum INFOBAR_CHANNEL_LOGO_POS_OPTIONS { INFOBAR_NO_LOGO, @@ -78,6 +74,18 @@ INFOBAR_LOGO_FRAMED, INFOBAR_LOGO_SHADED }; + + enum OSD_SETUP_MODE + { + OSD_SETUP_MODE_WIZARD_NO = 0, + OSD_SETUP_MODE_WIZARD = 1 + }; + + COsdSetup(bool wizard_mode = OSD_SETUP_MODE_WIZARD_NO); + ~COsdSetup(); + int exec(CMenuTarget* parent, const std::string & actionKey); + + }; diff --git a/src/gui/osdlang_setup.h b/src/gui/osdlang_setup.h index 1689a3375..db20de01e 100644 --- a/src/gui/osdlang_setup.h +++ b/src/gui/osdlang_setup.h @@ -71,7 +71,7 @@ class COsdLangSetup : public CMenuTarget, CChangeObserver OSDLANG_SETUP_MODE_WIZARD = 1 }; - COsdLangSetup(bool wizard_mode = false); + COsdLangSetup(bool wizard_mode = OSDLANG_SETUP_MODE_WIZARD_NO); ~COsdLangSetup(); int exec(CMenuTarget* parent, const std::string & actionKey); };