Commit Graph

443 Commits

Author SHA1 Message Date
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
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
2012-12-30 21:35:20 +01:00
[CST] Focus
b2cf810929 gui/widget/menue.cpp: fix hintbox color if theme changed;
fix hint paint for page-up button


Origin commit data
------------------
Commit: 6ea053c2e9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
2012-11-21 20:37:54 +04:00
Stefan Seyfried
50079c80cc menuewidget: fix menu position code after last uncool merge
Origin commit data
------------------
Commit: ad959d9e08
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 12:33:52 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a'
...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


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 10:45:33 +01:00
Stefan Seyfried
6a015d7b92 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.


Origin commit data
------------------
Commit: d5d136f6c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 22:52:12 +01:00
Stefan Seyfried
0229c49f77 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


Origin commit data
------------------
Commit: 047223440b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 21:17:40 +01:00
[CST] Focus
a20724d102 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


Origin commit data
------------------
Commit: 405ac286e3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-19 (Fri, 19 Oct 2012)
2012-10-19 19:30:28 +04:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
Stefan Seyfried
28fb511a63 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp
Origin commit data
------------------
Commit: 2e46d81b88
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-15 (Sat, 15 Sep 2012)
2012-09-15 12:14:33 +02:00
Jacek Jendrzej
d9f17aa4dc moviebrowser.cpp: -fix2 vfd
Origin commit data
------------------
Commit: e45aa72605
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-14 (Fri, 14 Sep 2012)
2012-09-14 20:12:04 +02:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
Jacek Jendrzej
57a7091601 fixes strncpy & buf size
Origin commit data
------------------
Commit: 7359504dd7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)

Origin message was:
------------------
-fixes strncpy & buf size
2012-08-07 18:51:44 +02:00
Stefan Seyfried
e11349fcb4 neutrino: fix menu position for right or bottom aligned
Origin commit data
------------------
Commit: c6ff06736a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-28 (Sat, 28 Jul 2012)
2012-07-28 23:50:03 +02:00
Michael Liebmann
6c255d9c7d CComponentsInfoBox: Small display bug fixed
Origin commit data
------------------
Commit: bc8128d8d7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: Small display bug fixed
2012-07-25 04:37:01 +01:00
[CST] Focus
f5ce12d5d5 gui/widget/menue.cpp: disable 'back' hint, if no other hints present
Origin commit data
------------------
Commit: 04f1e9c3f2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
2012-07-24 15:13:18 +04:00
Michael Liebmann
0cf0d0b4ae src/gui/widget/menue.cpp: Comment paintHint debug output
Origin commit data
------------------
Commit: 1511edb51e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)

Origin message was:
------------------
* src/gui/widget/menue.cpp: Comment paintHint debug output
2012-07-23 23:49:03 +01:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
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


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Michael Liebmann
978f8406ad CComponentsInfoBox: Switch parameter h and w in constructor
Origin commit data
------------------
Commit: a5d8bd4e13
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-22 (Sun, 22 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: Switch parameter h and w in constructor
2012-07-22 17:16:37 +01:00
Michael Liebmann
c4e6dfb87e Correct restore the screen to exit menu
Origin commit data
------------------
Commit: ecadf79a8f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
* Correct restore the screen to exit menu
2012-07-22 17:16:37 +01:00
Michael Liebmann
e18fb3a28e CComponentsInfoBox: save/restore screen
- Own save/restore screen routine
- Shadow can be switched off
- Small fixes


Origin commit data
------------------
Commit: 1a654403cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: save/restore screen

- Own save/restore screen routine
- Shadow can be switched off
- Small fixes
2012-07-22 17:16:37 +01:00
Thilo Graf
58a5c418a8 components: add members for generic paint, hide and restore items
Origin commit data
------------------
Commit: bc01ed9a86
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-19 (Thu, 19 Jul 2012)

Origin message was:
------------------
*components: add members for generic paint, hide and restore items
2012-07-22 17:16:36 +01:00
Thilo Graf
5faf46cfc5 menu: ensure also correct x-position of details line
It's possible that x pos is changeing during runtime


Origin commit data
------------------
Commit: 084fb88f50
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
*menu: ensure also correct x-position of details line

It's possible that x pos is changeing during runtime
2012-07-22 17:16:36 +01:00
[CST] Focus
366d26c530 src/gui/widget/menue.cpp: fix crash, if class inherit from CMenuWidget
i.e. CFileChooser


Origin commit data
------------------
Commit: 2a0c197c1f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 17:35:23 +04:00
[CST] Focus
0559c2f84f gui/widget/menue.cpp: dont repaint menu on help key, if no hints
Origin commit data
------------------
Commit: e52367edd8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
2012-07-19 17:30:53 +04:00
[CST] Focus
897c2b8e5d Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 4046849a9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
2012-07-18 16:01:57 +04:00
[CST] Focus
a9e9d38fa1 gui/widget/menue.cpp: paint body without head;
disable menu name display on VFD - it overwritten by option name anyway;
little cleanup


Origin commit data
------------------
Commit: 00f77bec3d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
2012-07-18 16:01:48 +04:00
Michael Liebmann
93f1e0bb47 CComponentsInfoBox: missing shadow
- Removed wrong parameter 'rad' from function call CComponentsInfoBox


Origin commit data
------------------
Commit: 301193ce01
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* CComponentsInfoBox: missing shadow

- Removed wrong parameter 'rad' from function call CComponentsInfoBox
2012-07-17 21:36:57 +01:00
Michael Liebmann
7e741fd513 Fix the position of CComponentsDetailLine
Origin commit data
------------------
Commit: ea33afbcf8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* Fix the position of CComponentsDetailLine
2012-07-17 20:52:55 +01:00
Michael Liebmann
c86c08c34d Use CComponentsInfoBox for menu hint
Origin commit data
------------------
Commit: fd1ec29d83
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)

