Commit Graph

54 Commits

Author SHA1 Message Date
vanhofen
6556882cb1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: c188cf3683
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)
2017-02-26 22:35:47 +01:00
Thilo Graf
166575e9a5 CProgressWindow: use percental calculated dimensions as default
Origin commit data
------------------
Commit: ed9edb5dad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-25 (Sat, 25 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
a364fc9cd0 CProgressWindow: syncronize paint of local and global bar on first paint
In some cases progress bars were painted with delay.
Now it should be looks better.


Origin commit data
------------------
Commit: f478c75e26
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-23 (Thu, 23 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
97d041d8f6 CProgressWindow: small cosmetic
Origin commit data
------------------
Commit: 1e6997e3af
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-17 (Fri, 17 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
57b8bac43e CProgressWindow: rename InitProgressItem -> getProgressItem
more plausible


Origin commit data
------------------
Commit: 0281b7e8c7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-17 (Fri, 17 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
186c04f2c5 CProgressWindow: move some methodes for more clarity
Origin commit data
------------------
Commit: 9d3e5f4fd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-17 (Fri, 17 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
3d6b3a5cb0 CProgressWindow: encapsulate show methodes, add dimension defines
Origin commit data
------------------
Commit: 7339d3dd03
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-16 (Thu, 16 Feb 2017)
2017-02-26 21:29:53 +01:00
Thilo Graf
18b2d04640 CProgressWindow: add overloaded constructor with string arg
Origin commit data
------------------
Commit: 5049b69c3f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)
2017-02-26 21:29:53 +01:00
vanhofen
c9ab20d703 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: b4b328a0bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 19:36:03 +01:00
Thilo Graf
14f4e34218 CProgressWindow: add documentation for Doxygen
Origin commit data
------------------
Commit: 45e77707f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
36958f4e7e CProgressWindow: use using namespace for std and sigc
Makes more clearly


Origin commit data
------------------
Commit: a3c93f4236
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
a1598cb703 CProgressWindow: add possibility to show progress via signal
Origin commit data
------------------
Commit: 842c8e79bb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
Thilo Graf
ae97c4e398 CProgressWindow: allow variable max value, allow define dimensions
Origin commit data
------------------
Commit: 547238bfdd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
2017-02-13 09:02:43 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 13:19:03 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 17:27:55 +02:00
vanhofen
64744ba140 colors: add COL_PROGRESSBAR wrapper
Origin commit data
------------------
Commit: be40e67b70
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- colors: add COL_PROGRESSBAR wrapper
2016-10-10 14:19:55 +02:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
2015-12-28 16:15:14 +01:00
Thilo Graf
72a289a90c components: rework classes
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large


Origin commit data
------------------
Commit: 0146511f38
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)

Origin message was:
------------------
components: rework classes

- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large
2015-12-27 14:42:27 +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
Michael Liebmann
1d5f135331 Apollo/Kronos: Use backup with readmtdJFFS2() also for var partition
Origin commit data
------------------
Commit: 6121e57fbc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)
2015-09-22 13:41:13 +02:00
Thilo Graf
508deaac79 CProgressWindow: fix background fragments on text paint
Permanent screen saving was disabled by default since commit
8a1f71604a. In this case it can be substituted if enabled
bg paint.


Origin commit data
------------------
Commit: d5bad0ac36
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-23 (Thu, 23 Apr 2015)
2015-05-04 10:37:03 +02:00
Thilo Graf
61656865d0 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
2015-04-30 09:20:43 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
Thilo Graf
553bff50e8 CProgressWindow: reassign y position of body items on disabled header
Origin commit data
------------------
Commit: 32af48cc80
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-30 (Sun, 30 Nov 2014)
2015-03-29 22:40:01 +02:00
Thilo Graf
bbb94b0b79 CProgressWindow: add member showStatus()
This displays only one progress bar instead two and shows the global
status. That's senseful , if only one progress bar is required.


Origin commit data
------------------
Commit: 7e084c2531
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-11-30 (Sun, 30 Nov 2014)

Origin message was:
------------------
CProgressWindow: add member showStatus()

This displays only one progress bar instead two and shows the global
status. That's senseful , if only one progress bar is required.
2015-03-29 22:39:59 +02: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
036e781c6b progresswindow: fix position of progressbars
Origin commit data
------------------
Commit: f4ccaa975b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-17 (Mon, 17 Nov 2014)

Origin message was:
------------------
- progresswindow: fix position of progressbars
2014-11-17 15:53:08 +01:00
Thilo Graf
a131a450c3 CProgressWindow: cleanup surplus includes
already included by base class


Origin commit data
------------------
Commit: 3e2e862e81
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-08-12 (Tue, 12 Aug 2014)
2014-09-14 00:00:56 +02:00
Thilo Graf
84279dba73 CProgressWindow: optimize fontsize handling
- minimal size is now 14 instead 20, changed scale settings now should
 be noticed earlier
- font type is now bold
- arrangement of progressbars adapted


Origin commit data
------------------
Commit: 0149b27760
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-08-11 (Mon, 11 Aug 2014)

Origin message was:
------------------
CProgressWindow: optimize fontsize handling

- minimal size is now 14 instead 20, changed scale settings now should
 be noticed earlier
- font type is now bold
- arrangement of progressbars adapted
2014-08-26 17:31:18 +04:00
Thilo Graf
2cf39874f9 CProgressWindow: user request: increase size of description and window
Origin commit data
------------------
Commit: bf10f929f8
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-07-17 (Thu, 17 Jul 2014)
2014-07-18 13:31:34 +04:00
Thilo Graf
d13c205ade CProgressWindow: dont't paint frame on progressbars
Origin commit data
------------------
Commit: f164104daf
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-30 (Mon, 30 Jun 2014)
2014-07-18 13:31:16 +04:00
Thilo Graf
7d1020cdf5 CProgressWindow: implement CComponent classes
This implement window functionality from CComponentsWindow,
progress items from CProgressBar() and status text
items from CComponentsLabel()


Origin commit data
------------------
Commit: 2f0e4e1687
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-09 (Mon, 09 Jun 2014)
2014-06-23 18:43:47 +02:00
vanhofen
98c0a441d8 change RenderString() default to UTF8
Origin commit data
------------------
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8
2014-06-11 23:07:13 +02:00
vanhofen
82168342a2 Revert "- add missing include of vfd header"
This reverts commit 81d56f75fc.


Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc add missing include of vfd header
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header
2013-11-13 10:40:18 +01:00
Stefan Seyfried
14d73c9280 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
2013-09-28 13:01:03 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Michael Liebmann
7b6498d39f 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
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
2013-07-21 22:00:58 +02:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc'
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
Michael Liebmann
4987f7ef5b Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes


Origin commit data
------------------
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-08 (Sat, 08 Jun 2013)

Origin message was:
------------------
* Software update: Rework preparing the flash process

- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
2013-06-08 16:20:32 +02:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
2012-12-30 21:35:20 +01:00
Jacek Jendrzej
8819de8d85 never used
Origin commit data
------------------
Commit: 1d5e7b23b3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
2012-12-07 12:01:45 +01:00
Stefan Seyfried
857402e3d4 Merge branch 'uncool/dvbsi++'
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
2012-11-11 01:45:22 +01:00
Jacek Jendrzej
d74377dd47 initialize not initialized var
Origin commit data
------------------
Commit: 926e0ce141
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
initialize not initialized var
2012-11-05 09:24:51 +01:00
Stefan Seyfried
3dda6ee00f neutrino: adapt to the framebuffer_spark blitter change
basically add fb->blit() in every widget where necessary to
make sure the framebuffer is updated with current content


Origin commit data
------------------
Commit: a029333c1a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
2012-04-17 19:33:57 +02:00
Stefan Seyfried
1b5b47b85f neutrino: avoid float for percent calculations
Origin commit data
------------------
Commit: fb6633b7aa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-25 (Sun, 25 Dec 2011)
2012-04-17 19:33:51 +02:00
Jacek Jendrzej
bc63368ad3 wide window
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@880 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: f493a3bf3a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-11-02 (Tue, 02 Nov 2010)
2010-11-02 07:15:42 +00:00
Jacek Jendrzej
39b561d990 fix shutdown for neo
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@719 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 3c973dfdd5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-08-13 (Fri, 13 Aug 2010)

Origin message was:
------------------
-fix shutdown for neo

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@719 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-13 10:07:38 +00:00