Commit Graph

1345 Commits

Author SHA1 Message Date
vanhofen
e4fdbbaa80 cc_frm_footer: avoid division by 0
Origin commit data
------------------
Commit: f7a95bd3ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-30 (Fri, 30 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: avoid division by 0
2017-06-30 10:41:24 +02:00
Michael Liebmann
043e374b4a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)
2017-06-29 15:06:39 +02:00
vanhofen
8646201d78 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 37f6b7a963
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:51:27 +02:00
vanhofen
25e1efbc73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Commit: 3f812037a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 22:49:34 +02:00
Thilo Graf
1203bd054a CComponentsFooter: remove FIXME tag
fixed since 428788c8a4
Obsolete wrong types caused this.


Origin commit data
------------------
Commit: 47f7426aa7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-28 (Wed, 28 Jun 2017)
2017-06-28 20:36:51 +02:00
vanhofen
c8cba2e151 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 98edb55233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 22:51:58 +02:00
vanhofen
37d602cfde cc_frm_button.cpp: fix comparsion to detect dyn-font usage
Origin commit data
------------------
Commit: 942d8594f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- cc_frm_button.cpp: fix comparsion to detect dyn-font usage
2017-06-26 22:43:36 +02:00
vanhofen
1f8d52be0d cc_frm_footer: re-add auto-calc label_width by default
Origin commit data
------------------
Commit: bd5602c050
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: re-add auto-calc label_width by default
2017-06-26 22:43:36 +02:00
vanhofen
2ed4784333 Revert "- cc_frm_footer: auto-calc label_width by default"
This reverts commit e259a9dd07.


Origin commit data
------------------
Commit: 5cbdf990fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)
2017-06-26 15:32:32 +02:00
Jacek Jendrzej
da7d2ce50f Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 2ddad19873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 13:54:49 +02:00
vanhofen
bb5ecea8f0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 11:43:58 +02:00
Thilo Graf
cf6c992cad cc_types.h: add more shadow defines
Allows compact style on use for arguments in methods.


Origin commit data
------------------
Commit: aa92fc525f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)
2017-06-21 10:31:22 +02:00
vanhofen
0c076425eb cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.


Origin commit data
------------------
Commit: 980e293517
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead

Signed-off-by: Thilo Graf <dbt@novatux.de>

Good idea, this I had already in mind too.
2017-06-21 10:31:22 +02:00
vanhofen
ad6ede01b2 cc_frm_header: remove CComponentsHeaderLocalized() subclass
use another constructor of CComponentsHeader() instead


Origin commit data
------------------
Commit: 92ceac6a5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)

Origin message was:
------------------
- cc_frm_header: remove CComponentsHeaderLocalized() subclass

use another constructor of CComponentsHeader() instead
2017-06-20 15:55:42 +02:00
Jacek Jendrzej
d803f09645 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: cf951434d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-20 (Tue, 20 Jun 2017)
2017-06-20 14:26:38 +02:00
vanhofen
c7c36aceb1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_frm_scrollbar.cpp
	src/gui/eventlist.cpp
	src/gui/widget/progresswindow.cpp


Origin commit data
------------------
Commit: 9b97705a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)
2017-06-20 14:24:59 +02:00
Thilo Graf
0f3b5e5eaf CComponentsScrollBar: overwrite default corner type
Rounded corners are in mostly cases not required, because of
possible pixel errors if scrollbars are used as embedded standalone part and is
generated with external method paintScrollBar().


Origin commit data
------------------
Commit: cdf0123bea
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-30 (Tue, 30 May 2017)
2017-06-20 12:17:47 +02:00
vanhofen
99130d47ab Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)
2017-06-19 23:08:41 +02:00
vanhofen
e259a9dd07 cc_frm_footer: auto-calc label_width by default
Origin commit data
------------------
Commit: b4fffee31b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)

Origin message was:
------------------
- cc_frm_footer: auto-calc label_width by default
2017-06-19 21:36:10 +02:00
vanhofen
61d41d0862 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/widget/listbox.cpp


Origin commit data
------------------
Commit: e32d5a869f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 15:10:34 +02:00
Jacek Jendrzej
6eebe6055b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: a70f3cb025
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 14:19:26 +02:00
gixxpunk
0f302effc9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 43bdc2be1c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 13:13:03 +02:00
vanhofen
9bfb065390 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 51187f9993
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 12:01:00 +02:00
Thilo Graf
ea78976fc5 CCDraw: precise function for kill handler
This should fix possible artefacts or holes in some rendered boxes.
Was especially striking at HD1 Hardware.
e.g. was observed while right/left switching on channel list at header
and without rounded corners and at certain footers.


