mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,874 Commits 2 Branches 9 Tags
ffcb0147ac567f332ca3e452b879499897c70193
Commit Graph

210 Commits

Author SHA1 Message Date
Stefan Seyfried
ffcb0147ac Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)
 2013-12-07 18:28:56 +01:00
[CST] Focus
a7b986c270 gui/widget/menue.cpp: fix 4c2c559da3 
Origin commit data
------------------
Commit: e904c1deda
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-01 (Sun, 01 Dec 2013)
 2013-12-01 15:36:28 +04:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
martii
4c2c559da3 remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Commit: 15b2b2ec05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)
 2013-11-29 23:02:50 +01:00
[CST] Focus
74b1a181c5 gui/widget/menue.cpp: try to disable 'always save/restore menu hint screens' (again) 
Origin commit data
------------------
Commit: 8aa819642d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
 2013-11-29 17:27:10 +04:00
[CST] Focus
7839c53283 gui/widget/menue.cpp: cleanup unused code 
Origin commit data
------------------
Commit: 4a07492765
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
 2013-11-29 17:27:10 +04:00
[CST] Focus
a26e1c09e7 gui/widget/menue.cpp: add CMenuDForwarderNonLocalized 
Origin commit data
------------------
Commit: ac773ea896
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
 2013-11-29 17:27:10 +04:00
vanhofen
82168342a2 Revert "- add missing include of vfd header" 
This reverts commit 81d56f75fc.


Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc add missing include of vfd header 
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header
 2013-11-13 10:40:18 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
[CST] Focus
db58552181 gui/widget/menue.cpp: fix jump to some item types with direct key 
Origin commit data
------------------
Commit: 9fe3e97c84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
 2013-11-05 11:44:44 +04:00
Thilo Graf
5f9bb84b28 revert 2649ca147a 
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)
 2013-10-26 23:25:59 +02:00
Thilo Graf
2649ca147a CComponents: rename hide() to hideCC() 
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
 2013-10-24 21:39:04 +02:00
Thilo Graf
41d131eb32 CComponents: add unfied header file for general include of cc classes 
Provides a unified header file, so it is not required to select a
certain header file.


Origin commit data
------------------
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
 2013-10-24 21:19:07 +02:00
Stefan Seyfried
e6cbfe61bc 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


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
defans
d5ead5e172 fix right offset when right_text and right_icon is given 
Origin commit data
------------------
Commit: 8bad688521
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-04 (Fri, 04 Oct 2013)
 2013-10-04 23:22:37 +02:00
Stefan Seyfried
14d73c9280 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
 2013-09-28 13:01:03 +02:00
[CST] Focus
1979dd5ef4 gui/widget/menue.cpp: fix parent arg for exec using menu action keys 
Origin commit data
------------------
Commit: d7d181a7ae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)
 2013-09-27 16:27:21 +04:00
Thilo Graf
975673532a CComponents: remove member setCornerRadius(), 
setCorner() replaces this function, 2nd parameter sets type


Origin commit data
------------------
Commit: 33ec56ad6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)
 2013-09-19 08:24:40 +02:00
Thilo Graf
36a5ed32e7 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.


Origin commit data
------------------
Commit: a9a1c5dd68
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)
 2013-09-19 08:24:40 +02:00
Thilo Graf
9944e36bde 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


Origin commit data
------------------
Commit: c8356949db
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)
 2013-09-19 08:24:39 +02:00
Thilo Graf
d5e4cc4820 CMenuOptionLanguageChooser:prevent alter of value conversion 
compiler warning: wconversion


Origin commit data
------------------
Commit: 4ddf59b175
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-04 (Wed, 04 Sep 2013)
 2013-09-04 11:48:49 +02:00
Stefan Seyfried
2c76238007 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


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
Michael Liebmann
7b6498d39f Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values


Origin commit data
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
 2013-07-21 22:00:58 +02:00
[CST] Focus
b18668f8a3 colorchooser: display selected color in menue, based on patch (c) martii <m4rtii@gmx.de> 
Origin commit data
------------------
Commit: 5d95016b37
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-12 (Fri, 12 Jul 2013)
 2013-07-18 14:51:59 +04:00
martii
31c9850759 widget/menue: don't render text over right icon 
Origin commit data
------------------
Commit: d6de6baebb
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)
 2013-07-18 14:51:59 +04:00
martii
b1dcf5c52a widget/menue: implement CMenuOptionNumberChooser::getWidth() 
Origin commit data
------------------
Commit: ca519aa074
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)
 2013-07-18 14:51:58 +04:00
