1 files changed, 5 insertions, 58 deletions
diff --git a/displaymenuview.h b/displaymenuview.h
index 139404e..4c7ea16 100644
--- a/displaymenuview.h
+++ b/displaymenuview.h
@@ -6,6 +6,7 @@ enum eDetailViewType {dvEvent = 0, dvRecording, dvText};
 class cNopacityDisplayMenuView {
     private:
         cOsd *osd;
+        cImageCache *imgCache;
         cString lastDate;
         int diskUsageAlert;
         cPixmap *pixmapHeader;
@@ -23,70 +24,19 @@ class cNopacityDisplayMenuView {
         cPixmap *pixmapRssFeed;
         cPixmap *pixmapRssFeedBackground;
         cPixmap *pixmapRssFeedIcon;
-        cFont *fontHeader;
-        cFont *fontDate;
-        cFont *fontMenuitemLarge;
-        cFont *fontMenuitemSchedule;
-        cFont *fontMenuitemScheduleSmall;
-        cFont *fontMenuitemChannel;
-        cFont *fontMenuitemChannelSmall;
-        cFont *fontMenuitemRecordings;
-        cFont *fontMenuitemRecordingsSmall;
-        cFont *fontMenuitemTimers;
-        cFont *fontMenuitemTimersSmall;
-        cFont *fontMenuitemDefault;
-        cFont *fontDiskUsage;
-        cFont *fontDiskUsagePercent;
-        cFont *fontTimers;
-        cFont *fontTimersHead;
-        cFont *fontButtons;
-        cFont *fontMessage;
-        cFont *fontEPGInfoWindow;
-        cFont *fontEPGInfoWindowLarge;
-        cFont *fontRssFeed;
-        int osdWidth, osdHeight;
-        int osdLeft, osdTop;
-        int widthScrollbar;
-        int dateWidth;
-        int headerHeight, footerHeight, rssFeedHeight, contentHeight;
-        int contentWidthFull;
-        int contentWidthMain;
-        int contentWidthSchedules;
-        int contentWidthChannels;
-        int contentWidthTimers;
-        int contentWidthRecordings;
-        int contentWidthSetup;
-        int contentWidthMinimum;
-        int menuItemWidthDefault, menuItemHeightDefault;
-        int menuItemWidthMain, menuItemHeightMain;
-        int menuItemWidthSchedule, menuItemHeightSchedule;
-        int menuItemWidthChannel;
-        int menuItemWidthTimer;
-        int menuItemWidthRecording, menuItemHeightRecordings;
-        int menuItemWidthSetup;
-        int diskUsageWidth, diskUsageHeight;
-        int timersWidth;
-        int buttonsBorder, buttonWidth, buttonHeight;
-        int messageWidth, messageHeight;
         int feedNameLength;
         int avrgFontWidth;
         cRect textWindowSizeSchedules;
         cRect textWindowSizeRecordings;
         cRect textWindowSizeChannels;
-        void SetDescriptionTextWindowSize(void);
         int GetContentWidth(eMenuCategory menuCat);
     public:
-        cNopacityDisplayMenuView();
+        cNopacityDisplayMenuView(cImageCache *imgCache);
         virtual ~cNopacityDisplayMenuView(void);
         cOsd *createOsd(void);
-        void SetGeometry(void);
+        void SetDescriptionTextWindowSize(void);
         void CreatePixmaps(void);
         void SetPixmapAlpha(int Alpha);
-        void CreateFonts(void);
-        cFont *GetMenuItemFont(eMenuCategory menuCat);
-        cFont *GetMenuItemFontSmall(eMenuCategory menuCat);
-        cFont *GetEPGWindowFont(void);
-        cFont *GetEPGWindowFontLarge(void);
         void GetMenuItemSize(eMenuCategory menuCat, cPoint *itemSize);
         int GetMaxItems(eMenuCategory menuCat);
         int GetMenuTop(int numItems, int itemHeight);
@@ -95,11 +45,10 @@ class cNopacityDisplayMenuView {
         int mytabs[cSkinDisplayMenu::MaxTabs];
         void SetTabs(int Tab1, int Tab2 = 0, int Tab3 = 0, int Tab4 = 0, int Tab5 = 0);
         int GetEditableWidth(void);
-        int GetWidthDefaultMenu(void) {return menuItemWidthDefault;};
+        int GetWidthDefaultMenu(void) {return geoManager->menuItemWidthDefault;};
         int GetTextAreaWidth(void);
         const cFont *GetTextAreaFont(bool FixedFont);
         cRect *GetDescriptionTextWindowSize(eMenuCategory menuCat);
-        void CreateBackgroundImages(int *handleBackgrounds, int *handleButtons);
         void AdjustContentBackground(eMenuCategory menuCat, eMenuCategory menuCatLast, cRect & vidWin);
         void DrawBorderDecoration(void);
         int ShowHeaderLogo(bool show);
@@ -111,7 +60,7 @@ class cNopacityDisplayMenuView {
         void DrawDate(bool initial);
         void DrawDiskUsage(void);
         void ShowDiskUsage(bool show);
-        void DrawButton(const char *text, int handleImage, tColor buttonColor, tColor borderColor, tColor fontColor, int num);
+        void DrawButton(const char *text, eBackgroundType bgButton, tColor buttonColor, tColor borderColor, tColor fontColor, int num);
         void ClearButton(int num);
         int GetTimersInitHeight(void);
         int GetTimersMaxHeight(void);
@@ -123,10 +72,8 @@ class cNopacityDisplayMenuView {
         void ClearMessage(void);
         void SetDetailViewSize(eDetailViewType detailViewType, cNopacityMenuDetailView *detailView);
         void DrawRssFeed(std::string feedName);
-        cFont *GetRssFeedFont(void) {return fontRssFeed;};
         cPoint GetRssFeedPosition(void);
         cPoint GetRssFeedSize(void);
-        int spaceMenu;
 };