Commit Graph

8256 Commits

Author SHA1 Message Date
Thilo Graf
996beed078 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/timerlist.cpp
2016-11-09 00:30:44 +01:00
svenhoefer
b59527e987 - channellist: fix epg for webtv channels 2016-11-08 21:48:51 +01:00
Jacek Jendrzej
ddd9bd3ca9 src/gui/osd_setup.cpp supplement to 682b6f57 , fix segfault if clock is NULL# 2016-11-07 22:54:53 +01:00
TangoCash
32c6eaf031 fix epgtitle 2016-11-07 20:36:34 +01:00
svenhoefer
8ac3b64e75 - timerlist: just small code cosmetics 2016-11-07 10:13:04 +01:00
Thilo Graf
3e7a1943c3 Merge branch 'master' into pu/msgbox 2016-11-06 23:16:36 +01:00
svenhoefer
3b25694983 - epgview: use movie-info's channelname in movieplayer mode to get channellogo 2016-11-06 20:54:26 +01:00
Jacek Jendrzej
c0ce2a0d3b src/gui/scan_setup.cpp use CHintBox for reloadchannels 2016-11-06 18:45:01 +01:00
svenhoefer
7cbe38e249 - locale: update slovak; thx to Pr0metheus 2016-11-05 22:15:49 +01:00
Thilo Graf
18695fb0c9 CComponentsInfoBox: ensure matching object height after assigned image
Images are not defined with constructor, so it is possible we must
consider the image height after called setPicture() methode.
This is important if an infobox sould be
added into a cc form object. This avoids overlapping of dynamic added items.
2016-11-05 21:17:31 +01:00
svenhoefer
7c74d0bc3b - timermanager: try to fix successive timers 2016-11-05 21:07:12 +01:00
Thilo Graf
28a146e0ba Merge branch 'master' into pu/msgbox 2016-11-05 00:08:05 +01:00
Thilo Graf
90a693a1ec CComponentsInfoBox: fix missing calculation of image position with parent 2016-11-04 23:56:29 +01:00
svenhoefer
bf987b7478 - cablex.xml: update Unitymedia; thx to klauser 2016-11-04 16:49:01 +01:00
Thilo Graf
b6a06af7ca Merge branch 'master' into pu/msgbox 2016-11-03 19:13:34 +01:00
Jacek Jendrzej
2907aa5a37 Revert "src/gui/widget/textbox.cpp try to fix text lines per page"
This reverts commit d6c4324f6c.
2016-11-03 18:38:41 +01:00
Jacek Jendrzej
3815694e39 Revert "src/gui/widget/textbox.cpp supplement to try to fix text lines per page"
This reverts commit e26ad6e9f1.
2016-11-03 18:38:14 +01:00
Jacek Jendrzej
e26ad6e9f1 src/gui/widget/textbox.cpp supplement to try to fix text lines per page 2016-11-03 12:51:31 +01:00
Jacek Jendrzej
d6c4324f6c src/gui/widget/textbox.cpp try to fix text lines per page 2016-11-03 12:17:11 +01:00
Thilo Graf
ab9bf2ffa6 Merge branch 'master' into pu/msgbox 2016-11-02 21:05:36 +01:00
svenhoefer
da14d72dcb - miscsettings_menu: fix youtube api key length 2016-11-01 22:20:26 +01:00
Jacek Jendrzej
5ea4cbf145 pictureviewer: fix possible segfault if width or height < 1,fix possible memleak 2016-11-01 14:50:08 +01:00
Jacek Jendrzej
6b640cfa7b src/gui/scan_setup.cpp fix preselected transponder item 2016-10-31 18:23:17 +01:00
Jacek Jendrzej
b8849d53b5 fix possible segfault and negative height 2016-10-31 15:53:29 +01:00
svenhoefer
5804ed2d3a - yWeb: fix url to Y_Version.txt 2016-10-30 01:34:41 +02:00
svenhoefer
4b25ad6951 - yWeb: change info string to Tuxbox-Neutrino 2016-10-30 01:34:41 +02:00
Thilo Graf
dbe8007882 Merge branch 'master' into pu/msgbox 2016-10-29 20:49:42 +02:00
Thilo Graf
27dc0228a5 components/widget: add doxygen config file to create documentations
If you want to create a documantation,
please move into current directory that contains the 'Doxyfile' and do execute command

