Commit Graph

1608 Commits

Author SHA1 Message Date
Stefan Seyfried
51bbad3ab1 Merge branch 'check/pu-cc' into master
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: 61bf95f552
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)
2013-04-13 17:17:30 +02:00
vanhofen
e3905bf5c7 eventlist: make additional infos switchable
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


Origin commit data
------------------
Commit: 473d6f38ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- eventlist: make additional infos switchable

* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
2013-04-13 11:13:23 +02:00
Jacek Jendrzej
56ea461119 src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Commit: 9fe2f83987
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 14:09:13 +04:00
Jacek Jendrzej
19fc4580a7 src/neutrino.cpp: fix execute rcK script
Origin commit data
------------------
Commit: f5297f06d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-10 (Wed, 10 Apr 2013)
2013-04-10 11:59:48 +02:00
[CST] Focus
c54a1188b7 neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 18:37:25 +04:00
[CST] Focus
49340af282 neutrino.cpp: fix unused variable warning
Origin commit data
------------------
Commit: 8c2362374d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 16:02:29 +04:00
[CST] Focus
60985d9431 src/neutrino.cpp: setSelected(old_num) on channel list exit wrong in case of sort
mode change - try to restore current channel id


Origin commit data
------------------
Commit: e250588705
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 13:12:05 +04:00
[CST] Focus
9e146aa35c neutrino.cpp: stop PiP in standby
Origin commit data
------------------
Commit: 0f90276877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 10:58:54 +04:00
Stefan Seyfried
bb76cc5a40 fix build / progressbar setup after pu/cc merge
* CProgressBar::PB_MONO is no longer available
* PB color setup is split over two configuration variables
Fix this while still keeping seamless update compatibility.


Origin commit data
------------------
Commit: 6a955ecef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 14:41:06 +02:00
Stefan Seyfried
f0f32ff08f Merge branch 'check/pu-cc' into master
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h


Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 14:28:16 +02:00
Stefan Seyfried
f1e664b75e Merge branch 'check/pu-cc' into master
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp


Origin commit data
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:21:55 +02:00
Stefan Seyfried
9ba28c1287 neutrino: add the possibility to lock bouquets by default
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
2013-04-05 15:52:58 +04:00
Thilo Graf
03b22f2d23 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework


Origin commit data
------------------
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-02 09:31:05 +02: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
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
c8370d109c neutrino.cpp: add channellist_numeric_adjust settings variable
Origin commit data
------------------
Commit: b1d63cd800
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-01 14:13:51 +04:00
Stefan Seyfried
864c0c2bee Revert "progressbar-menu-tomworld"
This reverts commit 1bc23bfc31.

A better and simpler solution for progressbar setup is already in place.


Origin commit data
------------------
Commit: 8835f4a0c7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)
2013-03-26 19:17:29 +01:00
[CST] Focus
d8e72a9660 neutrino.cpp: stop stream before pip start
Origin commit data
------------------
Commit: 305455e004
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-03-25 13:36:00 +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
Stefan Seyfried
225bbbe9a8 neutrino: remove newline from debug message
Origin commit data
------------------
Commit: 79d537ea90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-03-24 12:59:40 +01:00
Jacek Jendrzej
1caa128727 add record option for teletext & dvbsub pids
Origin commit data
------------------
Commit: d9c7739aa6
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-03-19 17:14:04 +01:00
[CST] Focus
88d6d58d34 neutrino.cpp: change default channel list mode to minitv
Origin commit data
------------------
Commit: 2ad5340134
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)
2013-03-14 11:55:12 +04:00
[CST] Focus
1809e23dc4 neutrino.cpp, gui/scan.cpp: force re-zap without setSelected()
Origin commit data
------------------
Commit: b3923a7d5d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-13 (Wed, 13 Mar 2013)
2013-03-13 18:59:44 +04:00
[CST] Focus
54fe1fea55 neutrino.cpp: start PiP on pip_close key, add StartPip() function
Origin commit data
------------------
Commit: bb3f4ca7d4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-13 (Wed, 13 Mar 2013)
2013-03-13 16:24:11 +04:00
Jacek Jendrzej
3b680a36ca progressbar-menu-tomworld
Origin commit data
------------------
Commit: 369289d179
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)
2013-03-12 17:27:52 +04:00
Stefan Seyfried
ebc8c7bb43 neutrino: allow empty user bouquets in the bouquetlist
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 0d2c3f3f10
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-12 16:50:07 +04:00
Stefan Seyfried
880547e432 channellist: don't change bouquetmode when adding favs
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added


