Commit Graph

233 Commits

Author SHA1 Message Date
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
32075530f5 Revert "src/gui/channellist.cpp: fix to eb9cc7950d if more bouquets empty"
This reverts commit b212f46c3d.

a better solution without duplicating code is available


Origin commit data
------------------
Commit: 8ba673497e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 13:33:29 +02:00
Stefan Seyfried
619d1f2c69 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: 21cb7fc249
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 13:15:40 +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
Thilo Graf
1fe3cbe0b3 CChannellist: add missig frame for timscale
Origin commit data
------------------
Commit: 6fa592323b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 10:21:22 +02: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
Jacek Jendrzej
b212f46c3d src/gui/channellist.cpp: fix to eb9cc7950d if more bouquets empty
Origin commit data
------------------
Commit: f4ae5e17ce
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
2013-03-27 16:18:32 +01:00
Stefan Seyfried
eb9cc7950d channellist: refactor to avoid duplicated code
Origin commit data
------------------
Commit: 36e95d7fbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-03-25 14:06:16 +01: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
Thilo Graf
db3a5d459e CChannelList: ensure new init of dline
Causes correct paint of details line, if osd settings
have been changed.


Origin commit data
------------------
Commit: deab17dc25
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-03-24 21:16:49 +01:00
Stefan Seyfried
4291671fba channellist: refactor to avoid duplicated code
Origin commit data
------------------
Commit: 8193e52615
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-03-24 19:24:38 +01:00
Thilo Graf
34935b772d CChannelList: remove details line on changing pages
details line was not completely killed changed page.


Origin commit data
------------------
Commit: 407d9fe800
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-21 (Thu, 21 Mar 2013)
2013-03-21 11:38:40 +01:00
vanhofen
67b56bcae7 fix my last commit acf6948 (recalc height)
Origin commit data
------------------
Commit: 3584a11872
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)

Origin message was:
------------------
- fix my last commit acf6948 (recalc height)
2013-03-17 20:15:17 +01:00
vanhofen
acf69480f2 channellist: fix dimensions when using very large fonts
* paint scrollbar over full height of main box


Origin commit data
------------------
Commit: 0064c6c704
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-16 (Sat, 16 Mar 2013)

Origin message was:
------------------
- channellist: fix dimensions when using very large fonts

* paint scrollbar over full height of main box
2013-03-16 23:47:23 +01:00
Stefan Seyfried
4ccd38f9e9 channellist: preset favorite bouquets when adding channels
when adding channels from the channellist context menu, the
useful targets are the favorites bouquets, so pre-select them


Origin commit data
------------------
Commit: f8aacb7a10
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
241bb43a9a channellist: preset favorite bouquets when adding channels
when adding channels from the channellist context menu, the
useful targets are the favorites bouquets, so pre-select them


Origin commit data
------------------
Commit: a91b58aac4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
2013-03-10 00:15:46 +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
Thilo Graf
6b4654ed77 CChannelList: fix compile error
clearItem2DetailsLine()candidate expects 1 argument, 2 provided


Origin commit data
------------------
Commit: ba4e026b33
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-03-06 11:28:17 +01:00
Thilo Graf
89f330f97e CChannelList: revert of some implementations of CComponents classes
Current state of CChannelList is mostly not compatible with CC-classes and
implementations are to expensive at the moment, because more preparations are necessary.


Origin commit data
------------------
Commit: ce2e95cc5a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
CChannelList: revert of some implementations of CComponents classes

Current state of CChannelList is mostly not compatible with CC-classes and
implementations are to expensive at the moment, because more preparations are necessary.
2013-03-06 11:28:17 +01:00
Thilo Graf
18f8c0a60e CChannelList: devel_cc fix merge errors
var full_width was lost during merge, this fixes
header and details width


Origin commit data
------------------
Commit: ec0a91813a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-03-06 11:28:16 +01:00
Michael Liebmann
b8812f1c78 channellist.cpp: Fix segfault at 'delete Infobox' when changes in bouquet list.
Origin commit data
------------------
Commit: 505d14c0a1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-09-22 (Sat, 22 Sep 2012)
2013-03-06 11:28:05 +01:00
Thilo Graf
d8528eee79 CChannelList: adapt for new functionality in CComponents
Origin commit data
------------------
Commit: d0af8fb7bf
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-03 (Mon, 03 Sep 2012)
2013-03-06 11:28:02 +01:00
Thilo Graf
80abb28236 CChannellist: remove calculateElements()
is already included in print()clHead->paint() and refreshElement()


Origin commit data
------------------
Commit: 936e965909
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2013-03-06 11:28:00 +01:00
Michael Liebmann
61569002e2 Channellist: Use CComponentsTitleBar for paint head
Origin commit data
------------------
Commit: cd4cb6645e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-29 (Wed, 29 Aug 2012)
2013-03-06 11:28:00 +01:00
Thilo Graf
a1398ac4ad CChannelList: use own function to get transponder info
Origin commit data
------------------
Commit: 32f2f8a85d
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-25 (Sat, 25 Aug 2012)
2013-03-06 11:27:57 +01:00
Thilo Graf
ef4dca41c5 CChannelList: adapt for new CComponentsInfoBox functionality
TODO:
paint text into infobox with CComponentsInfoBox