martii
8290c179ed widget/menu: print right icon regardless of activation status 
Origin commit data
------------------
Commit: 8f4eee554c
Author: martii <m4rtii@gmx.de>
Date: 2013-04-08 (Mon, 08 Apr 2013)
 2013-07-18 14:51:58 +04:00
martii
b341d224c5 CMenuWidget: add action keys 
Conflicts:
	src/gui/widget/menue.h


Origin commit data
------------------
Commit: 3d187e56da
Author: martii <m4rtii@gmx.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
 2013-07-18 14:51:58 +04:00
[CST] Focus
77d4efc95e gui/widget/menue.cpp: add CMenuItem isStatic param, (c) martii <m4rtii@gmx.de> 
Origin commit data
------------------
Commit: 8b5bbf8911
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-05 (Fri, 05 Jul 2013)
 2013-07-18 14:51:58 +04:00
Gaucho316
8170368d1b menue.cpp: fix macro usage of SUB_HEAD 
Origin commit data
------------------
Commit: 7702408456
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2013-07-15 (Mon, 15 Jul 2013)

Origin message was:
------------------
- menue.cpp: fix macro usage of SUB_HEAD
 2013-07-15 23:16:44 +02:00
Stefan Seyfried
6830b68cac 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


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
Michael Liebmann
82cf912874 Revert "CMenuForwarder: Use std::string (not pointer to std::string or char) for option" 
This reverts commit c17394c593.


Origin commit data
------------------
Commit: 5f4d598b1e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
 2013-07-04 07:45:51 +02:00
Michael Liebmann
c17394c593 CMenuForwarder: Use std::string (not pointer to std::string or char) for option 
Origin commit data
------------------
Commit: b5d1322617
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)
 2013-07-04 02:05:33 +02:00
Michael Liebmann
163e7fd45f CMenuWidget: fix simplified up/down code 
- supplement to a0e73ac341


Origin commit data
------------------
Commit: 4003d5f434
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-01 (Mon, 01 Jul 2013)
 2013-07-01 12:49:37 +02:00
Stefan Seyfried
0196585cd9 CMenuWidget: fix simplified up/down code 
Origin commit data
------------------
Commit: ecef1e8ab8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-20 12:13:54 +02:00
Stefan Seyfried
a0e73ac341 CMenuWidget: simplify up/down selection code 
Origin commit data
------------------
Commit: c5186c82dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-20 12:13:04 +02:00
Stefan Seyfried
9617ebfb1e menu: fix artifacts on page change 
Origin commit data
------------------
Commit: 4774366474
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-20 12:12:29 +02:00
Stefan Seyfried
775a682420 menu: make page_start[] int, avoids lots of casts 
Origin commit data
------------------
Commit: ed039d6ba9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-20 12:11:45 +02:00
Stefan Seyfried
7ceb15984f CMenuWidget: fix simplified up/down code 
Origin commit data
------------------
Commit: 3e2e647745
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:37:49 +02:00
Stefan Seyfried
fce4dbbe72 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


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
[CST] Focus
b15430c86b 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


Origin commit data
------------------
Commit: 4850e6d77a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
 2013-06-10 15:59:21 +04:00
Stefan Seyfried
4a7bff9498 CMenuWidget: simplify up/down selection code 
Origin commit data
------------------
Commit: 49f875508e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-02 23:39:51 +02:00
Stefan Seyfried
22a3168484 menu: fix artifacts on page change 
Origin commit data
------------------
Commit: 0ad51e7964
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-02 21:33:26 +02:00
Stefan Seyfried
4b44a43b9d menu: make page_start[] int, avoids lots of casts 
Origin commit data
------------------
Commit: c5760c6a27
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-02 20:31:42 +02:00
vanhofen
7328f49d6a menue-widget: set header-offset and align sub-headers 
Origin commit data
------------------
Commit: 07b4716ebf
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-30 (Thu, 30 May 2013)

Origin message was:
------------------
- menue-widget: set header-offset and align sub-headers
 2013-05-30 23:06:27 +02:00
vanhofen
93ffab6c1d neutrino: don't save screen while paint headers 
Origin commit data
------------------
Commit: 6c41ffbe47
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
- neutrino: don't save screen while paint headers
 2013-05-28 10:42:39 +02:00
vanhofen
86e15a0009 menue-widget: using CComponentsHeader to paint header 
Origin commit data
------------------
Commit: d3f259444e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
- menue-widget: using CComponentsHeader to paint header
 2013-05-28 02:16:38 +02:00
Stefan Seyfried
b6e65d0300 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


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Stefan Seyfried
748b384771 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).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
 2013-05-11 17:17:33 +02:00