Commit Graph

81 Commits

Author SHA1 Message Date
[CST] Focus
300f25e8c3 neutrino: try to prevent using chanellist/bouquetlist while channels init in progress
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3da439030b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-13 (Tue, 13 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-13 16:10:24 +03:00
[CST] Focus
8976bb09d2 gui/bouquetlist.cpp: mark only changed bouquets/services to save;
enable menu save screen, do not repaint after menu;
allow open empty channel list


Origin commit data
------------------
Branch: ni/coolstream
Commit: 823549949d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-10 (Fri, 10 Oct 2014)



------------------
This commit was generated by Migit
2014-10-10 15:26:32 +04:00
martii
99f9745c97 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
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
martii
bca9371e65 system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)



------------------
This commit was generated by Migit
2014-09-12 18:29:21 +04:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
Thilo Graf
5c7441f5d1 COSDFader: rename member functions, adapt implementations
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
vanhofen
4f9e0ee544 change RenderString() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-06-11 23:07:13 +02:00
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
[CST] Focus
72975b9480 gui/bouquetlist.cpp: show epg icon for bouquets selected to scan epg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 330c8af7c2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-31 (Mon, 31 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-02 17:32:38 +04:00
[CST] Focus
3058b26efa gui/bouquetlist.cpp: another fix for bouquet epg scan option :D
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7604664a4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-28 19:04:36 +04:00
[CST] Focus
db1b2263e8 gui/bouquetlist.cpp: another fix for bouquet epg scan option
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb1ef76495
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-28 18:40:20 +04:00
[CST] Focus
0c170586dd gui/bouquetlist.cpp: fix warning
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d8a633532
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-28 18:00:27 +04:00
[CST] Focus
4b39602c8e gui/bouquetlist.cpp: fix crash
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6934981f30
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-28 16:12:31 +04:00
[CST] Focus
65be146624 gui/bouquetlist.cpp: add menu option to switch bouquet epg scan on/off
Origin commit data
------------------
Branch: ni/coolstream
Commit: e11434f417
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-27 (Thu, 27 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-27 18:56:49 +04:00
[CST] Focus
9ecee4b49b gui/bouquetlist.cpp: allow to delete whole satellite from satellite bouquet view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90768b15ac
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-13 (Thu, 13 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-13 16:06:20 +04:00
[CST] Focus
156ff7d440 gui/bouquetlist.cpp: fix inactive color when called to add channel to bouquet
Origin commit data
------------------
Branch: ni/coolstream
Commit: 040b2a958e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-05 (Wed, 05 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 16:09:10 +04:00
Thilo Graf
bad892af5f revert 8919d0aba0
use an easier solution, based up neutrino-mp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bcf4e4fbf9
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)



------------------
This commit was generated by Migit
2014-01-26 20:30:41 +01:00
Michael Liebmann
8919d0aba0 Fix compiler warnings (-Wconversion)
- THX SatBaby for the info


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd5fd9dab3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-25 (Sat, 25 Jan 2014)



------------------
This commit was generated by Migit
2014-01-25 23:06:27 +01:00
Thilo Graf
9585b49365 CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


------------------
This commit was generated by Migit
2014-01-24 23:09:56 +01:00
martii
164b3b5088 gui/bouquetlist: fix edf9ea5 and e7b27fc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d0eea3b23
Author: martii <m4rtii@gmx.de>
Date: 2013-12-09 (Mon, 09 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-13 16:53:05 +01:00
martii
edf9ea5112 gui/bouquetlist: use Font::getMaxDigitWidth()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73152bd30b
Author: martii <m4rtii@gmx.de>
Date: 2013-12-08 (Sun, 08 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-13 16:44:59 +01:00
vanhofen
3498b687da Revert "- add missing include of vfd header"
This reverts commit 3006c5ff4b.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:39:55 +01:00
vanhofen
3006c5ff4b add missing include of vfd header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:18 +01:00
Thilo Graf
cbc2b193af 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
------------------
Branch: ni/coolstream
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)



------------------
This commit was generated by Migit
2013-10-24 21:19:07 +02:00
Thilo Graf
aff6a3985b CBouquetList: use required type
fix some possible compiler warnings


Origin commit data
------------------
Branch: ni/coolstream
Commit: acb256ba53
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-02 (Wed, 02 Oct 2013)



------------------
This commit was generated by Migit
2013-10-02 10:07:34 +02:00
[CST] Focus
e07df00083 src/gui/bouquetlist.cpp: do not add dublicate channels while copy bouquet to favorite,
if favorite bouquet already exist


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d63e4048e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)



------------------
This commit was generated by Migit
2013-09-25 17:08:34 +04:00
[CST] Focus
66c5c51b0e channel list: restrict adding channels to favorits only,
show empty bouquets only in channel add mode


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a8f996ca0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-18 (Wed, 18 Sep 2013)



------------------
This commit was generated by Migit
2013-09-18 12:57:56 +04:00
Michael Liebmann
221b6ee8b4 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
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)



------------------
This commit was generated by Migit
2013-07-21 22:00:58 +02:00
Stefan Seyfried
5f1b5fbdcb neutrino: fix possible div-by-zero in scrollbar calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: a33086568b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-29 (Wed, 29 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-30 11:19:39 +02:00
vanhofen
fb308c6334 neutrino: don't save screen while paint headers
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-28 10:42:39 +02:00
vanhofen
e52b01ab39 bookmarkmanager/bouquetlist: add missing includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2204631859
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
- bookmarkmanager/bouquetlist: add missing includes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-27 22:08:24 +02:00
vanhofen
c2908f353c bouquetlist: using CComponentsHeader to paint header
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9012e4699
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-27 (Mon, 27 May 2013)

Origin message was:
------------------
- bouquetlist: using CComponentsHeader to paint header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-27 21:19:23 +02:00
Stefan Seyfried
89d3d162ea neutrino: make g_channel_list_changed private
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0c008190e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
42e163074f neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)



------------------
This commit was generated by Migit
2013-04-05 14:50:28 +04:00
vanhofen
45e687fa38 bouquetlist.cpp: use existing loop to calc max height of buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc614004cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)

Origin message was:
------------------
- bouquetlist.cpp: use existing loop to calc max height of buttons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-01 15:10:01 +04:00
[CST] Focus
262c2de611 gui/bouquetlist.cpp: fix bc2ec1f0de:
double ::paintButtons calls was added ?


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96cd5c94af
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)



