Commit Graph

304 Commits

Author SHA1 Message Date
[CST] Focus
c8b33f6bda gui/osd_setup.cpp: re-use common channel list settings in context menu 2014-07-17 17:02:47 +04:00
[CST] Focus
0cda142ba7 Revert "CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup"
commit has problems: bad looking, if fade is ON, menu missed channel list fonts config

This reverts commit 253579909f.
2014-07-17 17:02:43 +04:00
[CST] Focus
416646bbff merge neutrino-mp progressbar code, (C) martii 2014-07-17 17:02:37 +04:00
svenhoefer
8887767141 - osd_setup: don't show colored progress bar option in channellist ...
... when colored progress bar is disabled
2014-06-27 18:26:13 +02:00
Thilo Graf
253579909f CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup
This removes multiple code parts from COsdSetup without
loss of functionality.
2014-06-23 18:43:47 +02:00
svenhoefer
df1c8ac00d - channellist: add colored progressbars
* thx to bazi98, martii and benny
2014-06-23 17:05:44 +02:00
svenhoefer
da7f3b9cb1 - drop obsolete code around FONT_TYPE_GAMELIST
these fonts are not needed since gamelist/scriptlist
  are painted with menu-widget
2014-05-02 22:28:36 +02:00
Stefan Seyfried
add688bbb8 Merge remote-tracking branch 'check/next-cc'
broken, needs buildfixing
2014-02-23 15:17:48 +01:00
[CST] Focus
29617ba843 gui/osd_setup.cpp: add 'other' font sizes group,
add subtitles font size setup
2014-02-21 20:01:13 +04: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
M. Liebmann
b41819190d Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
7d379dcb30 Merge remote-tracking branch 'check/next-cc' 2013-12-29 22:12:09 +01:00
svenhoefer
9fb63a20d9 - channellist: channellogos can be disabled 2013-12-28 23:39:51 +01:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc'
Lightly tested only...
2013-12-25 22:51:23 +01:00
M. Liebmann
025295b6b4 CInfoClock: menu item for setting color of the digit added 2013-12-25 18:32:01 +01:00
martii
cbc9299df8 convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
2013-12-25 12:08:14 +01:00
svenhoefer
798e926f3f - osd-setup: use a more suitable value for maximal osd-timeout 2013-12-22 21:38:51 +01:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing
2013-12-22 21:25:05 +01:00
martii
697b1a75b3 gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...
... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
2013-12-22 21:13:45 +01:00
svenhoefer
4b4ef281a4 - osd-setup: fix e97e33532b 2013-12-10 03:02:44 +01:00
svenhoefer
e97e33532b - infoclock: add some features
* add shadow to infoclock
* rename some locals
* change default height of clock
* add option to switch bachground on/off (default off)
* add option to switch seconds on/off (default on)
2013-12-10 02:38:43 +01:00
svenhoefer
25b1b35872 - osd-setup: add option to switch clock on or off 2013-12-10 02:22:27 +01:00
svenhoefer
52f51e7f27 - infoclock: cleanup (remove unneeded stuff) 2013-12-09 23:12:23 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc'
Only compile-tested.
2013-11-30 20:17:31 +01:00
Stefan Seyfried
bf8ec4d89e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies""
This reverts commit 3c8d47fa49.

No Idea why this was reverted, so revert again :-)
2013-11-30 18:26:47 +01:00
[CST] Focus
98fb57d924 gui/osd_setup.cpp: fix memleak 2013-11-29 17:27:10 +04:00
M. Liebmann
435d25c0ce CInfoClock: Use dynamic font for display 2013-11-28 16:07:49 +01:00
svenhoefer
3c8d47fa49 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit 4bc6e43ad4.
2013-11-13 23:40:16 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +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
martii
4eb66ba4b2 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
2013-11-09 17:03:03 +01:00
[CST] Focus
4e423e2bd7 gui/osd_setup.cpp: fix Window size in menu, snprintf take care about 0 at the end 2013-11-07 18:59:42 +04:00
[CST] Focus
aaf9d3edf6 gui/osd_setup.cpp: add support to change window width and height,
use buttons up/down to change height, left/right to change width, page up/down to change both
2013-11-07 17:27:23 +04:00
Stefan Seyfried
50977ef2f5 Merge branch 'check/next-cc' 2013-09-03 09:36:49 +02:00
svenhoefer
6ed30528f9 - osd_setup: introduce g_settings.window_size to scale some windows
* remove g_settings.big_windows
* add setup window (use up/down to change size)
2013-09-02 20:59:26 +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
e473df6a43 CNeutrinoFonts: Use separate font renderer for dynamic fonts
- delete / initialize font renderer only if necessary
  (e.g. start program, change the font file, change the scaling)
2013-07-26 14:52:37 +02:00
Michael Liebmann
0a0035c2ae Add option to resize the VolumeBar
- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
  Menu -> Settings -> OSD -> Volume -> Height of display
2013-07-21 22:06:05 +02:00
Michael Liebmann
465d2aba23 Add new class CNeutrinoFonts for setup and modify neutrino fonts
- move SetupFonts() from CNeutrinoApp to CFontSetup
2013-07-21 22:05:14 +02:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
2013-07-06 19:01:15 +02:00
Michael Liebmann
dfd5c29371 COsdSetup: Fix segfault due 'double free or corruption' (glibc)
- remove 'delete mfFontFile' & 'delete mfTtxFontFile' from destructor
- initialize variables mfFontFile & mfTtxFontFile
2013-07-04 22:58:36 +02:00
Michael Liebmann
6d3a05fe0a COsdSetup: Display file names in font setup menu 2013-07-03 07:30:10 +02:00
Michael Liebmann
2a63a85584 CVolumeBar: add enums for volume bar pos 2013-07-03 07:30:09 +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
Michael Liebmann
c70167b58f CVolumeBar: Reactivate position 'higher center' for volume bar 2013-06-06 12:00:06 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
2013-05-24 20:24:39 +02:00
svenhoefer
c80b1b0640 - locals: use more matching descriptions for screen positions 2013-05-11 12:57:36 +02:00
Michael Liebmann
d90ce27876 * COsdSetup::changeNotify: Add handling for volume digits / CVolumeHelper 2013-05-11 09:38:23 +01:00
svenhoefer
1376a94197 - osd-setup: fix segmentation fault 2013-05-10 22:48:37 +02:00