Commit Graph

68 Commits

Author SHA1 Message Date
vanhofen
ff21981795 drop easymenu
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-12 23:46:22 +02:00
vanhofen
d4545b0abd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 22:51:16 +02:00
Jacek Jendrzej
0e522bb6e6 init pre post
Origin commit data
------------------
Commit: 4bdacf39c8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 19:23:23 +02:00
vanhofen
4fad3841eb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/record_setup.cpp


Origin commit data
------------------
Commit: 1f3cc2bbaa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 15:41:49 +02:00
vanhofen
953fd71755 record-setup: use new timer_followscreenings_options struct in item
Origin commit data
------------------
Commit: a79a96efd6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- record-setup: use new timer_followscreenings_options struct in item
2017-06-07 15:18:38 +02:00
vanhofen
5a9e9904a7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 15:14:51 +02:00
Thilo Graf
707c74df83 Followscreenings: add enumeration for a better readability
Origin commit data
------------------
Commit: 141d198b29
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 14:17:12 +02:00
vanhofen
0b3a86f7f5 followscreenings: fix CFollowScreenings::FOLLOWSCREENINGS_ALWAYS
* add enumeration for a better readability


Origin commit data
------------------
Commit: 981c6331a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- followscreenings: fix CFollowScreenings::FOLLOWSCREENINGS_ALWAYS

* add enumeration for a better readability
2017-05-30 10:11:39 +02:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
Thilo Graf
ffa144101a Merge branch 'master' into pu/msgbox
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp
2016-11-15 19:49:27 +01:00
vanhofen
c94723bf8e followscreenings: re-add possibility to show followscreenings in every case
This commit replaces formerly commit 69d0362c07


Origin commit data
------------------
Commit: b7838210a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- followscreenings: re-add possibility to show followscreenings in every case

This commit replaces formerly commit 69d0362c07
2016-11-15 00:05:02 +01:00
vanhofen
c0a3c0f5e3 Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 69d0362c07.


Origin commit data
------------------
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 23:05:36 +01:00
vanhofen
b0d3e0f4ee Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
2016-11-14 23:02:33 +01:00
vanhofen
66639b877f followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
Commit: d6cb1d206f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- followscreenings: allow to turn off followscreenings list
2016-11-14 22:58:43 +01:00
FlatTV
69d0362c07 Recording Menu: Add option "Always show timer pick list"
"when choosing recording from EPG, view Timer list even no further
entries found" yes/no


Origin commit data
------------------
Commit: f2437b5b06
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-30 (Sun, 30 Oct 2016)
2016-10-30 11:32:42 +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
vanhofen
700450df59 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: dbc51bb77d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
2016-06-02 22:21:53 +02:00
vanhofen
e5f88eaecc record_setup: remove undefined hint icon
Origin commit data
------------------
Commit: c89f21c054
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)

Origin message was:
------------------
- record_setup: remove undefined hint icon
2016-06-02 22:00:40 +02:00
vanhofen
cc0f541291 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
2016-06-02 21:42:10 +02:00
vanhofen
2c239533a6 record_setup: add check existing recordings before set new timers
Origin commit data
------------------
Commit: 6dddaff0d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)

Origin message was:
------------------
- record_setup: add check existing recordings before set new timers
2016-06-02 21:37:33 +02:00
vanhofen
4cf2b60722 NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +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
Jacek Jendrzej
8c07daf724 src/gui/record_setup.cpp disable not used
Origin commit data
------------------
Commit: 15478a44c4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-11-22 (Sun, 22 Nov 2015)
2015-11-22 18:12:12 +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
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
martii
69f917f16d drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-09-15 11:44:08 +04:00
martii
2c8f3910b2 add thread for determining free hdd (recording dir) space, enable hdd usage icons on vfd (untested)
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/simple_display.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/moviebrowser.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp
	src/system/ytcache.h


Origin commit data
------------------
Commit: 7c15db185f
Author: martii <m4rtii@gmx.de>
Date: 2013-11-27 (Wed, 27 Nov 2013)
2014-09-11 17:58:19 +04:00
[CST] Focus
cbc071f4a2 gui/record_setup.cpp: now, with mount/umount menu, disable directory switch,
if record is running