Origin message was:
------------------
* Use CComponentsInfoBox for menu hint
2012-07-17 20:52:55 +01:00
[CST] Focus
cba679e6c3 gui/widget/menue.cpp: check item's direct key only on key events
Origin commit data
------------------
Commit: e295500984
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
2012-07-17 11:45:28 +04:00
[CST] Focus
93689882e7 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 2205ac67a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
2012-07-17 10:15:19 +04:00
Thilo Graf
90d6a87e4e menu: hide detail line objects without paintBackgroundBoxRel()
Origin commit data
------------------
Commit: 53d4ef64aa
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-16 (Mon, 16 Jul 2012)

Origin message was:
------------------
*menu: hide detail line objects without paintBackgroundBoxRel()
2012-07-16 22:28:02 +02:00
Thilo Graf
d209e0ec41 neutrino: remove dub code
using class 'CComponentsDetailLine' instead multiple code
details line rendering


Origin commit data
------------------
Commit: 261904acd0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-16 (Mon, 16 Jul 2012)

Origin message was:
------------------
*neutrino: remove dub code

using class 'CComponentsDetailLine' instead multiple code
details line rendering
2012-07-16 22:28:02 +02:00
[CST] Focus
8b3f89a54c gui/widget/menue.cpp: remove one indent level in CMenuWidget::exec
Origin commit data
------------------
Commit: 52834d73fb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
2012-07-16 20:56:52 +04:00
[CST] Focus
fcd360beee gui/widget/menue.cpp: fade-in, if menu was hidden, for testing
Origin commit data
------------------
Commit: eb5b8328ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
2012-07-16 19:11:17 +04:00
[CST] Focus
45696bd05e gui/widget/menue.cpp: fix screen save/restore;
use RADIUS_LARGE (without -2)


Origin commit data
------------------
Commit: ab69ee272f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
2012-07-16 16:13:51 +04:00
[CST] Focus
d898833b5c gui/widget/menue.cpp: fix hint box height calc
Origin commit data
------------------
Commit: a2ff6f7675
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
2012-07-16 15:26:54 +04:00
[CST] Focus
7129d46df1 gui/widget/menue.cpp: fix menu_left_exit option;
remove can_arrow member - isMenueOptionChooser() is enough


Origin commit data
------------------
Commit: e02258276e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
2012-07-16 14:33:22 +04:00
Jacek Jendrzej
c1ea38df61 fix tiny OSD shadow
Origin commit data
------------------
Commit: d2b948933a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
2012-07-12 17:58:32 +02:00
Michael Liebmann
c40d73a36e Menu hints: Extra font added
- Font size set by Menu/Settings/Font settings/Menu/Menu hints


Origin commit data
------------------
Commit: ee781bd880
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)

Origin message was:
------------------
* Menu hints: Extra font added

- Font size set by Menu/Settings/Font settings/Menu/Menu hints
2012-07-11 23:41:08 +01:00
Michael Liebmann
046279ef88 Menu hints: Shadow for hint box enabled
Origin commit data
------------------
Commit: 108b8d9523
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)

Origin message was:
------------------
* Menu hints: Shadow for hint box enabled
2012-07-11 23:41:08 +01:00
Michael Liebmann
aea03fcf47 Menu hints: Optimize presentation
Origin commit data
------------------
Commit: f732fe749e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)

Origin message was:
------------------
* Menu hints: Optimize presentation
2012-07-11 23:41:08 +01:00
Jacek Jendrzej
ab42fd4987 fix OSD
Origin commit data
------------------
Commit: f7fe36a8dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
2012-07-11 14:36:21 +02:00
[CST] Focus
91b902d249 gui/osd_setup.cpp: lets just hide menu and repaint on corners option change
Origin commit data
------------------
Commit: 7ab0876611
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 17:37:34 +04:00
Jacek Jendrzej
ccdc79dc6a menue.cpp:-fix OSD on corners switch (upper side)
Origin commit data
------------------
Commit: 5420af701a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 15:00:08 +02:00