Commit Graph

96 Commits

Author SHA1 Message Date
vanhofen
dd3771a15b keybind-setup: use g_settings.backup_dir to save/load keys
Origin commit data
------------------
Commit: 6aca3dcbfb
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-24 (Sun, 24 Mar 2019)

Origin message was:
------------------
- keybind-setup: use g_settings.backup_dir to save/load keys
2019-03-24 17:51:08 +01:00
Jacek Jendrzej
fb82c2b2b1 gui/keybind_setup: fix painted key name after use loadkeys conf
Origin commit data
------------------
Commit: 07bf78f269
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-03-24 (Sun, 24 Mar 2019)
2019-03-24 17:45:58 +01:00
GetAway
98ee9d7ec0 keybind_setup.cpp: fix warning
Origin commit data
------------------
Commit: dba61a60c0
Author: GetAway <get-away@t-online.de>
Date: 2018-12-05 (Wed, 05 Dec 2018)
2018-12-05 23:15:44 +01:00
GetAway
7d6a79b6ed keybind_setup.cpp: fix menu special keys
Origin commit data
------------------
Commit: b83c316907
Author: GetAway <get-away@t-online.de>
Date: 2018-12-04 (Tue, 04 Dec 2018)
2018-12-05 00:12:48 +01:00
vanhofen
b61c5955e5 neutrino: add additional key to leave standby mode; unify standby locales
This re-adds an old feature from dbox2, but uses a more configurable way


Origin commit data
------------------
Commit: cd6d3bcad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-20 (Fri, 20 Jul 2018)

Origin message was:
------------------
- neutrino: add additional key to leave standby mode; unify standby locales

This re-adds an old feature from dbox2, but uses a more configurable way
2018-07-20 00:27:11 +02:00
vanhofen
b109402dd4 keybind-setup: try to fix return value of msgbox when new rc is not confirmed
Origin commit data
------------------
Commit: 6b76559ee9
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-06-30 (Sat, 30 Jun 2018)

Origin message was:
------------------
- keybind-setup: try to fix return value of msgbox when new rc is not confirmed
2018-06-30 20:05:35 +02:00
vanhofen
4192997d79 keybind-setup: sort mpkeys more consistent
Origin commit data
------------------
Commit: b0c367a96e
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-19 (Mon, 19 Mar 2018)

Origin message was:
------------------
- keybind-setup: sort mpkeys more consistent
2018-03-19 01:08:30 +01:00
vanhofen
4250a45ea5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
2017-09-07 16:41:06 +02:00
vanhofen
f2ef2e0cee don't save conf-files to flash; use /media by default
Origin commit data
------------------
Commit: 909201ae66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- don't save conf-files to flash; use /media by default
2017-09-07 16:18:30 +02:00
vanhofen
7ec36ff892 keybind_setup: resort items as in other menus too; 'save' before 'load'
Origin commit data
------------------
Commit: c11a78a28a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- keybind_setup: resort items as in other menus too; 'save' before 'load'
2017-09-07 16:18:30 +02:00
vanhofen
497db594c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)
2017-05-16 15:28:08 +02:00
vanhofen
53007ef0a9 movieplayer: make bisection jump period configurable
Origin commit data
------------------
Commit: 69e5cb286c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- movieplayer: make bisection jump period configurable
2017-05-16 15:26:20 +02:00
vanhofen
77ac470486 movieplayer: allow bisectional jumps with RC_page_up/down
based upon code by TangoCash


Origin commit data
------------------
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash
2017-05-13 17:45:59 +02:00
vanhofen
ff13355b52 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 3ad27fb3c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 15:25:21 +01:00
Michael Liebmann
b87099f201 CKeybindSetup: Fix changeNotify call for change repeat_block...
Origin commit data
------------------
Commit: 6b8a7eb5f3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-23 15:14:27 +01:00
vanhofen
b72b12a375 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/neutrino.cpp


Origin commit data
------------------
Commit: 134e499be0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)
2017-02-22 08:33:33 +01:00
Stefan Seyfried
101ca7cc0a keybind_setup: use rcinput->setKeyRepeatDelay()
Origin commit data
------------------
Commit: 8b8b4ce0e2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)
2017-02-22 06:24:48 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
2016-11-21 12:46:49 +01:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
2016-10-24 10:31:24 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
2016-08-19 17:40:48 +02:00
Jacek Jendrzej
2f5086ec0e remove unused and some clang compil fixes
Origin commit data
------------------
Commit: 374a172aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)
2016-04-17 13:46:16 +02:00
vanhofen
de6347e64f movieplayer/browser: add user key to create/remove movie cover
Origin commit data
------------------
Commit: 61a4b3bf9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-11 (Thu, 11 Feb 2016)

Origin message was:
------------------
- movieplayer/browser: add user key to create/remove movie cover
2016-02-11 15:04:11 +01:00
vanhofen
a22d2344b8 moviebrowser: introduce user-assignable keys
Origin commit data
------------------
Commit: ab82c36b9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-09 (Tue, 09 Feb 2016)