------------------
This commit was generated by Migit
2013-03-14 11:57:02 +04:00
Stefan Seyfried
bc2ec1f0de bouquetlist: only show active buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: b523fe59c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-12 16:32:51 +04:00
Stefan Seyfried
97c4074fba bouquetlist: fix width calculation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c982e3d49
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-12 16:32:19 +04:00
Stefan Seyfried
581236de89 bouquetlist: mark autogenerated bouquets as readonly
this at least prevents modification from the context menu,
needs more work in the service->bouquetmanagement menus


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25de0d4380
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)



------------------
This commit was generated by Migit
2013-03-12 16:32:12 +04:00
Jacek Jendrzej
8286a1702c src/gui/bouquetlist.cpp: close FAV window with rc-fav only in FAV mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80fe0c9307
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-05 16:45:34 +01:00
Jacek Jendrzej
71ae852521 src/gui/bouquetlist.cpp: fix width
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc73e4de86
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-27 (Sat, 27 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-27 20:00:35 +02:00
[CST] Focus
b0a61fe6c7 gui/bouquetlist.cpp: bouquet id safe-checks
Origin commit data
------------------
Branch: ni/coolstream
Commit: d71ad8700a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-23 (Tue, 23 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-23 16:15:53 +04:00
[CST] Focus
eb73a7bc12 gui/bouquetlist.cpp: fix message loop, if bouquet list is empty
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fad279231
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-22 15:49:55 +04:00
[CST] Focus
98adb47df5 gui/bouquetlist.cpp: add updateSelection(),
fix indent


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a0b42e962
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-22 (Mon, 22 Oct 2012)



------------------
This commit was generated by Migit
2012-10-22 14:23:16 +04:00
Jacek Jendrzej
65a0f6984b Neutrino: Channel list: add method isEmpty() and use it, ported from tuxbox cvs (THX Gaucho316)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35138088e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-20 13:20:49 +02:00
Jacek Jendrzej
3e28f86c85 bouquetlist.cpp: fix width for buttontext
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a6f9467c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-18 (Thu, 18 Oct 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-10-18 17:17:00 +02:00
Jacek Jendrzej
7b3a3bad6b /bouquetlist.cpp: close Favo also with RC_favorites
Origin commit data
------------------
Branch: ni/coolstream
Commit: e50a5ef013
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-12 (Wed, 12 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-12 22:48:15 +02:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
[CST] Focus
bf625802a0 gui/bouquetlist.cpp: dont repaint, if mode not changed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fabe3d425
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-07-16 17:18:41 +04:00
Jacek Jendrzej
5ed8825b21 use empty() instead of size()
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-06-16 09:44:42 +02:00