1 files changed, 21 insertions, 182 deletions

diff --git a/config.h b/config.h
index fc414c5..943f1d3 100644
--- a/config.h
+++ b/config.h
@@ -1,17 +1,27 @@
 #ifndef __NOPACITY_CONFIG_H
 #define __NOPACITY_CONFIG_H
 
-struct RssFeed {
-    std::string name;
-    std::string url;
+enum eDisplayType {
+    dtFlat = 0,
+    dtBlending,
+    dtGraphical
 };
 
 class cNopacityConfig {
     private:
+        std::map<std::string, int> conf;
+        std::map<std::string, std::map<std::string, int> > themeConfigDefaults;
+        std::map<std::string, std::map<std::string, int> > themeConfigSetup;
+        void LoadThemeConfig(cString confFile, cString theme);
+        std::pair<std::string, int> ReadThemeConfigLine(const char *line);
         cString checkSlashAtEnd(std::string path);
     public:
         cNopacityConfig();
         ~cNopacityConfig();
+        int GetValue(std::string name);
+        int *GetValueRef(std::string name);
+        std::map<std::string, int>::const_iterator GetStart(void) { return conf.begin(); };
+        std::map<std::string, int>::const_iterator GetEnd(void) { return conf.end(); };
         bool SetupParse(const char *Name, const char *Value);
         void SetLogoPath(cString path);
         void SetIconPath(cString path);
@@ -22,13 +32,14 @@ class cNopacityConfig {
         cString logoPathDefault;
         cString iconPathDefault;
         cString epgImagePathDefault;
-        bool pathValuesSet;
-        void setDynamicValues();
-        void loadRssFeeds(void);
-        //Theme Setting
-        bool doBlending;
-        //Common
-        int fontIndex;
+        void LoadDefaults(void);
+        void LoadThemeSpecificConfigs(void);
+        void SetThemeSpecificDefaults(void);
+        void SetThemeSetup(void);
+        void SetPathes(void);
+        void DumpConfig(void);
+        void DumpThemeConfig(void);
+        void SetFontName();
         const char *fontDefaultName;
         char *fontName;
         cString logoPath;
@@ -36,178 +47,6 @@ class cNopacityConfig {
         cString iconPath;
         cString epgImagePath;
         bool mainMenuEntry;
-        //DisplayChannel
-        int channelHeight;
-        int channelBorderVertical;
-        int channelBorderBottom;
-        int channelFadeTime;
-        int channelFrameTime;
-        int logoPosition;
-        int logoWidth;
-        int logoHeight;
-        int logoBorder;
-        int backgroundStyle;
-        int symbolStyle;
-        int roundedCornersChannel;
-        int displaySignalStrength;
-        int displaySourceInfo;
-        int displayPrevNextChannelGroup;
-        int fontChannelHeaderSize;
-        int fontChannelDateSize;
-        int fontEPGSize;
-        int fontEPGSmallSize;
-        int fontChannelGroupSize;
-        int fontChannelGroupSmallSize;
-        int resolutionIconSize;
-        int statusIconSize;
-        int progressCurrentSchedule;
-        int displayPoster;
-        //DisplayReplay
-        int replayHeight;
-        int replayBorderVertical;
-        int replayBorderBottom;
-        int replayFadeTime;
-        int replayFrameTime;
-        int fontReplayHeader;
-        int fontReplay;
-        //Display Message
-        int messageWidth;
-        int messageHeight;
-        int messageBorderBottom;
-        int fontMessage;
-        int messageFadeTime;
-        int messageFrameTime;
-        //DisplayTracks
-        int tracksFadeTime;
-        int tracksFrameTime;
-        int tracksWidth;
-        int tracksItemHeight;
-        int tracksPosition;
-        int tracksBorderHorizontal;
-        int tracksBorderVertical;
-        int fontTracksHeader;
-        int fontTracks;
-        //DisplayVolume
-        int volumeFadeTime;
-        int volumeFrameTime;
-        int volumeWidth;
-        int volumeHeight;
-        int volumeBorderBottom;
-        int fontVolume;
-        //DisplayMenu
-        int scrollMode;
-        int spaceMenu;
-        int widthScrollbar;
-        int menuAdjustLeft;
-        int scalePicture;
-        int roundedCorners;
-        int cornerRadius;
-        int useMenuIcons;
-        int mainMenuTitleStyle;
-        int narrowMainMenu;
-        int narrowScheduleMenu;
-        int narrowChannelMenu;
-        int narrowTimerMenu;
-        int narrowRecordingMenu;
-        int narrowSetupMenu;
-        int displayRerunsDetailEPGView;
-        int numReruns;
-        int useSubtitleRerun;
-        int displayAdditionalEPGPictures;
-        int numAdditionalEPGPictures;
-        int displayAdditionalRecEPGPictures;
-        int numAdditionalRecEPGPictures;
-        int menuChannelDisplayMode;
-        int menuChannelDisplayTime;
-        int numEPGEntriesChannelsMenu;
-        int menuFadeTime;
-        int menuEPGWindowFadeTime;
-        int menuFrameTime;
-        int menuEPGWindowFrameTime;
-        int menuScrollDelay;
-        int menuScrollSpeed;
-        int menuScrollFrameTime;
-        int menuInfoTextDelay;
-        int menuInfoScrollDelay;
-        int menuInfoScrollSpeed;
-        int menuInfoScrollFrameTime;
-        int menuWidthMain;
-        int menuWidthSchedules;
-        int menuWidthChannels;
-        int menuWidthTimers;
-        int menuWidthRecordings;
-        int menuWidthSetup;
-        int menuHeightInfoWindow;
-        int menuWidthRightItems;
-        int menuSizeDiskUsage;
-        int showDiscUsage;
-        int discUsageStyle;
-        int showTimers;
-        int numberTimers;
-        int checkTimerConflict;
-        int headerHeight;
-        int footerHeight;
-        int numDefaultMenuItems;
-        int iconHeight;
-        int headerIconHeight;
-        int menuItemLogoWidth;
-        int menuItemLogoHeight;
-        int menuHeaderLogoWidth;
-        int menuHeaderLogoHeight;
-        int timersLogoWidth;
-        int timersLogoHeight;
-        int epgImageWidth;
-        int epgImageHeight;
-        int epgImageWidthLarge;
-        int epgImageHeightLarge;
-        int posterWidth;
-        int posterHeight;
-        int menuRecFolderSize;
-        int useFolderPoster;
-        int borderDetailedEPG;
-        int borderDetailedRecordings;
-        int menuSchedulesWindowMode;
-        int menuRecordingsWindowMode;
-        int fontHeader;
-        int fontDate;
-        int fontMenuitemLarge;
-        int fontMenuitemSchedule;
-        int fontMenuitemScheduleSmall;
-        int fontMenuitemChannel;
-        int fontMenuitemChannelSmall;
-        int fontMenuitemRecordings;
-        int fontMenuitemRecordingsSmall;
-        int fontMenuitemTimers;
-        int fontMenuitemTimersSmall;
-        int fontMenuitemDefault;
-        int fontDiskUsage;
-        int fontDiskUsagePercent;
-        int fontTimersHead;
-        int fontTimers;
-        int fontButtons;
-        int fontMessageMenu;
-        int fontDetailView;
-        int fontDetailViewSmall;
-        int fontDetailViewHeader;
-        int fontDetailViewHeaderLarge;
-        int fontEPGInfoWindow;
-        int fontEPGInfoWindowLarge;
-        //RSS Feeds
-        std::vector<RssFeed> rssFeeds;
-        int displayRSSFeed;
-        int rssFeedHeight;
-        int rssFeedHeightStandalone;
-        int fontRssFeed;
-        int fontRssFeedStandalone;
-        int rssFeedStandalonePos;
-        int rssScrollDelay;
-        int rssScrollSpeed;
-        int rssScrollFrameTime;
-        int rssFeed[5];
-        //Channel Logo Caching
-        int limitLogoCache;
-        int numLogosInitial;
-        int numLogosMax;
 };
 
 #endif //__NOPACITY_CONFIG_H
\ No newline at end of file