Origin commit data
------------------
Commit: ef4467b6da
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 11:49:32 +02:00
Thilo Graf
7068900ab9 CComponentsHeader: fix corner type comparison
Origin commit data
------------------
Commit: f46a174155
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)
2017-06-16 10:10:48 +02:00
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 12:32:31 +02:00
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 11:07:32 +02:00
vanhofen
922aa2b4e7 cc_button_select.h: re-implement our color changes; ...
don't highlight frame of selected buttons


Origin commit data
------------------
Commit: bbdac94b32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- cc_button_select.h: re-implement our color changes; ...

don't highlight frame of selected buttons
2017-06-15 11:01:45 +02:00
vanhofen
a4aa97f4c5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 10:37:41 +02:00
Thilo Graf
ae115b13f0 CCDraw: rework getScreen(), getScreenData(), add pixbuf checks
Origin commit data
------------------
Commit: 5fda283a61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:55 +02:00
vanhofen
c046b54c11 cc_frm_scrollbar: add getScrollBarData() function ...
to calculate total pages and current page for CComponentsScrollBar

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 3e9e73cb3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- cc_frm_scrollbar: add getScrollBarData() function ...

to calculate total pages and current page for CComponentsScrollBar

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-15 01:01:55 +02:00
Thilo Graf
10fb9c3733 CComponentsText: make initCCText()
Is more useful


Origin commit data
------------------
Commit: cdafe580be
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
02b6bd4930 CProgressBarCache: ensure clean iterator inside pbcClear()
For safety only.


Origin commit data
------------------
Commit: 5573d17cce
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
c40254e94c CComponentsFrmClock: ensure clean timer instance
For safety only.


Origin commit data
------------------
Commit: 08e610859f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
1bd7726d24 CProgressBar/CComponentsInfoBox: add missing value inits
Origin commit data
------------------
Commit: 0a7f7ab5a6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
e8ba380719 CComponentsForm: remove extra item declaration
Remove instances from vector only for sure.


Origin commit data
------------------
Commit: 0066430b77
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
0a9a775fbc CComponentsHeader: remove virtual declararion from getClockObject()
Not required.


Origin commit data
------------------
Commit: 86af640fae
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
CComponentsHeader: remove virtual declararion from getClockObject()

Not required.
2017-06-15 01:01:54 +02:00
Thilo Graf
2bc7cf4631 CCButtonSelect: select button objects only
Other types are not required.


Origin commit data
------------------
Commit: c4976bb132
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
802381c6a0 CCButtonSelect: rename chain to btn_container
more plausible name


Origin commit data
------------------
Commit: 4146a461c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
222317bbad CCButtonSelect: outsource button select handling into own class
Origin commit data
------------------
Commit: 4d753d7437
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
Thilo Graf
fc6346b5e0 CComponentsInfoBox: fix image y pos
Image was not centered, because of frame was not considered.


Origin commit data
------------------
Commit: 9e2c5cb939
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
2017-06-15 01:01:54 +02:00
vanhofen
c376a89fc0 cc_frm_scrollbar: add getScrollBarData() function ...
to calculate total pages and current page for CComponentsScrollBar


Origin commit data
------------------
Commit: adb71c756c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-14 (Wed, 14 Jun 2017)

Origin message was:
------------------
- cc_frm_scrollbar: add getScrollBarData() function ...

to calculate total pages and current page for CComponentsScrollBar
2017-06-14 14:57:09 +02:00
vanhofen
c35224ff08 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
2017-06-10 11:43:50 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
2017-06-07 16:20:47 +02:00
vanhofen
a0ec4edf2e remove graphic progressbar
Origin commit data
------------------
Commit: 675c0dc6f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- remove graphic progressbar
2017-06-06 00:09:31 +02:00
Jacek Jendrzej
3ef61938c1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: b3e71120b4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-30 (Tue, 30 May 2017)
2017-05-30 14:02:38 +02:00
vanhofen
b4fecd0bdb Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
2017-05-30 01:27:37 +02:00
vanhofen
369c574385 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_timer.cpp


Origin commit data
------------------
Commit: 641fb364fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)
2017-05-30 01:26:34 +02:00
vanhofen
e9afd24960 cc_frm_scrollbar: avoid transparent pixels in scrollbar's corners
Origin commit data
------------------
Commit: 23443107f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- cc_frm_scrollbar: avoid transparent pixels in scrollbar's corners
2017-05-30 01:24:21 +02:00
Thilo Graf
2b6f25e792 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 701273034a
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-29 (Mon, 29 May 2017)
2017-05-29 22:29:30 +02:00