Thilo Graf
284dba8c25
CMenuOptionStringChooser: clean up multiple code parts
2017-06-18 00:04:40 +02:00
Thilo Graf
8899660dad
CMenuOptionChooser: clean up multiple code parts
2017-06-18 00:04:40 +02:00
Jacek Jendrzej
a70f3cb025
Merge branch 'master' into pu/mp
2017-06-16 14:19:26 +02:00
svenhoefer
36ebcb586a
- listbox: use CComponentsScrollbar
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-15 21:53:02 +02:00
svenhoefer
d6f3ba61d5
- textbox: use CComponentsScrollbar
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-15 21:49:58 +02:00
svenhoefer
217dd96360
- listframe: use CComponentsScrollbar
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-15 21:48:29 +02:00
Jacek Jendrzej
4c3002cb26
Merge branch 'master' into pu/mp
2017-06-15 12:32:31 +02:00
svenhoefer
5c783a5c50
- menue: replace last fixed values ...
...
... with OFFSET defines and scale2Res()-calculations
Signed-off-by: Thilo Graf <dbt@novatux.de >
- removed TODO for height of hint calculation
2017-06-15 01:01:55 +02:00
Thilo Graf
d78e132ba2
icon: add missing pictureviewer icon
2017-06-15 01:01:55 +02:00
Thilo Graf
ec83549e50
CtextBox: Precise function getLines()
...
Use refreshTextLineArray() for calculation of lines.
Note: count of lines will be only returned if CTextBox object
is initialized with a valid CBox instance,
otherwise count of 0 lines will be returned!
also remove inline declaration, not needed here
2017-06-15 01:01:54 +02:00
Jacek Jendrzej
ca83324763
Merge branch 'master' into pu/mp
2017-06-07 16:20:47 +02:00
M. Liebmann
624f2b3154
Merge branch 'pu/fb-setmode'
2017-06-07 14:18:01 +02:00
svenhoefer
535e4e2123
- icons.h: sort filetype icons
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-07 14:17:12 +02:00
svenhoefer
58d25b5da2
- icons: add filetype-icon for pictures
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-07 14:17:12 +02:00
svenhoefer
d8f364ca46
- icons: add filetype-icon for pictures
...
Signed-off-by: Thilo Graf <dbt@novatux.de >
2017-06-07 14:17:11 +02:00
Jacek Jendrzej
05e8d727bd
Merge branch 'master' into pu/mp
2017-05-28 22:30:05 +02:00
Thilo Graf
c0cc7ef192
Merge branch 'master' into pu/fb-setmode
2017-05-21 18:09:22 +02:00
Thilo Graf
37387a3e69
CMsgBox: fix paint of footer buttons
...
Only paint of button container is required.
2017-05-21 18:00:21 +02:00
Thilo Graf
8c29b8e68f
CHintBox: use less colors time scale mode for visual timeout
...
Otherwise probably in this context to much colored with default settings.
2017-05-21 18:00:21 +02:00
Thilo Graf
e48cc87b6f
CHintBox: fix position in case of missing text
...
Without text, position was not complete calculated.
Only default position was used.
2017-05-17 20:11:28 +02:00
svenhoefer
bf852064bc
- buttons: use OFFSET defines
2017-05-16 10:31:25 +02:00
Jacek Jendrzej
020f044c07
Merge branch 'master' into pu/mp
2017-05-08 12:57:22 +02:00
Thilo Graf
e35acf2e2f
Merge branch 'master' into pu/fb-setmode
2017-05-08 08:28:20 +02:00
Thilo Graf
970390a320
CNaviBar: prevent compiler warning -Wshadow
2017-05-08 08:26:17 +02:00
Jacek Jendrzej
99fa83cb48
Merge branch 'master' into pu/mp
2017-05-06 14:21:36 +02:00
Thilo Graf
237ae21bf7
Merge branch 'master' into pu/fb-setmode
2017-05-06 00:07:06 +02:00
Thilo Graf
cf7dd61fd7
CNaviBar: add new widget class: CNaviBar
...
Should help to reduce and unify code in some epg windows.
2017-05-06 00:02:26 +02:00
M. Liebmann
d3ceb0ec7b
Merge branch 'master' into pu/fb-setmode
2017-04-24 21:51:25 +02:00
Jacek Jendrzej
f292ba6b69
Merge branch 'master' into pu/mp
2017-04-24 21:33:15 +02:00
svenhoefer
fe5f84c1d0
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
...
... outside of CComponentsScrollBar(). Since the color-changes in
89bda2d
the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
svenhoefer
b1ba85c8c1
Merge branch 'master' into pu/mp
...
Conflicts:
acinclude.m4
2017-03-22 12:16:01 +01:00
M. Liebmann
8212746cf1
Merge branch 'master' into pu/fb-setmode
2017-03-20 23:11:33 +01:00
Thilo Graf
4eb6a315fc
CComponentsButton: simplify assignment of button message values
...
Count of alternate message values was limited to 1 value. Now it is
possible to add any count of message values.
directKey and directKeyAlt were removed from struct type 'button_label_cc'
and directKeys was added as container for possible message values.
Some methods of CComponentsFooter had to be adapted for that.
2017-03-20 22:55:05 +01:00
svenhoefer
b12624d1fa
Merge branch 'master' into pu/mp
...
Conflicts:
src/gui/miscsettings_menu.cpp
src/neutrino.cpp
src/system/settings.h
2017-03-20 01:31:51 +01:00
M. Liebmann
be49686432
Merge branch 'master' into pu/fb-setmode
2017-03-20 00:00:35 +01:00
Thilo Graf
2de98df48f
CProgressWindow: try to reduce effort inside progress display
...
Should help to reduce some timing side effects with many data amounts.
But there could still be more potential.
2017-03-19 22:37:32 +01:00
Thilo Graf
9801c3100c
CColorChooser: fix missing rewrite current values to *value[selected]
...
Supplement to commit:
CColorChooser: fix compile conversion warnings
3b5cd00bf4
2017-03-19 16:06:04 +01:00
TangoCash
81fb3b42fa
Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp
...
Conflicts:
src/gui/scan_setup.cpp
src/zapit/src/frontend.cpp
2017-03-15 22:47:42 +01:00
M. Liebmann
49737c5ee2
Merge branch 'master' into pu/fb-setmode
2017-03-14 17:33:57 +01:00
Thilo Graf
3b5cd00bf4
CColorChooser: fix compile conversion warnings
2017-03-14 09:42:30 +01:00
M. Liebmann
03c5d11572
src/gui/widget/buttons.cpp: Use system/stacktrace.h ...
...
... instead of driver/stacktrace
2017-03-14 00:13:35 +01:00
M. Liebmann
2677543cc4
Merge branch 'master' into pu/fb-setmode
2017-03-13 21:55:50 +01:00
svenhoefer
8bdb16cec6
Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
...
Conflicts:
src/neutrino.cpp
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
2017-03-13 16:14:33 +01:00
svenhoefer
5b0faeab8c
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
M. Liebmann
d0b02a9752
CMenuWidget::calcSize: Add forgotten 'wi'
2017-03-13 10:34:37 +01:00
M. Liebmann
2ed30486c4
CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes
2017-03-13 09:55:58 +01:00
M. Liebmann
30db40da1a
CMenuWidget::calcSize: Recalculation of min_width ...
...
... for adjustment to the osd resolution
2017-03-13 09:55:58 +01:00
M. Liebmann
828329452e
Merge branch 'master' into pu/fb-setmode
2017-03-12 06:37:10 +01:00
Thilo Graf
c766a970dc
CComponentsFooter: simplify implementation of button labels
...
button_label_l and button_label_s are now
merged to button_label_cc with prepared default values for text and locales.This type contains all possible
button label properties. Values for locales and string
are evaluated in setButtonLabels(), so it's possible to remove some
overloaded methodes.
2017-03-11 00:45:25 +01:00
Stefan Seyfried
2cef61bd8e
msgbox: deobfuscate assignment of default result value
2017-03-10 19:10:06 +01:00