mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 10:51:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,662 Commits 2 Branches 9 Tags
583f45fad7a2485f237d856a386b5336df89f6d2
Commit Graph

497 Commits

Author SHA1 Message Date
vanhofen
583f45fad7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: 9e8dd73320
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:19:49 +02:00
Stefan Seyfried
c9d4fdd9cc remove "using namespace std" from header files 
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)
 2017-10-02 13:43:57 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 10:34:23 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 08:27:42 +02:00
vanhofen
ff62bdcdb7 fix some timout-off-bugs in bouquetlist and channellist 
Origin commit data
------------------
Commit: 95157b1f8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
 2017-09-27 09:57:19 +02:00
vanhofen
22cdf620c7 fix some timout-off-bugs in bouquetlist and channellist 
Origin commit data
------------------
Commit: 5405ea7aee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
 2017-09-27 09:13:07 +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
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
f6bdf58168 channellist: use CComponentsScrollbar 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- channellist: use CComponentsScrollbar

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-06-15 21:51:28 +02:00
vanhofen
f77c2124b2 channellist: use CComponentsScrollbar 
Origin commit data
------------------
Commit: 21c2076a0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- channellist: use CComponentsScrollbar
 2017-06-15 13:36:12 +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
1a30bec50f CChannelList: add instance check for header clock object 
Only for sure.


Origin commit data
------------------
Commit: 340a6992a1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 01:01:54 +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
gixxpunk
361a1cfcac Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a3b4e7edc3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-29 (Mon, 29 May 2017)
 2017-05-29 14:10:33 +02:00
Thilo Graf
cea25f1809 CChannelList: simplify calls of logo paints, avoid possible dub paints 
Origin commit data
------------------
Commit: 4f5d216120
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-28 (Sun, 28 May 2017)
 2017-05-28 20:42:33 +02:00
gixxpunk
cd39eb364b Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: ad61c7e183
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-12 (Fri, 12 May 2017)
 2017-05-12 08:42:16 +02:00
Thilo Graf
653c5af07c cc_frm_header.cpp/h: remove CTextBox types for title allignment 
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.


Origin commit data
------------------
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
 2017-05-11 12:15:16 +02:00
vanhofen
9e75ed21f8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 16:23:25 +02:00
Thilo Graf
7b32c620cf CChannelList: fix code indentation 
Origin commit data
------------------
Commit: 9fd3b27d61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 08:26:21 +02:00
gixxpunk
ab0440ccaa Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4589862ad3
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)
 2017-05-07 19:05:56 +02:00
Thilo Graf
56ae8eb9b5 CChannelList: change scope of bool unlocked 
Scope of the variable 'unlocked' can be reduced.


Origin commit data
------------------
Commit: c8f6888d8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
 2017-05-07 18:33:25 +02:00
Thilo Graf
5bb1f36a42 CChannelList: use enums for additional modes 
Readability


Origin commit data
------------------
Commit: 761bac8ca1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
 2017-05-07 18:33:25 +02:00
Thilo Graf
d7b5cb3caf CChannelList: delete and reset minitv object inside unified scope 
Origin commit data
------------------
Commit: cf7a21032c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
 2017-05-07 14:18:47 +02:00
Thilo Graf
4fb21cadc2 CChannelList: add connection to ResetModuls() 
Ensures re init after font changes.


Origin commit data
------------------
Commit: 1359248f72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
 2017-05-07 14:18:47 +02:00
Thilo Graf
dceb593867 CChannelList: remove init of cc_minitv from constructor. 
Is not a member of CChannelList and already inititialized
as static outside of constructor.


Origin commit data
------------------
Commit: d7f839dcc9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
 2017-05-06 23:18:43 +02:00
Thilo Graf
4853fffbf5 CChannelList: add missing compare for existant header object. 
Origin commit data
------------------
Commit: 86c18141dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
 2017-05-06 22:46:20 +02:00
vanhofen
fc65a7b6cf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 22:57:24 +02:00
Thilo Graf
2eefbfab7a CChannelList: rework details line handling, fix hide() after setup 
Detailsline is handling hide() by itself.

After channellist setup, eg. switching additional infos and channellist
window has different size, artefacts were possible.