Origin commit data
------------------
Commit: c53a0a7ab4
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-25 (Sat, 25 Aug 2012)
2013-03-06 11:27:57 +01:00
Thilo Graf
99da862e5e CChannelList: adapt for last changes in CComponents
Origin commit data
------------------
Commit: d59eb05427
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-16 (Thu, 16 Aug 2012)
2013-03-06 11:27:53 +01:00
Michael Liebmann
2440dc5793 channellist.cpp: paint details
- Rework paintItem2DetailsLine()
- Use CComponentsInfoBox for paintDetails()
- Set missing height of down mark


Origin commit data
------------------
Commit: 413e224128
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-08 (Wed, 08 Aug 2012)

Origin message was:
------------------
* channellist.cpp: paint details

- Rework paintItem2DetailsLine()
- Use CComponentsInfoBox for paintDetails()
- Set missing height of down mark
2013-03-06 11:27:52 +01:00
Stefan Seyfried
dce1f9251b channellist: initialize values to satisfy valgrind
Origin commit data
------------------
Commit: b0c7ca94a7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-24 13:56:47 +01:00
Stefan Seyfried
d8ea026fb3 channellist: initialize values to satisfy valgrind
Origin commit data
------------------
Commit: 94883e0877
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 17:16:43 +01:00
Stefan Seyfried
b9b4907444 channellist: use "classic" width if minitv is unused
Origin commit data
------------------
Commit: 901b7cbd38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 16:21:24 +01:00
Thilo Graf
316d2bb200 CChannelList: fix position of minitv, small cleanups
This is only a provisionally fix. A rework of initialisation for
many member variables seems to be necessary.


Origin commit data
------------------
Commit: fedb9132d7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 16:15:03 +01:00
Thilo Graf
8fc2e22eb4 CChannelList: fix position of minitv, small cleanups
This is only a provisionally fix. A rework of initialisation for
many member variables seems to be necessary.


Origin commit data
------------------
Commit: f90395b81d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-22 (Fri, 22 Feb 2013)
2013-02-22 09:23:33 +01: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
Thilo Graf
e244a9c9c2 CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Commit: 0a961a4cf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-19 (Tue, 19 Feb 2013)
2013-02-19 11:27:46 +01:00
vanhofen
918e56adf3 channellist.cpp: change order of painting to be more liquid
Origin commit data
------------------
Commit: b307f4c8d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
- channellist.cpp: change order of painting to be more liquid
2013-02-18 21:54:52 +01:00
vanhofen
069ad2f912 channellist.cpp: show pic instead of miniTV in radiomode
Origin commit data
------------------
Commit: 8a7687abe1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-18 (Mon, 18 Feb 2013)

Origin message was:
------------------
- channellist.cpp: show pic instead of miniTV in radiomode
2013-02-18 21:00:19 +01:00
vanhofen
0acf92b838 channellist.cpp: fix logo position if new_zap_mode is off
Origin commit data
------------------
Commit: 782c9f107c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix logo position if new_zap_mode is off
2013-02-17 23:20:04 +01:00
vanhofen
2a2cd1894c channellist.cpp: fix broken display of infobar while zapping
Origin commit data
------------------
Commit: 9632f3bad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: fix broken display of infobar while zapping
2013-02-17 22:57:37 +01:00
vanhofen
1451221683 Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
This reverts commit fa85dcc867.


Origin commit data
------------------
Commit: 505c4ba80d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)
2013-02-17 22:55:28 +01:00
vanhofen
02695dc19c channellist.cpp: allow colored events (for time) in right eventlist
Origin commit data
------------------
Commit: ddbac1b248
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-17 (Sun, 17 Feb 2013)

Origin message was:
------------------
- channellist.cpp: allow colored events (for time) in right eventlist
2013-02-17 21:55:21 +01:00
Thilo Graf
a505299418 CComponents: move class into its own source directory
The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.


Origin commit data
------------------
Commit: f3f347bdb3
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-02-12 (Tue, 12 Feb 2013)
2013-02-16 12:13:24 +01:00
vanhofen
fa85dcc867 Revert "- channellist.cpp: enable to lock new_zap_mode"
This reverts commit 06a54ba7ce
because the display of infobar while zapping is broken with
this commit.


Origin commit data
------------------
Commit: fb892d18ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-15 (Fri, 15 Feb 2013)
2013-02-15 22:55:45 +01:00
Michael Liebmann
dd6a964fa5 channellist.cpp: Show channel list vertically centered
Origin commit data
------------------
Commit: 91d76a9487
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Show channel list vertically centered
2013-02-13 23:34:55 +01:00
Michael Liebmann
c3d81ac69d channellist.cpp: Fix time display in event list
- fix compiler warning


Origin commit data
------------------
Commit: b2f5ca589d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Fix time display in event list

- fix compiler warning
2013-02-12 21:34:18 +01:00
tomworld
51fda1d48f channellist.cpp: Use extra font for event list
Origin commit data
------------------
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list
2013-02-12 15:45:27 +01:00
vanhofen
06a54ba7ce channellist.cpp: enable to lock new_zap_mode
Origin commit data
------------------
Commit: 15d787f79b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)

Origin message was:
------------------
- channellist.cpp: enable to lock new_zap_mode
2013-02-10 21:03:43 +01:00
TangoCash
30a218c9ca channellist.cpp: add epg-desc to blue button ...
... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications


Origin commit data
------------------
Commit: 31080fa98c
Author: TangoCash <eric@loxat.de>
Date: 2013-02-09 (Sat, 09 Feb 2013)

Origin message was:
------------------
- channellist.cpp: add epg-desc to blue button ...

... if g_settings.channellist_additional is not off.

initially patch by TangoCash with marginal modifications
2013-02-09 10:36:11 +01:00