''doxygen Doxyfile''

This creates usually a subdirectory named /doc/html/
This contains documentation contents in html format.
Open /doc/html/index.html in your browser and you will see contents.
2016-10-29 20:47:57 +02:00
Thilo Graf
aae4411d03 Merge branch 'master' into pu/msgbox 2016-10-29 12:38:17 +02:00
M. Liebmann
e5402057d3 Use forceSaveScreen() in COsdSetup & CTimerList 2016-10-29 10:38:06 +02:00
M. Liebmann
74b0ce7f70 CKeyboardInput: Make saveScreen changeable with forceSaveScreen() 2016-10-29 10:38:06 +02:00
M. Liebmann
0e22860ac0 CStringInput: Make saveScreen changeable with forceSaveScreen() 2016-10-29 10:38:06 +02:00
M. Liebmann
373ae57e42 Sort locale 2016-10-29 10:38:06 +02:00
TangoCash
3776340268 add possibility to add Name,Url,Port, Username and Password if needed. 2016-10-28 22:20:27 +02:00
Thilo Graf
fa9e34fcca Merge branch 'master' into pu/msgbox 2016-10-28 21:19:09 +02:00
Jacek Jendrzej
682b6f578e src/gui/osd_setup.cpp try to fix segfault, call from channellist 2016-10-28 20:50:52 +02:00
svenhoefer
002277fb5f - textbox: fix box width in round corners mode 2016-10-28 09:55:40 +02:00
Thilo Graf
9b9d2542e6 Merge branch 'master' into pu/msgbox 2016-10-28 08:05:34 +02:00
svenhoefer
874f54af4b - cc_item_picture: fix wrong operator in width calculation 2016-10-27 23:11:43 +02:00
Jacek Jendrzej
a71c71edcc src/gui/eventlist.cpp supplement to 61105699d4, fix chanel_id in search-mode 2016-10-27 18:56:13 +02:00
Jacek Jendrzej
83976f40b4 src/gui/widget/menue.cpp fix segfault if items is empty 2016-10-27 17:06:12 +02:00
Thilo Graf
ae96d48e0f Merge branch 'master' into pu/msgbox 2016-10-27 12:19:09 +02:00
Thilo Graf
3689684968 CChannelList: delete with red yes button 2016-10-27 12:17:36 +02:00
Thilo Graf
3d12e059c4 CTestMenu: add sample for message box with parameter CMsgBox::mbNoYes 2016-10-27 12:17:33 +02:00
Thilo Graf
f2b781dd6d CMsgBox: apply order of color buttons like on remote control
Ensures unified conventions over gui.
2016-10-27 12:17:29 +02:00
Thilo Graf
f1e4723964 CMsgBox: add option for No Yes button arrangement
Useful if order of red and green buttons must be changed.
Return values are untouched.
2016-10-27 12:17:24 +02:00
svenhoefer
99a9f8a7e5 - textbox: fix lineBreakWidth calculation 2016-10-27 11:02:18 +02:00
Thilo Graf
28acb0fefa Merge branch 'master' into pu/msgbox 2016-10-27 10:13:45 +02:00
Jacek Jendrzej
48c596e2ca src/gui/timerlist.cpp update timerlist after show epgview 2016-10-26 18:31:44 +02:00
M. Liebmann
4dceb70ce1 CTimerList: Set httpConnectTimeout for remote timer = 3 sec 2016-10-26 15:16:11 +02:00