Origin commit data
------------------
Commit: bbf0a95542
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-01 (Thu, 01 May 2014)
2014-05-01 17:48:51 +04:00
[CST] Focus
d4766acdcf gui/record_setup.cpp: avoid set empty timeshift dir
Origin commit data
------------------
Commit: 858fbd217e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-01 (Thu, 01 May 2014)
2014-05-01 17:30:50 +04:00
[CST] Focus
bba1173f57 gui/record_setup.cpp: add option to auto-create movie thumbnail on playback
Origin commit data
------------------
Commit: b127646b43
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-21 (Mon, 21 Apr 2014)
2014-04-21 14:07:37 +04:00
Michael Liebmann
496f901f64 CRecordSetup: Fix menu hint specifier
Origin commit data
------------------
Commit: bb4eccfbed
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)
2014-03-14 18:24:33 +01:00
FlatTV
dfd972bfe7 record menu: add filename template
Origin commit data
------------------
Commit: e0055b5339
Author: FlatTV <FlatTV@gmx.de>
Date: 2014-03-13 (Thu, 13 Mar 2014)
2014-03-14 09:39:57 +01:00
[CST] Focus
c6d5716c8f neutrino.cpp: add timeshift record duration setting
Origin commit data
------------------
Commit: 6201a95358
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
2014-03-11 16:21:32 +04: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
Stefan Seyfried
607f56ae80 reduce direct dependencies on timerdclient.h
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.


Origin commit data
------------------
Commit: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 21:01:26 +01:00
Michael Liebmann
b3ef258294 CRecordInstance: Turns message when recording start/end on or off
Origin commit data
------------------
Commit: ae2a01a37a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-13 (Mon, 13 Jan 2014)
2014-01-13 19:42:46 +01:00
Michael Liebmann
9d6f429cdb CRecordSetup: Fix save RecordingSafety
Origin commit data
------------------
Commit: f817f18ffb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-26 (Thu, 26 Dec 2013)
2013-12-26 22:37:03 +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
martii
5e5d19c036 gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...
... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier


Origin commit data
------------------
Commit: 697b1a75b3
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)

Origin message was:
------------------
gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...

 ... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
2013-12-22 21:13:45 +01:00
[CST] Focus
dfc368cc27 gui/record_setup.cpp: fix double-blue key
Origin commit data
------------------
Commit: 694714b73e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-31 (Thu, 31 Oct 2013)
2013-10-31 11:48:04 +04:00
[CST] Focus
e091a84f2b as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 13:03:26 +04:00
vanhofen
b8da2f64f5 fix another typo around DATA_PIDS
Origin commit data
------------------
Commit: 30a0fdafda
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Origin message was:
------------------
- fix another typo around DATA_PIDS
2013-04-01 15:07:55 +04:00
Jacek Jendrzej
4838903eb9 add record option for teletext & dvbsub pids
Origin commit data
------------------
Commit: b2241df43d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-19 (Tue, 19 Mar 2013)

Origin message was:
------------------
-add record option for teletext & dvbsub pids
2013-04-01 15:07:05 +04:00
[CST] Focus
aee47b190b settings: add option to enable/disable slow record warning
Origin commit data
------------------
Commit: b6ad61b0de
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-16 (Tue, 16 Oct 2012)
2012-10-16 19:53:47 +04:00
Jacek Jendrzej
2ce35cb6ce move safe_mkdir & check_dir to system-helpers
Origin commit data
------------------
Commit: dfa3231469
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:34:53 +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
[CST] Focus
09b5661f30 gui/record_setup.cpp: add menu hints
Origin commit data
------------------
Commit: 642e523f1f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 21:41:26 +04:00
[CST] Focus
c0e9192809 gui/record_setup.cpp: add changeNotify, remove notifiers
Origin commit data
------------------
Commit: a4b98865b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
2012-05-31 15:52:30 +04:00
[CST] Focus
af4205e76b GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return
Origin commit data
------------------
Commit: 0319c4faad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
2012-05-07 15:37:02 +04:00