Commit Graph

225 Commits

Author SHA1 Message Date
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
[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
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
[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
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
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
[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
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
Jacek Jendrzej
faf85d8ce3 supplement to a104563753
Origin commit data
------------------
Commit: 3a62b97fcb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 13:43:23 +02:00
Jacek Jendrzej
a104563753 CMenuWidget::paintItems: clean only last multipage menu
Origin commit data
------------------
Commit: 28198dc320
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)
2013-05-09 13:10:23 +02:00
Jacek Jendrzej
eb087be495 src/gui/widget/menue.cpp: don't paint icon if no space for this
Origin commit data
------------------
Commit: 6f552797b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-29 (Mon, 29 Apr 2013)
2013-04-29 21:08:44 +02:00
[CST] Focus
1bd0bd8a7b 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


Origin commit data
------------------
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)
2013-04-17 13:32:12 +04:00
vanhofen
b659d5c95a 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


Origin commit data
------------------
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- 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
3304b1024e gui/widget/menue.cpp: fix CMenuForwarderNonLocalized::getWidth
Origin commit data
------------------
Commit: f21b291fcd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-29 (Fri, 29 Mar 2013)
2013-03-29 17:12:23 +04:00
vanhofen
0df9a58c45 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Commit: 759966f935
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- 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
b3c0546942 CMenuWidget: branch devel_cc Fix merge errors
Some braces were lost during the last merges.


Origin commit data
------------------
Commit: 7ac1550277
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-16 (Sat, 16 Feb 2013)
2013-03-06 11:28:16 +01:00
Thilo Graf
d8ee6cad83 CMenuWidget: set frame thickness
default value in CComponentsInfoBox is inherit from CComponentsContainer
and =0, baut we need =2


Origin commit data
------------------
Commit: 7df6748f74
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-23 (Thu, 23 Aug 2012)
2013-03-06 11:27:55 +01:00
Thilo Graf
77d1ef4e94 CMenuWidget: init instance of CComponentsDetailsLine in constructor
Origin commit data
------------------
Commit: 12cb192341
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-22 (Wed, 22 Aug 2012)
2013-03-06 11:27:55 +01:00
Thilo Graf
e19ef2c3da CComponentsInfoBox: create instance of CComponentsInfoBox in constructor
Origin commit data
------------------
Commit: 232933f9fc
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-22 (Wed, 22 Aug 2012)
2013-03-06 11:27:55 +01:00
Michael Liebmann
779befca24 CMenuWidget: Use removeLineBreaks() in paintHint()
Origin commit data
------------------
Commit: 2101a32862
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)

Origin message was:
------------------
* CMenuWidget: Use removeLineBreaks() in paintHint()
2013-03-06 11:27:54 +01:00
Michael Liebmann
9e3f3ddc52 CMenuWidget: Remove line breaks from hint text
- Add font to Constructor & setText()
- remove CTextBox::AUTO_HIGH


Origin commit data
------------------
Commit: ff12f2b5b5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
2013-03-06 11:27:54 +01:00
Thilo Graf
c2fea2c861 CMenuWidget: implement CComponentsInfoBox functionality for text and icon
Origin commit data
------------------
Commit: 53ff9cdddf
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-19 (Sun, 19 Aug 2012)
2013-03-06 11:27:53 +01:00
Thilo Graf
8cbc17affd CMenuWidget: adapt for last changes in CComponents
Origin commit data
------------------
Commit: b0f9cde09f
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-16 (Thu, 16 Aug 2012)
2013-03-06 11:27:52 +01:00
Thilo Graf
c066c2a29a CMenuWidget: define system colors during runtime
Origin commit data
------------------
Commit: 9027ac6fba
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-04 (Sat, 04 Aug 2012)
2013-03-06 11:27:51 +01:00
Thilo Graf
ec4b8e3637 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


Origin commit data
------------------
Commit: 485dca43e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-03 (Fri, 03 Aug 2012)
2013-03-06 11:27:51 +01:00
Thilo Graf
1983068b99 CMenuWidget: adapt to current CComponentsInfoBox changes
Origin commit data
------------------
Commit: 03d276d90a
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-03 (Fri, 03 Aug 2012)
2013-03-06 11:27:51 +01:00
Thilo Graf
37452186cf menu.cpp: refresh radius settings
Changed corner settings in osd setup
have no effect in unchanged menu widget instances.


Origin commit data
------------------
Commit: ec2c78537c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-01 (Wed, 01 Aug 2012)

Origin message was:
------------------
*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
596a76bcef gui/widget/menue.cpp: dont allow to exec non-active item -
in case old, selected, was disabled


Origin commit data
------------------
Commit: e178488bf4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
2013-01-09 16:19:08 +04:00