Origin commit data
------------------
Commit: 81001410f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
 2017-05-03 21:29:41 +02:00
vanhofen
9d28e19233 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 7096269f55
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-30 (Sun, 30 Apr 2017)
 2017-04-30 00:21:40 +02:00
Thilo Graf
c898ce7b87 CChannelList: Ensure new initialize of modules on palette changes while runtime. 
Origin commit data
------------------
Commit: 1e4967e114
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
 2017-04-29 22:46:50 +02:00
gixxpunk
78dcea03cc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 80faa90fa1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-29 (Sat, 29 Apr 2017)
 2017-04-29 16:06:51 +02:00
Jacek Jendrzej
a7595ce3c7 src/gui/channellist.cpp remove unused logo_off 
Origin commit data
------------------
Commit: 6cb58546d8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 14:26:27 +02:00
vanhofen
55016eb70e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 022b98cb73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 13:54:59 +02:00
Thilo Graf
1a35e5c955 CChannelList: don't assign logo if disabled 
Origin commit data
------------------
Commit: 85f4992ca8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
 2017-04-27 11:26:36 +02:00
vanhofen
ce5078e378 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a34a8992d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)
 2017-04-24 12:56:51 +02:00
vanhofen
ce494cbd38 scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ... 
... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.


Origin commit data
------------------
Commit: fe5f84c1d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.
 2017-04-24 12:29:52 +02:00
vanhofen
7d84d9d1d6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: d7044490de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
 2017-04-23 20:29:55 +02:00
Thilo Graf
a9acc7f975 CChannelList: remove unused logo object 
Not required since
100032e7d4: add possibility to show channellogo


Origin commit data
------------------
Commit: fbe8889fa9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
 2017-04-23 17:15:17 +02:00
Thilo Graf
92d733f523 CChannelList/CUpnpBrowserGui: add missing reinit for corner modes 
Required eg. if corner settings has been changed by user on runtime.


Origin commit data
------------------
Commit: 0943c467e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
 2017-04-23 17:01:05 +02:00
vanhofen
aeaab563e2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7c35a3373
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
 2017-04-22 10:35:44 +02:00
Thilo Graf
3aa91ac91f CComponentsHeader/CChannelList: unify methode names 
Origin commit data
------------------
Commit: 9ef6c49a23
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
 2017-04-21 23:07:14 +02:00
Thilo Graf
100032e7d4 CComponentsHeader: add possibility to show channellogo 
Contains methode setChannelLogo() with parameters
for channel id, channel name and optional
alignment (primary between title and clock). Default
alignment is centered.
Optional parameter to set logo height is available too.

Hope it works on first try. To see how it works, take look
at channellist class.


Origin commit data
------------------
Commit: 68835056c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
 2017-04-21 22:47:23 +02:00
vanhofen
6bfa07de7d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)
 2017-04-13 10:02:31 +02:00
vanhofen
23a69c90bc channelist: rename bool pig_on_win to minitv_is_active 
Origin commit data
------------------
Commit: 42aca4a4c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: rename bool pig_on_win to minitv_is_active
 2017-04-12 10:04:04 +02:00
vanhofen
763cf5335b channellist: one more missing OFFSET define 
Origin commit data
------------------
Commit: 31979a4f87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channellist: one more missing OFFSET define
 2017-04-12 10:04:03 +02:00
vanhofen
1100259455 channelist: use OFFSET defines for bottom detailsbox 
Origin commit data
------------------
Commit: f4a0e8faf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: use OFFSET defines for bottom detailsbox
 2017-04-12 09:31:21 +02:00
vanhofen
42b382b820 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: fca2de73e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)
 2017-04-11 23:14:03 +02:00
vanhofen
5b73bc8358 channellist: a bit more offset for item; fix progressbar's width 
use OFFSET defines for logo in header and in right infozone


Origin commit data
------------------
Commit: 7e6746e2aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: a bit more offset for item; fix progressbar's width

use OFFSET defines for logo in header and in right infozone
 2017-04-11 23:12:41 +02:00
vanhofen
72837ad504 channellist: simplify MaxChanNr() function 
Origin commit data
------------------
Commit: 763f16ccca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: simplify MaxChanNr() function
 2017-04-11 23:12:41 +02:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 12:45:30 +01:00