mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,395 Commits 1 Branch 51 Tags
f5c72d35c8a39ba786741bdcf15b5b6e79b3a6eb
Commit Graph

296 Commits

Author SHA1 Message Date
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2013-10-21 22:58:55 +02:00
defans
8bad688521 fix right offset when right_text and right_icon is given 2013-10-04 23:22:37 +02:00
Stefan Seyfried
c68ffa2155 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment
 2013-09-28 13:01:03 +02:00
[CST] Focus
d7d181a7ae gui/widget/menue.cpp: fix parent arg for exec using menu action keys 2013-09-27 16:27:21 +04:00
Thilo Graf
33ec56ad6f CComponents: remove member setCornerRadius(), 
setCorner() replaces this function, 2nd parameter sets type
 2013-09-19 08:24:40 +02:00
Thilo Graf
a9a1c5dd68 CMenuItem: use CComponentsShapeSquare to paint color sector 
This is only a partial solution. CMenuItem class can
principle completely be implemented with cc-items or cc-Forms.
 2013-09-19 08:24:40 +02:00
Thilo Graf
c8356949db CMenuItem:remove picked #ifdef statements 
Those cherry picks have no effect, but
contain unfavorable maintainer tags or was mixed with other commits,
therefore they may be removed or need separately revision.
- g_settings.menu_numbers_as_icons: not exists
- "active": was deliberately chosen so
- g_settings.key_channelList_pageup: is intended for channel list handling
 2013-09-19 08:24:39 +02:00
Thilo Graf
4ddf59b175 CMenuOptionLanguageChooser:prevent alter of value conversion 
compiler warning: wconversion
 2013-09-04 11:48:49 +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
c60c5c5ce3 Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values
 2013-07-21 22:00:58 +02:00
[CST] Focus
5d95016b37 colorchooser: display selected color in menue, based on patch (c) martii <m4rtii@gmx.de> 2013-07-18 14:51:59 +04:00
martii
d6de6baebb widget/menue: don't render text over right icon 2013-07-18 14:51:59 +04:00
martii
ca519aa074 widget/menue: implement CMenuOptionNumberChooser::getWidth() 2013-07-18 14:51:58 +04:00
martii
8f4eee554c widget/menu: print right icon regardless of activation status 2013-07-18 14:51:58 +04:00
martii
3d187e56da CMenuWidget: add action keys 
Conflicts:
	src/gui/widget/menue.h
 2013-07-18 14:51:58 +04:00
[CST] Focus
8b5bbf8911 gui/widget/menue.cpp: add CMenuItem isStatic param, (c) martii <m4rtii@gmx.de> 2013-07-18 14:51:58 +04:00
Christian Schuett
7702408456 - menue.cpp: fix macro usage of SUB_HEAD 2013-07-15 23:16:44 +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
5f4d598b1e Revert "CMenuForwarder: Use std::string (not pointer to std::string or char) for option" 
This reverts commit b5d1322617.
 2013-07-04 07:45:51 +02:00
Michael Liebmann
b5d1322617 CMenuForwarder: Use std::string (not pointer to std::string or char) for option 2013-07-04 02:05:33 +02:00
Michael Liebmann
4003d5f434 CMenuWidget: fix simplified up/down code 
- supplement to c5186c82dd
 2013-07-01 12:49:37 +02:00
Stefan Seyfried
ecef1e8ab8 CMenuWidget: fix simplified up/down code 2013-06-20 12:13:54 +02:00
Stefan Seyfried
c5186c82dd CMenuWidget: simplify up/down selection code 2013-06-20 12:13:04 +02:00
Stefan Seyfried
4774366474 menu: fix artifacts on page change 2013-06-20 12:12:29 +02:00
Stefan Seyfried
ed039d6ba9 menu: make page_start[] int, avoids lots of casts 2013-06-20 12:11:45 +02:00
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