mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,094 Commits 1 Branch 51 Tags
13ab1ebc8a7e235a4a8a4b5d6e3977c32dbaade8
Commit Graph

321 Commits

Author SHA1 Message Date
Stefan Seyfried
3e2e647745 CMenuWidget: fix simplified up/down code 2013-06-16 21:37:49 +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
[CST] Focus
4850e6d77a set infobox color to COL_MENUCONTENTDARK_PLUS_0: 
same color as main window looks boring, probably make sense to add color config option for this
 2013-06-10 15:59:21 +04:00
Stefan Seyfried
49f875508e CMenuWidget: simplify up/down selection code 2013-06-02 23:39:51 +02:00
Stefan Seyfried
0ad51e7964 menu: fix artifacts on page change 2013-06-02 21:33:26 +02:00
Stefan Seyfried
c5760c6a27 menu: make page_start[] int, avoids lots of casts 2013-06-02 20:31:42 +02:00
svenhoefer
07b4716ebf - menue-widget: set header-offset and align sub-headers 2013-05-30 23:06:27 +02:00
svenhoefer
6c41ffbe47 - neutrino: don't save screen while paint headers 2013-05-28 10:42:39 +02:00
svenhoefer
d3f259444e - menue-widget: using CComponentsHeader to paint header 2013-05-28 02:16:38 +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
Jacek Jendrzej
3a62b97fcb supplement to 28198dc320 2013-05-10 13:43:23 +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
Jacek Jendrzej
28198dc320 CMenuWidget::paintItems: clean only last multipage menu 2013-05-09 13:10:23 +02:00
Jacek Jendrzej
6f552797b4 src/gui/widget/menue.cpp: don't paint icon if no space for this 2013-04-29 21:08:44 +02: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
5ad0b6b6dc Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp
 2013-04-06 11:21:55 +02:00
svenhoefer
4714a30f83 - strech most windows to full screen 
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
 2013-04-01 15:42:38 +04:00
[CST] Focus
f21b291fcd gui/widget/menue.cpp: fix CMenuForwarderNonLocalized::getWidth 2013-03-29 17:12:23 +04:00
svenhoefer
759966f935 - strech most windows to full screen 
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on
 2013-03-25 09:45:22 +01:00
Thilo Graf
7ac1550277 CMenuWidget: branch devel_cc Fix merge errors 
Some braces were lost during the last merges.
 2013-03-06 11:28:16 +01:00
Thilo Graf
7df6748f74 CMenuWidget: set frame thickness 
default value in CComponentsInfoBox is inherit from CComponentsContainer
and =0, baut we need =2
 2013-03-06 11:27:55 +01:00
Thilo Graf
12cb192341 CMenuWidget: init instance of CComponentsDetailsLine in constructor 2013-03-06 11:27:55 +01:00
Thilo Graf
232933f9fc CComponentsInfoBox: create instance of CComponentsInfoBox in constructor 2013-03-06 11:27:55 +01:00
micha-bbg
2101a32862 * CMenuWidget: Use removeLineBreaks() in paintHint() 2013-03-06 11:27:54 +01:00
micha-bbg
ff12f2b5b5 CMenuWidget: Remove line breaks from hint text 
- Add font to Constructor & setText()
- remove CTextBox::AUTO_HIGH
 2013-03-06 11:27:54 +01:00
Thilo Graf
53ff9cdddf CMenuWidget: implement CComponentsInfoBox functionality for text and icon 2013-03-06 11:27:53 +01:00
Thilo Graf
b0f9cde09f CMenuWidget: adapt for last changes in CComponents 2013-03-06 11:27:52 +01:00
Thilo Graf
9027ac6fba CMenuWidget: define system colors during runtime 2013-03-06 11:27:51 +01:00
Thilo Graf
485dca43e2 CComponents: add more basic members and sub classes 
- change default colors for info box
- add member methode to synchronize system colors
- add class CComponentsShapeCircle
- add class CComponentsShapeSquare
- add sub class CComponentsPIP
 2013-03-06 11:27:51 +01:00
Thilo Graf
03d276d90a CMenuWidget: adapt to current CComponentsInfoBox changes 2013-03-06 11:27:51 +01:00
Thilo Graf
ec2c78537c *menu.cpp: refresh radius settings 
Changed corner settings in osd setup
have no effect in unchanged menu widget instances.
 2013-03-06 11:27:50 +01:00
[CST] Focus
e178488bf4 gui/widget/menue.cpp: dont allow to exec non-active item - 
in case old, selected, was disabled
 2013-01-09 16:19:08 +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
6ea053c2e9 gui/widget/menue.cpp: fix hintbox color if theme changed; 
fix hint paint for page-up button
 2012-11-21 20:37:54 +04:00
Stefan Seyfried
ad959d9e08 menuewidget: fix menu position code after last uncool merge 2012-11-03 12:33:52 +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
Stefan Seyfried
d5d136f6c1 add CRCInput::getKeyNameC to fix lifetime issues 
in menu.cpp, getKeyName().c_str()'s destructor was already invoked
when the value was used, triggering a valgrind warning.
 2012-10-31 22:52:12 +01:00
Stefan Seyfried
047223440b CMenuWidget: fix width calculation for large menus 
with small screen offsets, large menus could get too large for
the screen and displayed outside -> possible segfault
 2012-10-31 21:17:40 +01:00
[CST] Focus
405ac286e3 gui/widget/menue.cpp: 
always call paintHint(-1) in hide() to clear hintbox;
comment additional hintbox w/h from full_width/full_height - CComponents should clear itself;
dont always save/restore menu hint screens - why it was enabled ??
comment GenericMenuBack->setHint() in ::exec - checkHints() do the same
 2012-10-19 19:30:28 +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
Stefan Seyfried
2e46d81b88 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp 2012-09-15 12:14:33 +02:00
satbaby
e45aa72605 moviebrowser.cpp: -fix2 vfd 2012-09-14 20:12:04 +02:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
satbaby
7359504dd7 -fixes strncpy & buf size 2012-08-07 18:51:44 +02:00
Stefan Seyfried
c6ff06736a neutrino: fix menu position for right or bottom aligned 2012-07-28 23:50:03 +02:00
micha-bbg
bc8128d8d7 * CComponentsInfoBox: Small display bug fixed 2012-07-25 04:37:01 +01:00
[CST] Focus
04f1e9c3f2 gui/widget/menue.cpp: disable 'back' hint, if no other hints present 2012-07-24 15:13:18 +04:00
micha-bbg
1511edb51e * src/gui/widget/menue.cpp: Comment paintHint debug output 2012-07-23 23:49:03 +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