mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 19:01:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 1 Branch 51 Tags
0cfd982aa06aa45219db33ba370bafb024e6ea3b
Commit Graph

304 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
be2966035f progressbar-menu-tomworld 2013-03-11 14:40:36 +01:00
Stefan Seyfried
385d4ff6a9 neutrino: add more progressbar design options 
new progressbar design
* colored horizontal lines
* colored vertical lines
* colored solid bar
 2013-03-09 13:23:14 +01:00
Stefan Seyfried
8048673dec Merge branch 'check/next' into master 
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp
 2013-03-07 17:10:11 +01:00
svenhoefer
d4370304cd - osd_setup.cpp: move dest-dir for screenshots to top of menu 2013-02-26 13:10:17 +01:00
Stefan Seyfried
0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2013-02-21 17:07:18 +01:00
Jacek Jendrzej
6fb981b447 add progressbar hint loc 2013-02-12 19:26:46 +01:00
Jacek Jendrzej
63c66c1f4e add progressbar opt to infobar 2013-02-12 18:03:50 +01:00
tomworld
105c6b4c70 * channellist.cpp: Use extra font for event list 2013-02-12 15:45:27 +01:00
svenhoefer
e07e95bfb2 - osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line 2013-02-05 00:44:13 +01:00
svenhoefer
ce0025c7cd - osd_setup.cpp: add 'channellist.additional' to channellist's submenu 
very ugly: same code two times
 2013-02-04 23:43:16 +01:00
svenhoefer
d8bd46e9d1 - channellist: make miniTV switchable 2013-02-04 22:25:15 +01:00
TangoCash
1a425308ed add optional mini-tv to channellist 
Signed-off-by: satbaby <crashdvb@googlemail.com>
 2013-01-30 19:17:52 +01:00
Stefan Seyfried
a5ed005ff8 neutrino: enable screenshots 2013-01-13 18:49:37 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
[CST] Focus
bc6a239002 gui/osd_setup.cpp: remove unneeded colorSetupNotifier->changeNotify 2012-11-02 12:56:44 +04:00
[CST] Focus
483e9563e5 gui/osd_setup.cpp: set hints for channel list context menu -> settings, 
testing menu/hints over gui with save-screen.
TODO: still small glitch at menu bottom, when switching hints on/off
with help button, sometimes.
 2012-10-20 11:13:22 +04:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.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/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2012-10-14 12:51:07 +02:00
micha-bbg
7a414b7c56 osd_setup.cpp: Fix segfault in mode single tuner/display tuner icon 2012-10-02 11:08:48 +01:00
Thilo Graf
ca748c6f48 *COsdSetup: show correct option in infobar tuner icon setup item 
It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.
 2012-09-18 12:10:18 +02:00
Thilo Graf
807dce9497 *CInfoViewer: don't show tuner icon with single boxes 2012-09-18 12:10:17 +02:00
Stefan Seyfried
d3497c9ad1 osd_setup: fix build by disabling unfinished menu_hints 2012-09-15 12:11:26 +02:00
Thilo Graf
260af3fb65 *COsdSetup: change order of includes 
- typo fix in member name
  showOsdScreenshottSetup->showOsdScreenShotSetup
 2012-08-21 09:48:22 +01:00
micha-bbg
ccd8e39182 * Numeric display volumebar can be switched off. 
- Adjustable via Menu -> Settings -> OSD -> Volumebar digits
 2012-07-23 09:07:10 +01:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
 2012-07-23 01:02:29 +02:00
svenhoefer
9b66c00d04 - osd_setup.cpp: remove double include 2012-07-20 17:50:11 +02:00
[CST] Focus
3b0dec611c gui/osd_setup.cpp: fix channel list menu, if fade enabled 2012-07-16 19:05:35 +04:00
[CST] Focus
9c3f281445 gui/osd_setup.cpp: in channel context menu->fonts use cancel button 2012-07-16 16:23:24 +04:00
[CST] Focus
58d513d963 fix conflicts: 
adding hints is work in progress, so until most is finished,
please avoid sorting locals.h, locals_intern.h, english.locale.
to resolve i had to sort (real, case-insensitive) this files
 2012-07-12 12:53:53 +04:00
[CST] Focus
e69c99813c gui/osd_setup.cpp: more hints 2012-07-12 10:31:48 +04:00
micha-bbg
ee781bd880 * Menu hints: Extra font added 
- Font size set by Menu/Settings/Font settings/Menu/Menu hints
 2012-07-11 23:41:08 +01:00
micha-bbg
c542cb3360 * Menu hints: Update loclale 
- english.locale sorted
- deutsch.locale sorted and translated some new entries (THX Tomworld)
- locals.h/locals_intern.h rebuild
- Corrected typo in the locale/source
 2012-07-11 23:41:08 +01:00
[CST] Focus
7ab0876611 gui/osd_setup.cpp: lets just hide menu and repaint on corners option change 2012-07-09 17:37:34 +04:00