Michael Liebmann
e137542efe
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-09-21 (Thu, 21 Sep 2017)
2017-09-21 09:07:15 +02:00
vanhofen
402c567fe7
add and use FRAME_WIDTH defines; ...
...
replace other fixed frame widths with OFFSET defines
Signed-off-by: Thilo Graf <dbt@novatux.de >
Origin commit data
------------------
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-20 (Wed, 20 Sep 2017)
Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-09-20 21:29:53 +02:00
Thilo Graf
f57d1e80b7
CComponentsFrmClock: Using less chars for time string.
...
Current count of chars could be not enough in some cases.
Origin commit data
------------------
Commit: ecdc1acb9f
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-09-20 (Wed, 20 Sep 2017)
2017-09-20 21:29:53 +02:00
vanhofen
619342d89d
add and use FRAME_WIDTH defines; ...
...
replace other fixed frame widths with OFFSET defines
Origin commit data
------------------
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-20 (Wed, 20 Sep 2017)
Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines
2017-09-20 13:46:31 +02:00
vanhofen
8d642a4d57
fix compiler warnings in several console outputs
...
Origin commit data
------------------
Commit: 4b2e03d348
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-20 (Wed, 20 Sep 2017)
Origin message was:
------------------
- fix compiler warnings in several console outputs
2017-09-20 11:53:02 +02:00
vanhofen
b7af37cf1d
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 08231c17bf
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 21:31:46 +02:00
gixxpunk
2723dbdcba
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 1875ced1c5
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 18:37:22 +02:00
Jacek Jendrzej
79d9f7965e
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 756f464a3f
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 12:40:58 +02:00
Jacek Jendrzej
462626f9eb
fix start clock supplement to 0f9284bf91
...
Origin commit data
------------------
Commit: b1f820aa44
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-19 (Tue, 19 Sep 2017)
2017-09-19 12:40:02 +02:00
Jacek Jendrzej
678fa9560f
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 20:44:49 +02:00
vanhofen
98851fc4e7
rename SLIDER defines
...
Origin commit data
------------------
Commit: d873aef1e8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
Origin message was:
------------------
- rename SLIDER defines
2017-09-15 20:17:48 +02:00
vanhofen
fe16fc9f1d
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: b72cda244d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 22:02:00 +02:00
vanhofen
0a5d4a6bdb
rename SLIDER defines
...
Origin commit data
------------------
Commit: 978d72ac00
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
Origin message was:
------------------
- rename SLIDER defines
2017-09-14 22:00:41 +02:00
vanhofen
d0dc31ae8d
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/gui/update_settings.cpp
Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 16:30:58 +02:00
vanhofen
fb0a25d759
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/locale/deutsch.locale
data/locale/english.locale
src/gui/info_menue.cpp
src/gui/widget/menue.cpp
src/nhttpd/yconfig.h
src/system/helpers.h
Origin commit data
------------------
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 16:23:15 +02:00
Jacek Jendrzej
805ed42dc4
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 13:54:04 +02:00
Jacek Jendrzej
f598fd51d3
try to fix tm thread
...
Origin commit data
------------------
Commit: 513850f915
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 12:09:40 +02:00
vanhofen
73c370ab33
Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
...
Conflicts:
src/gui/components/cc_frm_footer.cpp
src/neutrino.cpp
Origin commit data
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-08-30 (Wed, 30 Aug 2017)
2017-08-30 18:11:59 +02:00
Jacek Jendrzej
a23840bc0c
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-08-29 (Tue, 29 Aug 2017)
2017-08-29 11:26:54 +02:00
vanhofen
64edcce085
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: a32d348e32
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:40:40 +02:00
Thilo Graf
ab4bcc584a
comments: fix copy paste errors
...
Origin commit data
------------------
Commit: 6e310a8157
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
b490817d1b
cc_item_shapes.cpp/h: Add method to create draw boxes without explicit objects
...
Origin commit data
------------------
Commit: c743cb632b
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
7991e183c5
CComponentsHeader: add missing check for null pointer
...
Origin commit data
------------------
Commit: 5221769840
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
6b4e74972b
CProgressBarCache: remove benchmark lines
...
Was only for debugging.
Origin commit data
------------------
Commit: d42389b167
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
4f19bd2aba
CComponentsPicture: remove benchmark lines
...
Was only for debugging.
Origin commit data
------------------
Commit: f07a27825d
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
4b4e48ecf3
CComponentsFooter: fix possible error with non-POD element type
...
affected is struct type 'button_label_cc'
Origin commit data
------------------
Commit: 16dac64ed2
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
2e4b222438
CComponentsFooter: fix possible conversion warning
...
For platform compatibility. eg. with neutrino-pc on it is possible
that size_t is long unsigned ini, for others unsinged int
Origin commit data
------------------
Commit: 27995b19fa
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
fbb0fc68b0
cc_frm.cpp, cc_frm_button.cpp: remove unread stored variables
...
Origin commit data
------------------
Commit: fe6a24351b
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
Thilo Graf
4e5f95d391
CComponentsFrmClock: fix wrong initialization of w_tmp
...
Origin commit data
------------------
Commit: 758081a0ac
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-28 (Mon, 28 Aug 2017)
2017-08-28 12:16:45 +02:00
vanhofen
7c75ab360f
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-08-25 (Fri, 25 Aug 2017)
2017-08-25 14:15:22 +02:00
Jacek Jendrzej
ee0fb81ab4
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 61f1c51d50
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-08-12 (Sat, 12 Aug 2017)
2017-08-12 10:02:55 +02:00
gixxpunk
27efd27641
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 82be5768a8
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-08-11 (Fri, 11 Aug 2017)
2017-08-11 23:02:24 +02:00
Thilo Graf
630c1bb880
CComponentsScrollBar: try to fix handling with very much segment count
...
In some cases, eg. with very much pages in channellist, the effort
to handle with all count of scrollbar segments was too much. Result: long
waiting times during page scrolling and slider was not visible. This
should be fixed now.
Origin commit data
------------------
Commit: 71f5779a40
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-11 (Fri, 11 Aug 2017)
2017-08-11 22:35:07 +02:00
gixxpunk
62158030bd
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: f50b3e1b42
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 21:37:57 +02:00
Thilo Graf
f23adc7007
CComponentsScrollBar: use matching type names
...
Origin commit data
------------------
Commit: b863f874b0
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 21:36:26 +02:00
gixxpunk
2ae983f886
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: e6861daf34
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 21:34:39 +02:00
Thilo Graf
f0bf4342a2
CComponentsScrollBar: fix possible build error with -Werror=sign-compare
...
Origin commit data
------------------
Commit: 431cfadcc2
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 20:29:22 +02:00
Thilo Graf
9481b6cdc5
CComponentsScrollBar: fix possible too small type size
...
Possible segment count could be more than 265.
Was a remnant from scrollbar test phase.
Origin commit data
------------------
Commit: 379d1ffa76
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 19:13:36 +02:00
vanhofen
b327436c94
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-08-09 (Wed, 09 Aug 2017)
2017-08-09 10:37:47 +02:00
Jacek Jendrzej
b01bf9414d
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-08-08 (Tue, 08 Aug 2017)
2017-08-08 20:06:40 +02:00
vanhofen
a0f5a94440
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/fb_generic.cpp
src/gui/components/cc_frm_header.h
src/gui/osd_setup.cpp
src/gui/themes.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/settings.h
Origin commit data
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-08-08 (Tue, 08 Aug 2017)
2017-08-08 15:54:12 +02:00
Thilo Graf
8f59422060
CComponentsForm: add functions to get used or free space of form dimensions
...
Origin commit data
------------------
Commit: 67a71d5e4e
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-04 (Fri, 04 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
fed7d85cff
CComponentsForm: add methods to get previous and next item
...
Origin commit data
------------------
Commit: a4af92d219
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-04 (Fri, 04 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
c92ffd7841
CComponentsItem: fix possible issues with position inside forms
...
This ensures relative position for items inside form
Origin commit data
------------------
Commit: a19a1f067e
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-03 (Thu, 03 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
4c394be564
CCDraw: add missing member for real item position
...
Changes of real positions were not watched.
Origin commit data
------------------
Commit: 9687dda867
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-03 (Thu, 03 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
e5c6da15a7
CComponentsItem: move real position methods from draw class into item class
...
These methods ar only relavant for items
Origin commit data
------------------
Commit: dcdff2c03b
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-03 (Thu, 03 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
d646080ee3
CComponentsHeader: disable permanent clock paint on interval.
...
Origin commit data
------------------
Commit: 8e17eadb6a
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
c68fe9024e
CComponentsHeader: rework and simplified logo handling
...
This should fix some issues with possible overlapps
of logos with title. With some Conditions with text
alignment on the right side needs a fix.
There is an issue with size and position of text object, but is stll not
used at the moment. For all other conditions of logo and text alignments now
it should be not a problem (I hope) and have more code clarity.
Origin commit data
------------------
Commit: 356719cf3a
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
Thilo Graf
bf44d9e7f9
offsets: add SIDEBAR_WIDTH
...
required in window class
Origin commit data
------------------
Commit: c18e337d1f
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-08-02 (Wed, 02 Aug 2017)
2017-08-08 14:25:12 +02:00
vanhofen
99901ced0b
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 6f8b855b07
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-06-30 (Fri, 30 Jun 2017)
2017-06-30 14:41:42 +02:00