mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- timerlist: formatting code using astyle; some manual code nicenings

Browse Source 
Conflicts:
	src/gui/timerlist.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-12-06 05:18:19 +01:00
committed by Thilo Graf
parent 7665fcec9f
commit ee297bc77a
2 changed files with 618 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1166
src/gui/timerlist.cpp
View File

File diff suppressed because it is too large Load Diff

50
src/gui/timerlist.h
View File

@@ -2,7 +2,7 @@
Neutrino-GUI - DBoxII-Project Neutrino-GUI - DBoxII-Project
Timerliste by Zwen Timerliste by Zwen
Homepage: http://dbox.cyberphoria.org/ Homepage: http://dbox.cyberphoria.org/
Kommentar: Kommentar:
@@ -47,24 +47,24 @@ class CTimerdClient;
class CTimerList : public CMenuTarget, public CListHelpers class CTimerList : public CMenuTarget, public CListHelpers
{ {
private: private:
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;
int x; int x;
int y; int y;
int width; int width;
int height; int height;
int font_height; int font_height;
int item_height; int item_height;
int header_height; int header_height;
int footer_height; int footer_height;
int selected; int selected;
int liststart; int liststart;
unsigned int listmaxshow; unsigned int listmaxshow;
bool visible; bool visible;
CComponentsHeader *header; CComponentsHeader *header;
int httpConnectTimeout; int httpConnectTimeout;
CTimerdClient *Timer; CTimerdClient *Timer;
CTimerd::TimerList timerlist; // List of timers CTimerd::TimerList timerlist; // List of timers
CTimerd::responseGetTimer timerNew; CTimerd::responseGetTimer timerNew;
int timerNew_standby_on; int timerNew_standby_on;
std::string timerNew_channel_name; std::string timerNew_channel_name;
@@ -86,29 +86,29 @@ class CTimerList : public CMenuTarget, public CListHelpers
void hide(); void hide();
int modifyTimer(); int modifyTimer();
int newTimer(); int newTimer();
/* todo: properly import the enum CVFD::MODES */ // TODO: properly import the enum CVFD::MODES
CVFD::MODES saved_displaymode; CVFD::MODES saved_displaymode;
bool RemoteBoxSetup(); bool RemoteBoxSetup();
void RemoteBoxSelect(); void RemoteBoxSelect();
std::string RemoteBoxConnectUrl(std::string _rbname); std::string RemoteBoxConnectUrl(std::string _rbname);
bool RemoteBoxChanExists(t_channel_id channel_id); bool RemoteBoxChanExists(t_channel_id channel_id);
bool LocalBoxChanExists(t_channel_id channel_id); bool LocalBoxChanExists(t_channel_id channel_id);
int rem_pre,rem_post; int rem_pre, rem_post;
int item_offset; int item_offset;
bool changed; bool changed;
int bselected; int bselected;
CMenuWidget *remboxmenu; CMenuWidget *remboxmenu;
bool askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTime, char * remotebox_ip); bool askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTime, char *remotebox_ip);
public: public:
CTimerList(); CTimerList();
~CTimerList(); ~CTimerList();
void updateEvents(void); void updateEvents(void);
int show(); int show();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget *parent, const std::string &actionKey);
static const char * convertTimerType2String(const CTimerd::CTimerEventTypes type); // UTF-8 static const char *convertTimerType2String(const CTimerd::CTimerEventTypes type);
static std::string convertTimerRepeat2String(const CTimerd::CTimerEventRepeat rep); // UTF-8 static std::string convertTimerRepeat2String(const CTimerd::CTimerEventRepeat rep);
static std::string convertChannelId2String(const t_channel_id id); // UTF-8 static std::string convertChannelId2String(const t_channel_id id);
void RemoteBoxTimerList(CTimerd::TimerList &timerlist); void RemoteBoxTimerList(CTimerd::TimerList &timerlist);
}; };