Commit Graph

531 Commits

Author SHA1 Message Date
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
Michael Liebmann
2056b4ed80 Add a --enable-lua switch to enable LUA support
Origin commit data
------------------
Commit: 82d4832013
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
2014-01-21 17:05:24 +01:00
Michael Liebmann
01de5acc30 Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii


Origin commit data
------------------
Commit: 31842369cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the input classes for Lua

- Add non locale variants for CExtendedInput, CStringInput,
 CStringInputSMS, CPINInput
 THX Martii
2014-01-19 20:57:38 +01:00
Michael Liebmann
b6b44d9088 Preparing the menu classes for Lua Part #3
- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii


Origin commit data
------------------
Commit: afbd87083b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #3

- Add non locale variants for CMenuOptionNumberChooser and
 CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
 THX Martii
2014-01-19 20:57:37 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii
2014-01-19 20:57:37 +01:00
Michael Liebmann
37e4b0bda8 Preparing the menu classes for Lua Part #1
- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


Origin commit data
------------------
Commit: 2c9c9debcc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #1

- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
16942ab183 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)
2014-01-05 18:31:31 +01:00
Michael Liebmann
44f780650a CMenuOptionChooser: Fix multiple menu items, when using sort option
Origin commit data
------------------
Commit: 9af1cdb318
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)
2014-01-04 15:25:28 +01:00
Michael Liebmann
b93a3da743 CMenuOptionChooser: Add alphanumeric sort option
- default is false
- Activate by OptionsSort = true


Origin commit data
------------------
Commit: 8832b803bd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-04 (Sat, 04 Jan 2014)
2014-01-04 13:08:48 +01:00
Jacek Jendrzej
ccdb8209fb CMenuOptionStringChooser:: optionValueString mismatch, supplement to ce44d1641a
Origin commit data
------------------
Commit: 98c7d07246
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-03 (Fri, 03 Jan 2014)
2014-01-03 12:36:54 +01:00
Gaucho316
c34729cfa7 Neutrino menu forwarder: add possibility to show value from jump target
based on idea by martii <m4rtii@gmx.de> in Neutrino-MP Git


Origin commit data
------------------
Commit: 7d04113307
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2013-12-30 (Mon, 30 Dec 2013)
2013-12-30 23:25:26 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
Michael Liebmann
a4a01994dd CMenuItem: Set right_bgcol as inactiv, when menu item not active
Origin commit data
------------------
Commit: ec01f884fd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 18:32:01 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 21:25:05 +01:00
martii
abc5f1bc00 gui/scan_setup: show unit for motor speed
Origin commit data
------------------
Commit: a0f2960501
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 Dec 2013)
2013-12-22 16:36:13 +01:00
martii
6aaa91242a gui/widget/menu: CMenuOptionNumberChooser: add option to show units
Origin commit data
------------------
Commit: 86221de3d9
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 Dec 2013)
2013-12-21 22:04:24 +01:00
vanhofen
fdadff0e2d menu: don't add a separatorline ...
... when no button and no section text is given


Origin commit data
------------------
Commit: 5591e81a2b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-19 (Thu, 19 Dec 2013)

Origin message was:
------------------
- menu: don't add a separatorline ...

 ... when no button and no section text is given
2013-12-19 15:06:12 +01:00
[CST] Focus
3d3db00e8a gui/widget/menue.cpp: revert testing changes
Origin commit data
------------------
Commit: 5cc2620008
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
2013-12-15 14:56:12 +04:00
[CST] Focus
226368a957 gui/widget/menue.cpp: fix menu hint kill vs hide
Origin commit data
------------------
Commit: 6a62051032
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-12 (Thu, 12 Dec 2013)
2013-12-15 14:46:44 +04:00
martii
4a90b00f76 gui/widget/menue: clear old menue hint if none is set for current item
Origin commit data
------------------
Commit: c954efc59f
Author: martii <m4rtii@gmx.de>
Date: 2013-12-06 (Fri, 06 Dec 2013)
2013-12-13 16:43:53 +01:00
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