Commit Graph

67 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
2ddad19873 Merge branch 'master' into pu/mp 2017-06-21 13:54:49 +02:00
svenhoefer
980e293517 - cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.
2017-06-21 10:31:22 +02:00
Jacek Jendrzej
f292ba6b69 Merge branch 'master' into pu/mp 2017-04-24 21:33:15 +02:00
svenhoefer
fe5f84c1d0 - scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
89bda2d the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
Stefan Seyfried
2303d94300 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
2017-02-07 17:23:42 +01:00
Stefan Seyfried
9082ddf287 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
2017-02-05 13:37:53 +01:00
Stefan Seyfried
c6d7968381 Merge remote-tracking branch 'tuxbox/master' 2016-12-04 18:02:51 +01:00
Thilo Graf
dde298b1b7 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details
2016-10-24 10:31:24 +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
89d373ed05 - bookmarkmanager: use getItemColors function 2016-10-19 10:06:35 +02:00
vanhofen
6629b64d6c - colors: add COL_SCROLLBAR_PASSIVE wrapper 2016-10-10 14:19:54 +02:00
vanhofen
7e7d4e5fc1 - colors: add COL_SCROLLBAR_ACTIVE wrapper 2016-10-10 14:19:54 +02:00
svenhoefer
54f2ac510f - fonts: add and use own font for all footers 2016-08-15 19:02:42 +02:00
svenhoefer
cc5258e6d5 - colors: make footer background color configurable
TODO: footer text color and maybe footer font
2016-08-15 00:14:47 +02:00
svenhoefer
bc39d1e14e - colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
2016-08-14 21:55:18 +02:00
Jacek Jendrzej
f6eb565ea3 avoid division by zero 2016-06-04 17:21:18 +02: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
svenhoefer
9041bff59c - remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
Christian Schuett
14999c7015 bookmark manager: only add bookmark if OK pressed 2015-03-16 11:57:22 +01:00
Christian Schuett
66ec686568 bookmark manager: avoid saving deleted entries to bookmark file 2015-03-16 11:55:29 +01:00
Christian Schuett
103274af75 bookmark manager: don't write bookmark file multiple times ...
... when leaving movieplayer
2015-03-16 11:55:23 +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
svenhoefer
649d1b1f9d - change RenderString() default to UTF8 2014-06-11 23:07:13 +02:00
Thilo Graf
6e92392e11 CBookmarkManager: init bookmarksmodified in constructor
var bookmarksmodified was not intitialized
2014-01-26 20:36:41 +01:00
Thilo Graf
bcf4e4fbf9 revert cd5fd9dab3
use an easier solution, based up neutrino-mp
2014-01-26 20:30:41 +01:00
Stefan Seyfried
78f51baf66 Merge remote-tracking branch 'check/next-cc-fixed' 2014-01-26 00:33:08 +01:00
Stefan Seyfried
f625a18324 Revert "Fix compiler warnings (-Wconversion)"
This reverts commit cd5fd9dab3.

I have a different, simpler version in my tree. Keep only the
(unsigned char) cast in timerlist.cpp
2014-01-26 00:32:23 +01:00
M. Liebmann
cd5fd9dab3 Fix compiler warnings (-Wconversion)
- THX SatBaby for the info
2014-01-25 23:06:27 +01:00
Thilo Graf
5ea7ec48df CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's  possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.
2014-01-24 23:09:56 +01:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
2014-01-23 14:08:37 +01:00
M. Liebmann
31842369cc Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
  CStringInputSMS, CPINInput
  THX Martii
2014-01-19 20:57:38 +01:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc'
Lightly tested only...
2013-12-25 22:51:23 +01:00
martii
2cee6929d6 more char* -> std::string conversions
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
2013-12-25 12:08:14 +01:00
svenhoefer
014dd3ac7b Revert "- add missing include of vfd header"
This reverts commit 3845feb0e4.
2013-11-13 23:39:55 +01:00
svenhoefer
3845feb0e4 - add missing include of vfd header 2013-11-13 10:40:18 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.
2013-11-10 16:55:53 +01:00
Thilo Graf
f7798affc6 CComponents: add unfied header file for general include of cc classes
Provides a unified header file, so it is not required to select a
certain header file.
2013-10-24 21:19:07 +02:00
Stefan Seyfried
c68ffa2155 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment
2013-09-28 13:01:03 +02:00
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
2013-09-01 19:46:10 +02:00
Michael Liebmann
c60c5c5ce3 Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values
2013-07-21 22:00:58 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
2013-06-16 21:22:14 +02:00
Stefan Seyfried
a33086568b neutrino: fix possible div-by-zero in scrollbar calculation 2013-05-30 11:19:39 +02:00
Stefan Seyfried
6a48922350 neutrino: fix possible div-by-zero in scrollbar calculation 2013-05-29 15:33:21 +02:00
svenhoefer
6c41ffbe47 - neutrino: don't save screen while paint headers 2013-05-28 10:42:39 +02:00
svenhoefer
2204631859 - bookmarkmanager/bouquetlist: add missing includes 2013-05-27 22:08:24 +02:00
svenhoefer
a0d9a6b64f - bookmarkmanager: using CComponentsHeader to paint header 2013-05-27 21:21:49 +02:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
2013-05-11 17:17:33 +02:00