epgplus.h: reformat; no binary changes

Origin commit data
------------------
Branch: ni/coolstream
Commit: 491efb3a05
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- epgplus.h: reformat; no binary changes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-08 14:11:27 +02:00
parent 16480e20bd
commit b0231efacf

View File

@@ -3,14 +3,7 @@
Copyright (C) 2001 Steffen Hehn 'McClean' Copyright (C) 2001 Steffen Hehn 'McClean'
Copyright (C) 2004 Martin Griep 'vivamiga' Copyright (C) 2004 Martin Griep 'vivamiga'
Copyright (C) 2017 Sven Hoefer
Kommentar:
Diese GUI wurde von Grund auf neu programmiert und sollte nun vom
Aufbau und auch den Ausbaumoeglichkeiten gut aussehen. Neutrino basiert
auf der Client-Server Idee, diese GUI ist also von der direkten DBox-
Steuerung getrennt. Diese wird dann von Daemons uebernommen.
License: GPL License: GPL
@@ -29,9 +22,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifndef __epgplus__
#ifndef __EPGPLUS_HPP__ #define __epgplus__
#define __EPGPLUS_HPP__
#include "widget/menue.h" #include "widget/menue.h"
@@ -45,8 +37,8 @@ struct button_label;
class EpgPlus class EpgPlus
{ {
//// types, inner classes //// types, inner classes
public: public:
enum FontSettingID enum FontSettingID
{ {
EPGPlus_header_font = 0, EPGPlus_header_font = 0,
@@ -86,7 +78,6 @@ public:
int size; int size;
}; };
enum TViewMode enum TViewMode
{ {
ViewMode_Stretch, ViewMode_Stretch,
@@ -105,7 +96,10 @@ public:
{ {
//// construction / destruction //// construction / destruction
public: public:
Header ( CFrameBuffer* frameBuffer , int x , int y , int width); Header(CFrameBuffer* frameBuffer,
int x,
int y,
int width);
~Header(); ~Header();
@@ -133,7 +127,12 @@ public:
{ {
//// construction / destruction //// construction / destruction
public: public:
TimeLine ( CFrameBuffer* frameBuffer , int x , int y , int width , int startX , int durationX); TimeLine(CFrameBuffer* frameBuffer,
int x,
int y,
int width,
int startX,
int durationX);
~TimeLine(); ~TimeLine();
@@ -141,9 +140,9 @@ public:
public: public:
static void init(); static void init();
void paint ( time_t startTime , int duration); void paint(time_t startTime, int duration);
void paintMark ( time_t startTime , int duration , int x , int width); void paintMark(time_t startTime, int duration, int x, int width);
void paintGrid(); void paintGrid();
@@ -172,15 +171,13 @@ public:
{ {
//// construction / destruction //// construction / destruction
public: public:
ChannelEventEntry ChannelEventEntry(const CChannelEvent* channelEvent,
( const CChannelEvent* channelEvent CFrameBuffer* frameBuffer,
, CFrameBuffer* frameBuffer TimeLine* timeLine,
, TimeLine* timeLine Footer* footer,
, Footer* footer int x,
, int x int y,
, int y int width);
, int width
);
~ChannelEventEntry(); ~ChannelEventEntry();
@@ -188,14 +185,9 @@ public:
public: public:
static void init(); static void init();
bool isSelected bool isSelected(time_t selectedTime) const;
( time_t selectedTime
) const;
void paint void paint(bool isSelected, bool toggleColor);
( bool isSelected
, bool toggleColor
);
static int getUsedHeight(); static int getUsedHeight();
@@ -221,16 +213,14 @@ public:
{ {
//// construction / destruction //// construction / destruction
public: public:
ChannelEntry ChannelEntry(const CZapitChannel* channel,
( const CZapitChannel* channel int index,
, int index CFrameBuffer* frameBuffer,
, CFrameBuffer* frameBuffer Footer* footer,
, Footer* footer CBouquetList* bouquetList,
, CBouquetList* bouquetList int x,
, int x int y,
, int y int width);
, int width
);
~ChannelEntry(); ~ChannelEntry();
@@ -238,10 +228,7 @@ public:
public: public:
static void init(); static void init();
void paint void paint(bool isSelected, time_t selectedTime);
( bool isSelected
, time_t selectedTime
);
static int getUsedHeight(); static int getUsedHeight();
@@ -271,13 +258,11 @@ public:
{ {
//// construction / destruction //// construction / destruction
public: public:
Footer Footer(CFrameBuffer* frameBuffer,
( CFrameBuffer* frameBuffer int x,
, int x int y,
, int y int width,
, int width int height);
, int height
);
~Footer(); ~Footer();
@@ -285,20 +270,11 @@ public:
public: public:
static void init(); static void init();
void setBouquetChannelName void setBouquetChannelName(const std::string& newBouquetName, const std::string& newChannelName);
( const std::string& newBouquetName
, const std::string& newChannelName
);
void paintEventDetails void paintEventDetails(const std::string& description, const std::string& shortDescription);
( const std::string& description
, const std::string& shortDescription
);
void paintButtons void paintButtons(button_label* buttonLabels, int numberOfButtons);
( button_label* buttonLabels
, int numberOfButtons
);
static int getUsedHeight(); static int getUsedHeight();
@@ -322,14 +298,13 @@ public:
std::string currentChannelName; std::string currentChannelName;
}; };
class MenuTargetAddReminder : public CMenuTarget class MenuTargetAddReminder : public CMenuTarget
{ {
public: public:
MenuTargetAddReminder ( EpgPlus* epgPlus); MenuTargetAddReminder(EpgPlus* epgPlus);
public: public:
int exec ( CMenuTarget* parent , const std::string& actionKey); int exec(CMenuTarget* parent, const std::string& actionKey);
private: private:
EpgPlus* epgPlus; EpgPlus* epgPlus;
@@ -339,10 +314,10 @@ public:
class MenuTargetAddRecordTimer : public CMenuTarget class MenuTargetAddRecordTimer : public CMenuTarget
{ {
public: public:
MenuTargetAddRecordTimer ( EpgPlus* epgPlus); MenuTargetAddRecordTimer(EpgPlus* epgPlus);
public: public:
int exec ( CMenuTarget* parent , const std::string& actionKey); int exec(CMenuTarget* parent, const std::string& actionKey);
private: private:
EpgPlus* epgPlus; EpgPlus* epgPlus;
@@ -352,10 +327,10 @@ public:
class MenuTargetRefreshEpg : public CMenuTarget class MenuTargetRefreshEpg : public CMenuTarget
{ {
public: public:
MenuTargetRefreshEpg ( EpgPlus* epgPlus); MenuTargetRefreshEpg(EpgPlus* epgPlus);
public: public:
int exec ( CMenuTarget* parent , const std::string& actionKey); int exec(CMenuTarget* parent, const std::string& actionKey);
private: private:
EpgPlus* epgPlus; EpgPlus* epgPlus;
@@ -365,29 +340,28 @@ public:
class MenuOptionChooserSwitchSwapMode : public CMenuOptionChooser class MenuOptionChooserSwitchSwapMode : public CMenuOptionChooser
{ {
public: public:
MenuOptionChooserSwitchSwapMode ( EpgPlus* epgPlus); MenuOptionChooserSwitchSwapMode(EpgPlus* epgPlus);
virtual ~MenuOptionChooserSwitchSwapMode(); virtual ~MenuOptionChooserSwitchSwapMode();
public: public:
int exec int exec(CMenuTarget* parent);
( CMenuTarget* parent);
private: private:
EpgPlus* epgPlus;
int oldTimingMenuSettings; int oldTimingMenuSettings;
TSwapMode oldSwapMode; TSwapMode oldSwapMode;
EpgPlus* epgPlus;
}; };
class MenuOptionChooserSwitchViewMode : public CMenuOptionChooser class MenuOptionChooserSwitchViewMode : public CMenuOptionChooser
{ {
public: public:
MenuOptionChooserSwitchViewMode ( EpgPlus* epgPlus); MenuOptionChooserSwitchViewMode(EpgPlus* epgPlus);
virtual ~MenuOptionChooserSwitchViewMode(); virtual ~MenuOptionChooserSwitchViewMode();
public: public:
int exec ( CMenuTarget* parent); int exec(CMenuTarget* parent);
private: private:
int oldTimingMenuSettings; int oldTimingMenuSettings;
@@ -396,10 +370,10 @@ public:
class MenuTargetSettings : public CMenuTarget class MenuTargetSettings : public CMenuTarget
{ {
public: public:
MenuTargetSettings ( EpgPlus* epgPlus); MenuTargetSettings(EpgPlus* epgPlus);
public: public:
int exec ( CMenuTarget* parent , const std::string& actionKey); int exec(CMenuTarget* parent, const std::string& actionKey);
private: private:
EpgPlus* epgPlus; EpgPlus* epgPlus;
@@ -407,10 +381,10 @@ public:
typedef time_t DurationSetting; typedef time_t DurationSetting;
/* /*
struct Settings struct Settings
{ {
Settings ( bool doInit = true); Settings(bool doInit = true);
virtual ~Settings(); virtual ~Settings();
@@ -422,37 +396,37 @@ public:
typedef std::map<int, int> Sizes; typedef std::map<int, int> Sizes;
static Font * fonts[NumberOfFontSettings]; static Font * fonts[NumberOfFontSettings];
static int sizes[NumberOfSizeSettings]; static int sizes[NumberOfSizeSettings];
*/ */
friend class EpgPlus::ChannelEventEntry;
friend class EpgPlus::ChannelEntry;
friend class EpgPlus::MenuOptionChooserSwitchSwapMode; friend class EpgPlus::MenuOptionChooserSwitchSwapMode;
friend class EpgPlus::MenuOptionChooserSwitchViewMode; friend class EpgPlus::MenuOptionChooserSwitchViewMode;
friend class EpgPlus::ChannelEntry;
friend class EpgPlus::ChannelEventEntry;
//// construction / destruction //// construction / destruction
public: public:
EpgPlus(); EpgPlus();
~EpgPlus(); ~EpgPlus();
//// methods //// methods
public: public:
void init(); void init();
void free(); void free();
int exec ( CChannelList* channelList , int selectedChannelIndex , CBouquetList* bouquetList); int exec(CChannelList* channelList, int selectedChannelIndex, CBouquetList* bouquetList);
private: private:
static std::string getTimeString ( const time_t& time , const std::string& format); static std::string getTimeString(const time_t& time, const std::string& format);
TCChannelEventEntries::const_iterator getSelectedEvent() const; TCChannelEventEntries::const_iterator getSelectedEvent() const;
void createChannelEntries ( int selectedChannelEntryIndex); void createChannelEntries(int selectedChannelEntryIndex);
void paint(); void paint();
void paintChannelEntry ( int position); void paintChannelEntry(int position);
void hide(); void hide();
//// properties //// properties
private: private:
CFrameBuffer* frameBuffer; CFrameBuffer* frameBuffer;
TChannelEntries displayedChannelEntries; TChannelEntries displayedChannelEntries;
@@ -544,7 +518,7 @@ private:
class CEPGplusHandler : public CMenuTarget class CEPGplusHandler : public CMenuTarget
{ {
public: public:
int exec( CMenuTarget* parent, const std::string &actionKey); int exec(CMenuTarget* parent, const std::string &actionKey);
}; };
#endif #endif // __epgplus__