Origin commit data
------------------
Commit: 367f6f6559
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-12 16:33:00 +04:00
Jacek Jendrzej
1bc23bfc31 progressbar-menu-tomworld
Origin commit data
------------------
Commit: be2966035f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)
2013-03-11 14:40:36 +01:00
Stefan Seyfried
c5533f2fae neutrino: allow empty user bouquets in the bouquetlist
Origin commit data
------------------
Commit: d0f9836173
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-11 13:32:06 +01:00
Stefan Seyfried
fc334d6862 channellist: don't change bouquetmode when adding favs
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added


Origin commit data
------------------
Commit: 99e2ff32c9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-11 13:32:06 +01:00
Stefan Seyfried
10739919ce neutrino: allow empty user bouquets in the bouquetlist
Origin commit data
------------------
Commit: bb098c376e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 00:27:13 +01:00
Stefan Seyfried
93fcaf1606 channellist: don't change bouquetmode when adding favs
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added


Origin commit data
------------------
Commit: 21f79f1284
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 00:07:26 +01:00
Stefan Seyfried
c62d77374b neutrino: fix shortened source file paths
Origin commit data
------------------
Commit: 1ed105fd5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
2013-03-09 21:49:45 +01:00
Stefan Seyfried
1d536b4e34 neutrino: make progressbar_color backwards compatible
Origin commit data
------------------
Commit: 9477ea5edd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
2013-03-09 13:29:03 +01:00
Stefan Seyfried
8d71c14242 neutrino: add more progressbar design options
new progressbar design
* colored horizontal lines
* colored vertical lines
* colored solid bar


Origin commit data
------------------
Commit: 385d4ff6a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
2013-03-09 13:23:14 +01:00
[CST] Focus
05bffc2d54 neutrino.cpp: add direct keys to config PiP, swap live and PiP channels
Origin commit data
------------------
Commit: b95859da7c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
2013-03-08 13:24:53 +04:00
Stefan Seyfried
0a6e405603 Merge branch 'check/next' into master
Conflicts:
	data/locale/english.locale
	src/neutrino.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:11 +01:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
2013-03-07 17:10:57 +04:00
[CST] Focus
ae4cae153a use ENABLE_PIP for pip code
Origin commit data
------------------
Commit: cbfa6f88c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)
2013-03-05 18:34:47 +04:00
Stefan Seyfried
9c0fbe8943 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:58:49 +01:00
Stefan Seyfried
3250e7cd2b neutrino: avoid crash when signals are caught during start
this needs more work to avoid crashes when interrupted early

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: b6df7de7f7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-05 11:01:40 +01:00
Stefan Seyfried
c5cf60ddcf neutrino: avoid crash when signals are caught during start
this needs more work to avoid crashes when interrupted early


Origin commit data
------------------
Commit: 6c4b9741ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-03 21:57:59 +01:00
Stefan Seyfried
811e75380e helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.


Origin commit data
------------------
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-03 19:18:13 +01:00
vanhofen
e6f84772f9 neutrino.cpp: fix handling of g_settings.mode_left_right_key_tv
Origin commit data
------------------
Commit: 8b18346c98
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-01 (Fri, 01 Mar 2013)

Origin message was:
------------------
- neutrino.cpp: fix handling of g_settings.mode_left_right_key_tv
2013-03-01 20:49:47 +01:00
[CST] Focus
ddc00bba81 Merge branch 'pip' into next
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 69b4d366af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:45:41 +04:00
[CST] Focus
e15f1c4c72 Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:39:34 +04:00
[CST] Focus
7bde08b702 neutrino.cpp: save/load pip key - default is 'help' button, stop PiP on pip key
Origin commit data
------------------
Commit: f5c162522b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:20:23 +04:00
[CST] Focus
80fc03f242 neutrino.cpp: save/load pip settings, group apollo-specific settings
Origin commit data
------------------
Commit: 876b697a14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)
2013-02-26 17:18:05 +04:00
Stefan Seyfried
2b4f5306dc Merge branch 'check/dvbsi++' commit 984435d48e
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 0cf191822a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-21 (Thu, 21 Feb 2013)
2013-02-21 17:07:18 +01:00
Stefan Seyfried
80a87017f3 neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01:00