mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/components/cc_frm_clock: simplify; setClockFormat/setClockBlink has now impact on running thread

Browse Source 
Conflicts:
	src/gui/components/cc_frm_clock.cpp
	src/gui/timeosd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13118c1148
Author: martii <m4rtii@gmx.de>
Date: 2014-01-10 (Fri, 10 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-01-10 20:02:16 +01:00
committed by [CST] Focus
parent fe4429fc79
commit 03d91b7b1a
3 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/components/cc_frm_clock.h
View File

@@ -71,10 +71,10 @@ class CComponentsFrmClock : public CComponentsForm
///text color
int cl_col_text;
///time format
std::string cl_format_str;
const char *cl_format_str;
///time format for blink
std::string cl_blink_str;
///time string align, default allign is ver and hor centered
const char *cl_blink_str;
///time string align, default align is ver and hor centered
int cl_align;
///initialize clock contents
@@ -83,6 +83,8 @@ class CComponentsFrmClock : public CComponentsForm
virtual void initTimeString();
///initialize of general alignment of timestring segments within form area
void initSegmentAlign(int* segment_width, int* segment_height);
//return current time string format
const char *getTimeFormat(time_t when) { return (when & 1) ? cl_format_str : cl_blink_str; }
///return pointer of font object
inline Font** getClockFont();