Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a806919b8c
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e426104399
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: be3c098cb8
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fa9244f91
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c27c08014
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2a6a7d5c8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
keep stream running in soft-standby
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5a2b0336c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
This commit was generated by Migit
support multi-client and multi-channel,
experimental / testing - please read comments at the top of driver/streamts.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae6cbc9479
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0f9efbc8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0578ef7c30
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 861a5a4a51
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 01383e083d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-07 (Wed, 07 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02c3cfb173
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-07 (Wed, 07 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c311a7d97
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-07 (Wed, 07 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9a6a8721b
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)
Origin message was:
------------------
- stringinput.cpp: center NEUTRINO_ICON_NUMERIC_PAD horizontally
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9625254e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6472840127
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)
Origin message was:
------------------
- network_setup.cpp: add more suitable hints to hostname-setup
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c84840e10
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Origin message was:
------------------
* Software Update with apply the settings (Part9)
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e145f9a5e8
Author: defans <defans@bluepeercrew.us>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Origin message was:
------------------
- add pictureviewer to info-key in audioplayer
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24ffee6bb2
Author: defans <defans@bluepeercrew.us>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Origin message was:
------------------
- infoviewer_bb.cpp,h: fix determination of hdd-usage in thread
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
revert of a1db0df966
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94a49e3a51
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
------------------
This commit was generated by Migit
merge error, max_width is not declared
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6016c60b4c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
------------------
This commit was generated by Migit
merge error: mode is not declared
Origin commit data
------------------
Branch: ni/coolstream
Commit: 694d995415
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
------------------
This commit was generated by Migit
If is set m_nMaxWidth, then use this to calculate m_cFrameTextRel.iWidth.
To set m_nMaxWidth use setWindowMaxDimensions(width) and setText(maxwidth).
This should help, to paint text with clean linebreaks
into defined textboxes.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 474a35a254
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-10-26 (Fri, 26 Oct 2012)
------------------
This commit was generated by Migit
Default align is centered and to beware the old window style must add
CTextBox::TOP
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55bc93f642
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-24 (Mon, 24 Sep 2012)
Origin message was:
------------------
*CMovieBrowser: apply CTextBox::TOP for movie infobox
Default align is centered and to beware the old window style must add
CTextBox::TOP
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33e684bc20
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)
Origin message was:
------------------
*CTextBox: add optional text align TOP
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This supports paint of text on the right side of frame and
also considers scroll bar width.
Origin commit data
------------------
Branch: ni/coolstream
Commit: c25edc0b74
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)
Origin message was:
------------------
*CTextbox: add text align option RIGHT
This supports paint of text on the right side of frame and
also considers scroll bar width.
------------------
This commit was generated by Migit
If we have only one line, text will be painted horizontal centered,
otherwise text begins on top of frame.
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9472dc3f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)
Origin message was:
------------------
*CTextBox: set text y position depends of lines count
If we have only one line, text will be painted horizontal centered,
otherwise text begins on top of frame.
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07fa858d6c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)
Origin message was:
------------------
*CTextBox: add missing textmode comments
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
so we can control max an mnin width and height
Origin commit data
------------------
Branch: ni/coolstream
Commit: 130d7bf6c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-22 (Sat, 22 Sep 2012)
------------------
This commit was generated by Migit
refreshTextLineArray() was to much in reSizeMainFrameHeight() and
initFramesRel(), caused endless loops under certain circumstances
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1244af4666
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-20 (Thu, 20 Sep 2012)
Origin message was:
------------------
*CTextBox: fix freezes in channellist and bedit
refreshTextLineArray() was to much in reSizeMainFrameHeight() and
initFramesRel(), caused endless loops under certain circumstances
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 550300078e
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)
Origin message was:
------------------
*CTextbox: add Member setWindowPos()
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7bdf41dfe
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)
Origin message was:
------------------
*CTextBox: trivial change for better readability in initVar()
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this combines initFramesRel() and refreshTextLineArray()
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed3be21ebd
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)
Origin message was:
------------------
*CTextBox: add member initFramesAndTextArray(), move max_width into initVar
this combines initFramesRel() and refreshTextLineArray()
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57cb8cc3e0
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)
Origin message was:
------------------
*CTextBox: style, reworked statements for better readability
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
lineBreakWidth is not initialized, but some othe values also not defined,
here is seems somthing wrong
Origin commit data
------------------
Branch: ni/coolstream
Commit: d7dc44146c
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-18 (Tue, 18 Sep 2012)
Origin message was:
------------------
*CTextBox: add missed init of lineBreakWidth
lineBreakWidth is not initialized, but some othe values also not defined,
here is seems somthing wrong
------------------
This commit was generated by Migit
framebuffer = NULL was called in all constructors,
so it should be enough to define this only at one point.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55896356f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Origin message was:
------------------
*CTextBox: move framebuffer define only into initVar
framebuffer = NULL was called in all constructors,
so it should be enough to define this only at one point.
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 323393548d
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Origin message was:
------------------
*CTextBox: some small style clean ups for better readability
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 342fa5f88a
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-14 (Fri, 14 Sep 2012)
Origin message was:
------------------
*CTextBox/CMsgBox: reduce data type conflicts
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2b9429669
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-14 (Fri, 14 Sep 2012)
Origin message was:
------------------
*CTextBox: add methodes setTextMode() and setBackGroundColor()
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: da63457eef
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)
Origin message was:
------------------
*CMovieBrowser: set button yes in message box as default on delete ts file
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12e778773b
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-28 (Tue, 28 Aug 2012)
Origin message was:
------------------
*user_menu: personalize also yellow and green buttons
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
it' makes osd too slow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c22d1594
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-27 (Mon, 27 Aug 2012)
Origin message was:
------------------
*CTextBox: remove printf
it' makes osd too slow
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e3791be72
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
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6535a4823
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Origin message was:
------------------
- satellites.xml: update astra 19.2
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 926e0ce141
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Origin message was:
------------------
initialize not initialized var
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
