From cd260aabdb23fd97d9cb8b0105e61d90ca844f01 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 3 Jun 2007 22:18:54 +0000 Subject: - general CSS based themeing support. - added setup option to select theme. - added search scheme for themable images and stylesheets. - added marine (default) and redwine theme. - documented new features. All developers must read doc/dev-conventions.txt --- setup.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'setup.h') diff --git a/setup.h b/setup.h index b4db7c1..c888dea 100644 --- a/setup.h +++ b/setup.h @@ -19,7 +19,7 @@ class cMenuSetupLive; class Setup { friend Setup& LiveSetup(); - friend class cMenuSetupLive; // friend declaration is not forward + friend class cMenuSetupLive; // friend declaration is not forward // declaration, although gcc 3.3 claims so public: @@ -39,10 +39,12 @@ public: std::string GetTimes() const { return m_times; } std::string GetStartScreen() const { return m_startscreen; } std::string GetStartScreenLink() const; + std::string GetTheme() const { return m_theme; } + std::string GetThemedLink(const std::string& type, const std::string& name) const { return "themes/" + GetTheme() + "/" + type + "/" + name; } std::string GetLocalNetMask() const { return m_localnetmask; }; bool GetIsLocalNet() const { return m_islocalnet; }; std::string GetLastWhatsOnListMode() const { return m_lastwhatsonlistmode; } - + void SetLastChannel(int lastChannel) { m_lastChannel = lastChannel; } void SetAdminLogin(std::string login) { m_adminLogin = login; } std::string SetAdminPassword(std::string password); @@ -50,16 +52,22 @@ public: void SetScrenshotInterval(int interval) { m_screenshotInterval = interval; } void SetTimes(std::string times) { m_times = times; } void SetStartScreen(std::string startscreen) { m_startscreen = startscreen; } + void SetTheme(std::string theme) { m_theme = theme; } void SetLocalNetMask(std::string localnetmask) { m_localnetmask = localnetmask; } void SetIsLocalNet(bool islocalnet) { m_islocalnet = islocalnet; } + void SetLastWhatsOnListMode(std::string mode) { m_lastwhatsonlistmode = mode; SaveSetup(); } + bool SaveSetup(); bool ParseCommandLine( int argc, char* argv[] ); char const* CommandLineHelp() const; bool ParseSetupEntry( char const* name, char const* value ); + + bool HaveEPGSearch(void); bool CheckLocalNet(const std::string& ip); + private: Setup(); Setup( Setup const& ); @@ -74,16 +82,17 @@ private: // setup options int m_lastChannel; int m_screenshotInterval; - + int m_useAuth; std::string m_adminLogin; std::string m_adminPasswordMD5; std::string m_times; std::string m_startscreen; + std::string m_theme; std::string m_localnetmask; bool m_islocalnet; std::string m_lastwhatsonlistmode; - + bool CheckServerPort(); bool CheckServerIps(); }; @@ -97,15 +106,15 @@ protected: virtual eOSState ProcessKey(eKeys Key); public: cMenuSetupLive(); - + private: int m_lastChannel; int m_screenshotInterval; - + int m_useAuth; char m_adminLogin[20]; char m_adminPassword[20]; - char m_tmpPassword[20]; + char m_tmpPassword[20]; std::string m_oldpasswordMD5; std::string m_newpasswordMD5; -- cgit v1.2.3