Jacek Jendrzej
7ad4a0e6cc
Merge branch 'master' into pu/mp
2017-10-02 13:56:25 +02:00
Stefan Seyfried
0d9139054a
remove "using namespace std" from header files
...
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)
2017-10-02 13:43:57 +02:00
Jacek Jendrzej
4fc73acffc
Merge branch 'master' into pu/mp
2017-09-29 10:49:27 +02:00
svenhoefer
99cc7f850a
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
2017-09-29 10:34:23 +02:00
Stefan Seyfried
13ab1ebc8a
Merge remote-tracking branch 'tuxbox/master'
...
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
svenhoefer
2911e638c7
- add listModeKey() function to simplify these calls
2016-09-09 10:42:46 +02:00
[CST] Focus
302642cee7
neutrino: add webtv channel list mode
2016-03-23 16:36:00 +03:00
Thilo Graf
d8e3ecfa1d
CDBoxInfoWidget: remove superfluous paint of header
2016-03-22 13:15:19 +01:00
[CST] Focus
c796891165
gui/dboxinfo.cpp: try to fix missing s/n digits,
...
fix x position
2016-01-29 14:41:09 +03:00
Stefan Seyfried
530da9abeb
Revert "gui/dboxinfo.cpp: add serial number to title"
...
This reverts commit 6bcb85fa07
2015-12-13 17:45:06 +01:00
Stefan Seyfried
eeee5bacab
Merge remote-tracking branch 'uncool/cst-next'
...
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
[CST] Focus
6bcb85fa07
gui/dboxinfo.cpp: add serial number to title
2015-09-24 12:28:23 +03:00
Stefan Seyfried
d37b3c0f9a
Merge remote-tracking branch 'check/cst-next'
...
Conflicts:
src/daemonc/remotecontrol.cpp
src/gui/luainstance.cpp
src/gui/movieplayer.cpp
src/gui/videosettings.cpp
src/neutrino.cpp
src/system/setting_helpers.cpp
src/zapit/src/zapit.cpp
2014-12-28 12:32:12 +01:00
Stefan Seyfried
a91a27900c
dboxinfo: fix buffer size, avoid overflow
2014-12-26 22:13:59 +01:00
Stefan Seyfried
69c4dbbdba
Merge remote-tracking branch 'check/cst-next'
...
needs build- and functional fixes
Conflicts:
configure.ac
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/english.locale
lib/libmd5sum/md5.c
src/driver/scanepg.cpp
src/driver/streamts.cpp
src/driver/vfd.cpp
src/driver/vfd.h
src/driver/volume.cpp
src/eitd/dmx.cpp
src/eitd/xmlutil.cpp
src/gui/Makefile.am
src/gui/audiomute.cpp
src/gui/channellist.cpp
src/gui/dboxinfo.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/keybind_setup.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/miscsettings_menu.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/osd_progressbar_setup.cpp
src/gui/osd_progressbar_setup.h
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/personalize.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/update_settings.cpp
src/gui/user_menue.cpp
src/gui/user_menue_setup.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/menue.h
src/gui/widget/progresswindow.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/setting_helpers.cpp
src/zapit/lib/zapitclient.cpp
src/zapit/src/fastscan.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/scan.cpp
src/zapit/src/scannit.cpp
src/zapit/src/scanpmt.cpp
src/zapit/src/transponder.cpp
src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
Jacek Jendrzej
d5d6c4de62
fix some possible errors
2014-11-06 14:40:44 +01:00
Jacek Jendrzej
8055c0fbe2
dboxinfo.cpp: fix progressbar offset
2014-09-27 16:21:26 +04:00
martii
b21cb152b5
system/settings: move theme colors to dedicated struct
...
Conflicts:
src/driver/pictureviewer/pictureviewer.cpp
src/gui/epgview.cpp
src/gui/osd_setup.cpp
src/gui/pluginlist.cpp
src/neutrino.cpp
2014-09-12 18:29:21 +04:00
svenhoefer
0d236b39c1
- dboxinfo: align color of time/load headers to other headers
2014-09-11 16:19:00 +02:00
[CST] Focus
d3c4b4f199
gui/dboxinfo: fixes
2014-09-11 18:12:09 +04:00
martii
742760dbd3
gui/dboxinfo: localize (partially based on patch from Benny -- thanks!)
...
Conflicts:
src/gui/dboxinfo.cpp
2014-09-11 18:12:06 +04:00
[CST] Focus
6857f616c2
gui/dboxinfo.cpp: do not paint empty line
2014-09-09 15:28:35 +04:00
[CST] Focus
416646bbff
merge neutrino-mp progressbar code, (C) martii
2014-07-17 17:02:37 +04:00
Thilo Graf
69e2debb02
COSDFader: rename member functions, adapt implementations
...
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.
2014-06-23 18:43:47 +02:00
svenhoefer
8b91cda918
- change getRenderWidth() default to UTF8
2014-06-11 23:07:00 +02:00
Stefan Seyfried
44ba8fafca
Merge remote-tracking branch 'check/next-cc'
...
build-tested only, needs fixing
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/Makefile.am
src/driver/rcinput.cpp
src/driver/streamts.cpp
src/eitd/sectionsd.cpp
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/hdd_menu.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/pluginlist.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/user_menue.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrinoMessages.h
src/system/locals.h
src/system/locals_intern.h
src/zapit/include/zapit/scan.h
src/zapit/src/femanager.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2014-04-27 19:14:06 +02:00
Jacek Jendrzej
5764f3fc2c
dboxinfo.cpp: shov inactive rec icon, if no rec is run
2014-04-01 14:44:09 +02:00
Stefan Seyfried
ecf430ba97
dboxinfo: fix format strings for uint64_t
2014-01-13 20:56:56 +01:00
Stefan Seyfried
f23b9074f6
dboxinfo: fix format strings for uint64_t
2014-01-12 14:45:48 +01:00
Stefan Seyfried
a92141d147
Merge remote-tracking branch 'check/next-cc'
2014-01-12 14:41:44 +01:00
martii
341b75ccd9
gui/dboxinfo: minor clean-up
2014-01-07 02:00:56 +01:00
martii
8839256793
gui/dboxinfo: fix bytes2string()
2014-01-06 14:04:50 +01:00
Stefan Seyfried
6a158066d0
fix sign
2014-01-06 00:34:06 +01:00
Stefan Seyfried
34a2d55385
dboxinfo: avoid unnecessary 64bit math
...
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.
2014-01-05 21:12:20 +01:00
Stefan Seyfried
75e14b90e5
dboxinfo: remove impossible case
...
The kernel does (and has always) report memory in
kib units, so there is no need to check this.
2014-01-05 21:11:59 +01:00
Stefan Seyfried
171324fb95
dboxinfo: fix partition size display
2014-01-05 21:10:42 +01:00
Stefan Seyfried
77c07386e6
dboxinfo: avoid unnecessary 64bit math
...
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.
2014-01-05 19:01:59 +01:00
Stefan Seyfried
5d157456ed
dboxinfo: remove impossible case
...
The kernel does (and has always) report memory in
kib units, so there is no need to check this.
2014-01-05 18:53:23 +01:00
Stefan Seyfried
8946c6ebf8
dboxinfo: fix partition size display
2014-01-05 18:34:51 +01:00
Stefan Seyfried
56a7262d5d
Merge remote-tracking branch 'check/next-cc'
2014-01-05 18:31:31 +01:00
svenhoefer
621a712e81
- dboxinfo: show uptime even more human readable
2014-01-04 12:26:08 +01:00
martii
535f5dfc67
gui/dboxinfo: show remote volumes, too
2014-01-04 12:26:08 +01:00
Michael Liebmann
fb5aa513d6
- dboxinfo: prevent rendering outside window
2014-01-04 12:26:08 +01:00
svenhoefer
19bcfa5329
- dboxinfo: show uptime more human readable; show load average
2014-01-04 12:26:08 +01:00
svenhoefer
f2f2e208d6
- dboxinfo: don't show frontends
2014-01-04 12:26:08 +01:00
martii
5e9af14eb5
gui/dboxinfo: adjust spacing
2014-01-04 12:26:08 +01:00
martii
06a95008fd
gui/dboxinfo: unbreak height calculation
2014-01-04 12:26:08 +01:00
martii
9285f9cdbd
gui/dboxinfo: slightly re-arrange window
2014-01-04 12:26:08 +01:00
martii
b95f7298e9
gui/dboxinfo: fix widths
2014-01-04 12:26:08 +01:00
martii
bb7f90681f
gui/dboxinfo: rework table alignment
2014-01-04 12:26:08 +01:00
