rewrote epg grid handling and scrolling, added status header

1 files changed, 21 insertions, 13 deletions

diff --git a/channelcolumn.h b/channelcolumn.h
index 2b1fdbd..054a8c5 100644
--- a/channelcolumn.h
+++ b/channelcolumn.h
@@ -1,33 +1,40 @@
 #ifndef __TVGUIDE_CHANNELCOLUMN_H
 #define __TVGUIDE_CHANNELCOLUMN_H
 
+class cGrid;
 class cEpgGrid;
+class cHeaderGrid;
 // --- cChannelColumn  -------------------------------------------------------------
 
 class cChannelColumn : public cListObject, public cStyledPixmap {
-friend class cEpgGrid;
 private:
-    cPixmap *pixmapLogo;
-	cMyTime *myTime;
+    cMyTime *myTime;
 	int num;
-	cChannel *channel;
-	cList<cEpgGrid> grids;
-	cSchedulesLock schedulesLock;
+	const cChannel *channel;
+	cHeaderGrid *header;
+    cList<cGrid> grids;
+	cSchedulesLock *schedulesLock;
 	const cSchedules *schedules;
 	bool hasTimer;
+    cGrid *addEpgGrid(const cEvent *event, cGrid *firstGrid, bool color);
+    cGrid *addDummyGrid(time_t start, time_t end, cGrid *firstGrid, bool color);
 public:
-	cChannelColumn(int num, cChannel *channel, cMyTime *myTime);
+	cChannelColumn(int num, const cChannel *channel, cMyTime *myTime);
 	virtual ~cChannelColumn(void);
 	void createHeader();
 	void drawHeader();
 	bool readGrids();
 	void drawGrids();
 	int getX();
-	cChannel * getChannel() {return channel;}
-	cEpgGrid * getActive();
-	cEpgGrid * getNext(cEpgGrid *activeGrid);
-	cEpgGrid * getPrev(cEpgGrid *activeGrid);
-	cEpgGrid * getNeighbor(cEpgGrid *activeGrid);
+    int Start() { return myTime->GetStart(); };
+    int Stop()  { return myTime->GetEnd(); };
+    const char* Name() { return channel->Name(); };
+	const cChannel * getChannel() {return channel;}
+	cGrid * getActive();
+	cGrid * getNext(cGrid *activeGrid);
+	cGrid * getPrev(cGrid *activeGrid);
+	cGrid * getNeighbor(cGrid *activeGrid);
+    bool isFirst(cGrid *grid);
 	void AddNewGridsAtStart();
 	void AddNewGridsAtEnd();
 	void ClearOutdatedStart();
@@ -35,8 +42,9 @@ public:
 	int GetNum() {return num;};
 	void SetNum(int num) {this->num = num;};
 	void setTimer() {hasTimer = true;};
+    bool HasTimer() { return hasTimer; };
 	void clearGrids();
 	void dumpGrids();
 };
 
-#endif //__TVGUIDE_CHANNELCOLUMN_H
\ No newline at end of file
+#endif //__TVGUIDE_CHANNELCOLUMN_H