mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 10:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,398 Commits 1 Branch 51 Tags
32de6beef0ffe81ffa0444afcc43c416f18cc492
Commit Graph

107 Commits

Author SHA1 Message Date
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
e60067545f Define real text color for use in RenderString() 2013-07-21 22:00:46 +02:00
Stefan Seyfried
7c6e91d045 CAutoModeNotifier: avoid out-of-bounds access 2013-05-25 22:04:31 +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
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
Michael Liebmann
cfd7b4b16b * Rework positioning of volumebar / mute icon / info clock 
- Is required for custom icons
 2013-05-10 11:32:12 +01: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
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
Stefan Seyfried
676ef79dca setting_helpers: add reloadhintbox to 'delete removed channels' 2013-04-17 10:21:33 +04:00
Stefan Seyfried
da327c099b add menu option to delete 'removed channels' 2013-04-17 10:21:33 +04:00
Stefan Seyfried
e868be4f14 setting_helpers: add reloadhintbox to 'delete removed channels' 2013-04-14 19:41:08 +02:00
Stefan Seyfried
1c58f5f093 add menu option to delete 'removed channels' 2013-04-14 12:46:10 +02:00
Stefan Seyfried
ffd4daea7c neutrino: fix most hardcoded paths 2013-03-10 02:01:52 +01:00
[CST] Focus
aa60c85768 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp
 2013-03-07 17:10:57 +04:00
Stefan Seyfried
988a8ebec2 helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-03-05 11:58:49 +01:00
Stefan Seyfried
96650cdd45 helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
 2013-03-03 19:18:13 +01:00
[CST] Focus
ced8b191b1 system/setting_helpers.cpp: fix unused warning on apollo 2013-01-30 17:53:56 +04:00
[CST] Focus
4b10e2e7c9 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files 2013-01-29 14:48:00 +04:00
[CST] Focus
093eae2ebc system/setting_helpers.cpp: dont use IOC_CONTROL_PWM_SPEED on apollo 2013-01-16 15:52:06 +04:00
[CST] Focus
6e41c65fad merge public git changes 2013-01-09 19:30:07 +04:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
[CST] Focus
20c25334cd system/setting_helpers.cpp: fix timezone change 2012-12-27 12:15:37 +04:00
micha-bbg
b1138e16b0 * Fix include path for moved header files 2012-12-13 18:09:09 +01:00
Stefan Seyfried
e5e7d52fa1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp
 2012-11-23 18:45:22 +01:00
satbaby
89ee8f7a5e src/system/setting_helpers.cpp: use my_system instead of system 2012-11-22 13:27:51 +01:00
Stefan Seyfried
e7b93ab4b2 add dummy CFanControlNotifier::setSpeed() to fix build 2012-11-03 10:47:04 +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
c7dd7ccc78 system/setting_helpers.cpp: add static CFanControlNotifier::setSpeed, 
to call it direct
 2012-11-02 14:18:56 +04:00
[CST] Focus
a1bd6d404b system/setting_helpers.cpp: add static CColorSetupNotifier::setPalette(), 
to call it direct
 2012-11-02 13:46:32 +04:00
[CST] Focus
f78be0f96d system/setting_helpers.cpp: comment CVolume/CInfoClock Init in CColorSetupNotifier::changeNotify: 
is it really needed to re-init them on palette change ?
 2012-11-02 13:10:15 +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
satbaby
7b06b3fd38 Neutrino: rework COnOffNotifier and use it if possible, ported from tuxbox cvs 2012-10-11 14:11:05 +02:00
satbaby
dfa3231469 move safe_mkdir & check_dir to system-helpers 2012-09-11 20:34:53 +02:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02: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
Stefan Seyfried
d7d00c7ddf check_dir: fix typo in warning message 2012-06-27 21:18:19 +02:00
[CST] Focus
d04fe6e94c system/setting_helpers.cpp: fix notifiers, most must not repaint menu 2012-05-31 18:57:44 +04:00
[CST] Focus
bd561e7844 system/setting_helpers.cpp: fix CAudioSetupNotifier - also called for pref. DD; no need to repaint menu 2012-05-31 17:20:12 +04:00
[CST] Focus
4fd04645b7 system/setting_helpers.cpp: cleanup unused code 2012-05-31 17:12:23 +04:00
[CST] Focus
5c85eced31 system/setting_helpers.cpp: workaround for factory reset, clear sat list 2012-05-22 11:47:35 +04:00
[CST] Focus
78ac46c1b2 system/setting_helpers.cpp: remove unused CLedControlNotifier 2012-05-07 16:00:04 +04:00
Stefan Seyfried
f130d20b64 neutrino: improve timezone handling 
* only offer timezones which are actually installed in the system
* symlink the timezone file to /etc/localtime instead of copying
 2012-04-17 19:33:57 +02:00
Stefan Seyfried
146c46da8e neutrino: fix input device repeat setting for pre 2.6.17 kernels 2012-04-17 19:33:57 +02:00
Stefan Seyfried
9221807a7c neutrino: set input device repeat on spark/tripledragon 2012-04-17 19:33:56 +02:00
Stefan Seyfried
5e86416ccb various assorted build fixes / hacks 2012-04-17 19:33:44 +02:00
[CST] Focus
b9bc799cf1 fix conflicts 2012-03-20 11:14:05 +04:00
[CST] Focus
d39b174c75 fix conflicts 2012-03-20 11:07:28 +04:00
micha-bbg
6a5ffc315f * neutrino: GUI Painting of Vol. Mute and Clock (Part3) 
- Use new class for volumebar
- Numeric display added for volumebar (switchable)
- Display of volumebar, mute icon and info clock optimized (top right)
- Volumebar better scalable

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2153 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-18 18:46:48 +00:00
[CST] Focus
f3d2895847 Merge branch 'master', remote-tracking branch 'origin' into dvbsi++ 2012-03-02 19:31:49 +04:00