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

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

File diff suppressed because it is too large Load Diff

View File

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