Origin message was:
------------------
- moviebrowser: introduce user-assignable keys
2016-02-09 15:53:56 +01:00
vanhofen
bf7275e0c7 moviebrowser: add possibility to search for movies in SMS-style
This feature has to be activated first. Menu -> Settings ->
Key Setup -> Edit -> My recordings

In moviebrowser press three times key "3" to select first movie
title starting with a "F" or press two times "6" to select first
movie title starting with a "N".

The new item in keybind-setup is the first step to introduce user-
assignable keys in moviebrowser. So finally the horrible hotkeys
for the cutting functions can be removed and/or replaced.


Origin commit data
------------------
Commit: 0a98143e49
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-09 (Tue, 09 Feb 2016)

Origin message was:
------------------
- moviebrowser: add possibility to search for movies in SMS-style

This feature has to be activated first. Menu -> Settings ->
Key Setup -> Edit -> My recordings

In moviebrowser press three times key "3" to select first movie
title starting with a "F" or press two times "6" to select first
movie title starting with a "N".

The new item in keybind-setup is the first step to introduce user-
assignable keys in moviebrowser. So finally the horrible hotkeys
for the cutting functions can be removed and/or replaced.
2016-02-09 12:05:28 +01:00
Michael Liebmann
48acf5fcc4 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Commit: db8a9e6388
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
2016-01-25 13:20:10 +01:00
vanhofen
e07988e7bd infoviewer: show plugin name, when movieplayer-plugin is selected
Origin commit data
------------------
Commit: 0b74f601db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- infoviewer: show plugin name, when movieplayer-plugin is selected
2016-01-25 12:00:47 +01:00
Stefan Seyfried
03e3eb95f1 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)
2015-12-15 17:29:18 +01:00
vanhofen
fc228752b7 infoviewer_bb: use key-assignment from movieplayer
Origin commit data
------------------
Commit: 4c7cea95e9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use key-assignment from movieplayer
2015-12-15 08:15:17 +01:00
vanhofen
b241ff1bf0 keybind_setup/locale: timeshift isn't a movieplayer key
Origin commit data
------------------
Commit: e22d2d8a45
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- keybind_setup/locale: timeshift isn't a movieplayer key
2015-12-15 08:15:17 +01:00
vanhofen
e08c3ad51a keybind-setup: fix assignable keys for movieplayer; ...
...timeshift isn't a movieplayer key.


Origin commit data
------------------
Commit: 168c3832d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- keybind-setup: fix assignable keys for movieplayer; ...

...timeshift isn't a movieplayer key.
2015-12-15 08:15:17 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Stefan Seyfried
1a17fed057 disarm broken HAVE_SPARK_HARDWARE code
Origin commit data
------------------
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)
2015-01-27 10:59:04 +01:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
vanhofen
4f42734572 align most CKeyboardInput calls to the changes in 88c6640
Origin commit data
------------------
Commit: ee91014c48
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-22 (Sat, 22 Nov 2014)

Origin message was:
------------------
- align most CKeyboardInput calls to the changes in 88c6640
2014-11-22 15:58:02 +01:00
[CST] Focus
dde8cb519f change most code to use CKeyboardInput in place of CStringInputSMS
Origin commit data
------------------
Commit: 549e110e14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-19 (Wed, 19 Nov 2014)
2014-11-19 18:21:38 +03:00
[CST] Focus
34d2776109 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
2014-09-05 17:49:11 +04:00
[CST] Focus
958139cd31 merge neutrino-mp menu/buttons/icons changes, (C) martii
Origin commit data
------------------
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-17 17:02:25 +04:00
martii
161fdeda10 gui/keybind_setup:checkLongPress(): return true for RC_standby
Origin commit data
------------------
Commit: 17774a41b7
Author: martii <m4rtii@gmx.de>
Date: 2014-05-13 (Tue, 13 May 2014)
2014-05-14 22:10:46 +02:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
2014-04-27 19:14:06 +02:00
vanhofen
b18da46a5e fix (and enable) one-key-plugin; fix movieplayer-plugin
Origin commit data
------------------
Commit: 580fcc97e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)

Origin message was:
------------------
- fix (and enable) one-key-plugin; fix movieplayer-plugin
2014-03-01 23:33:45 +01:00
martii
d267c7ed24 driver/rcinput: implement long key press support (but no rcsim/yWeb support at this time)
driver/rcinput: drop unused gettimeofday code


Origin commit data
------------------
Commit: 7826ab0fca
Author: martii <m4rtii@gmx.de>
Date: 2014-02-25 (Tue, 25 Feb 2014)
2014-02-25 00:09:14 +01:00
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
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
2014-01-22 12:37:21 +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
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
Jacek Jendrzej
9994db59dc supplement to 2cf1419724
Origin commit data
------------------
Commit: 9ea73f95d2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-23 (Mon, 23 Dec 2013)
2013-12-23 11:38:41 +01:00
vanhofen
638699d894 keybind_setup: remove double line
Origin commit data
------------------
Commit: 6a357c1b53
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)

Origin message was:
------------------
- keybind_setup: remove double line
2013-12-22 22:09:51 +01:00
martii
2cf1419724 gui/keybind_setup: add units to repeat blocker chooser
Origin commit data
------------------
Commit: 8d7fd8de75
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 16:36:13 +01:00