mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,252 Commits 1 Branch 51 Tags
3f316f95c4897abcf58c638ddcd58b39758f81dc
Commit Graph

336 Commits

Author SHA1 Message Date
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
svenhoefer
655ae5d51f - osd-setup: move menu-related stuff to a submenu 'menus' 
* re-sort remaining items
 2013-05-10 21:36:34 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
Michael Liebmann
3d33901e5e * OSD Setup: Move volume settings in a separate submenu. 2013-05-09 16:58:52 +01:00
Thilo Graf
8baec6d62a CVolumeBar: rework volumebar handling 
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon
 2013-05-08 05:11:24 +01:00
[CST] Focus
8bb70d1ab3 Merge branch 'pu/cc' into next-cc 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/eitd/SIlanguage.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan.h
	src/gui/test_menu.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
	src/neutrino.cpp
	src/nhttpd/yconfig.h
 2013-04-17 13:32:12 +04:00
Stefan Seyfried
5954735ed8 auto-enumerate FONT_TYPE_COUNT instead of defining it 
Conflicts:
	src/system/settings.h
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
1f1aa08562 auto-enumerate FONT_TYPE_COUNT instead of defining it 2013-04-15 21:37:43 +02:00
Stefan Seyfried
ee3580214f auto-enumerate FONT_TYPE_COUNT instead of defining it 2013-04-13 17:27:21 +02:00
Stefan Seyfried
61bf95f552 Merge branch 'check/pu-cc' into master 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp
 2013-04-13 17:17:30 +02:00
svenhoefer
473d6f38ba - eventlist: make additional infos switchable 
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
 2013-04-13 11:13:23 +02:00
Stefan Seyfried
899fcaf8ca osd_setup: bring progressbar locales closer to mainline 2013-04-06 15:20:46 +02:00
Stefan Seyfried
6a955ecef0 fix build / progressbar setup after pu/cc merge 
* CProgressBar::PB_MONO is no longer available
* PB color setup is split over two configuration variables
Fix this while still keeping seamless update compatibility.
 2013-04-06 14:41:06 +02:00
svenhoefer
c20d1ef6eb - osd_progressbar_setup: rework locales; marginal changes in code 
Conflicts:
	data/locale/deutsch.locale
 2013-04-01 16:14:29 +04:00
Thilo Graf
cca6d898c8 CProgressbarSetup: using unified 'osd' namespace 2013-04-01 15:06:41 +04:00
[CST] Focus
fc0571490e gui/osd_setup.cpp: fix show tuner icon option 2013-03-26 19:53:09 +04:00
svenhoefer
33c8526673 - osd_progressbar_setup: rework locales; marginal changes in code 2013-03-26 00:48:04 +01:00
Thilo Graf
7e1ef5d325 CProgressbarSetup: using unified 'osd' namespace 2013-03-19 08:12:43 +01:00
Jacek Jendrzej
369289d179 progressbar-menu-tomworld 2013-03-12 17:27:52 +04:00