mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,823 Commits 2 Branches 9 Tags
32b9af3d96202ab43596b5361151f95cfd1ba6e3
Commit Graph

192 Commits

Author SHA1 Message Date
vanhofen
32b9af3d96 infoviewer_bb: fix offset for first status-icon 
Origin commit data
------------------
Commit: 1751a00cc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix offset for first status-icon
 2017-11-29 10:47:34 +01:00
vanhofen
c792b497c3 infoviewer_bb: use OFFSET defines; ... 
height of ca-bar now depends on height of ca-icons
cleanup from commented code


Origin commit data
------------------
Commit: 866a2c3a4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines; ...

height of ca-bar now depends on height of ca-icons
cleanup from commented code
 2017-11-28 14:41:42 +01:00
vanhofen
5ee250c9e9 infoviewer_bb: take footer height from CComponentsFooter ... 
to get this footer in sync with the footers of other gui elements


Origin commit data
------------------
Commit: 2e4b0023ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements
 2017-11-28 14:41:42 +01:00
vanhofen
8729b26638 neutrino: unify modes handling; ... 
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
Commit: 028ec3cf3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes
 2017-11-20 15:19:06 +01:00
vanhofen
40732c1181 infoviewer_bb: minor change in icon handling 
Origin commit data
------------------
Commit: ca9639ba54
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-14 (Tue, 14 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: minor change in icon handling
 2017-11-14 21:27:43 +01:00
vanhofen
3b417b9fc2 infoviewer_bb: fix wrong mode-logic for radiotext icon 
Origin commit data
------------------
Commit: d084f24e52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix wrong mode-logic for radiotext icon
 2017-11-09 08:23:44 +01:00
vanhofen
ab14f705c2 infoviewer_bb: minor change in icon handling 
Origin commit data
------------------
Commit: 5f680879f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: minor change in icon handling
 2017-11-06 21:55:29 +01:00
vanhofen
ba849a5aac infoviewer_bb: fix display of icons in radio/webradio mode 
Origin commit data
------------------
Commit: 7c7dcec0af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix display of icons in radio/webradio mode
 2017-11-05 01:30:16 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
TangoCash
9b8e581398 remove defines, fix is in stbhal ! 
Origin commit data
------------------
Commit: 96a2d5945c
Author: TangoCash <eric@loxat.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)
 2017-10-28 22:37:35 +02:00
vanhofen
68c3d20998 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: ccb70fd1b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)
 2017-10-13 14:13:22 +02:00
vanhofen
e41ad78e8f add UHD icons to infoviewer 
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: db184e3abe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer

Conflicts:
	src/gui/infoviewer_bb.cpp
 2017-10-13 14:10:34 +02:00
vanhofen
8045ab1dd5 add UHD icons to infoviewer 
Origin commit data
------------------
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- add UHD icons to infoviewer
 2017-10-12 00:36:45 +02:00
TangoCash
8ab431151d fix resolution icon in infoviewer 
Origin commit data
------------------
Commit: d2faaec888
Author: TangoCash <eric@loxat.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)
 2017-10-12 00:36:45 +02:00
vanhofen
c2cc8c434f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)
 2017-10-02 23:21:37 +02:00
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
0e3522fc52 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2b7afc5b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)
 2017-09-21 10:33:00 +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
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
ebb13b6951 small adds 
Origin commit data
------------------
Commit: 547ad8a491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- small adds
 2017-09-09 15:33:46 +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
vanhofen
2e9f1b3f04 infoviewer_bb: "fix" height of ca-bar; ... 
replace OFFSET define with fixed value. This needs more fixes.


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

Origin message was:
------------------
- infoviewer_bb: "fix" height of ca-bar; ...

replace OFFSET define with fixed value. This needs more fixes.
 2017-06-06 23:18:48 +02:00
vanhofen
68e2832f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 16:55:39 +01:00
vanhofen
f5d9d25957 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:36:23 +01:00
Michael Liebmann
f74929b4ba CInfoViewer::showTitle: Add parameter forcePaintButtonBar 
Origin commit data
------------------
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)
 2017-02-28 15:04:09 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 13:19:03 +01:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
 2017-02-08 08:02:39 +01:00
Stefan Seyfried
f6d5a96838 replace fontrenderer.h include with forward declaration 
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
 2017-02-07 17:23:42 +01:00
vanhofen
8c27915df5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 2733e0f260
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
 2017-01-02 23:55:23 +01:00
vanhofen
93d37873bb infoviewer_bb: use larger offsets for channel-status icons 
Origin commit data
------------------
Commit: bdf5b733d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- infoviewer_bb: use larger offsets for channel-status icons
 2017-01-02 23:53:03 +01:00
vanhofen
4505e41fd1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3f3268f371
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)
 2017-01-02 23:52:06 +01:00
vanhofen
443825acb5 infoviewer_bb: use OFFSET defines in getBBIconInfo() 
Origin commit data
------------------
Commit: b48c657991
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines in getBBIconInfo()
 2017-01-02 23:51:12 +01:00
vanhofen
6e2cc2a00a infoviewer_bb: don't use a smaller icon-offset in ca-bar's discrete mode 
Origin commit data
------------------
Commit: e2b1b13d4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- infoviewer_bb: don't use a smaller icon-offset in ca-bar's discrete mode
 2017-01-02 22:35:44 +01:00
vanhofen
9974556c54 infoviewer_bb: use 10px offset for left ca-icons 
Origin commit data
------------------
Commit: f8a680fd3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- infoviewer_bb: use 10px offset for left ca-icons
 2017-01-02 21:59:03 +01:00
vanhofen
56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
 2016-12-15 11:49:05 +01:00
vanhofen
965cdf1b2b infoviewer_bb: use just 1px for ca-bar frame 
Origin commit data
------------------
Commit: 67765cee93
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- infoviewer_bb: use just 1px for ca-bar frame
 2016-12-12 12:23:27 +01:00
vanhofen
b6d9c17af5 infoviewer_bb: enlarge ca_bar by 2 pixels 
Origin commit data
------------------
Commit: cb9b9dc26d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- infoviewer_bb: enlarge ca_bar by 2 pixels
 2016-12-12 11:34:20 +01:00
vanhofen
2aa7616434 infoviewer_bb: disable broken infobar_casystem_dotmatrix code 
Origin commit data
------------------
Commit: b197cf2dba
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- infoviewer_bb: disable broken infobar_casystem_dotmatrix code
 2016-12-12 11:25:42 +01:00
vanhofen
b30f9a0339 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: be717654eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
 2016-12-12 11:22:50 +01:00
vanhofen
766d368363 infoviewer_bb: remove broken code around left/right handling in ca_bar 
This code wasn't used anymore since years.


Origin commit data
------------------
Commit: aa9417a550
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- infoviewer_bb: remove broken code around left/right handling in ca_bar

This code wasn't used anymore since years.
 2016-12-12 11:15:14 +01:00
vanhofen
7220c6b265 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 17:27:55 +02:00
vanhofen
248b6c8684 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
 2016-10-10 16:45:30 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes 
Origin commit data
------------------
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes
 2016-10-10 14:19:55 +02:00
vanhofen
aebbf96829 Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)
 2016-09-20 08:22:22 +02:00
vanhofen
843d10dee7 fix CFileHelpers.copyFile() mode again; this time for real 
Origin commit data
------------------
Commit: 6098eb8e17
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-07 (Wed, 07 Sep 2016)

Origin message was:
------------------
- fix CFileHelpers.copyFile() mode again; this time for real
 2016-09-07 17:45:49 +02:00
vanhofen
c36373040d Merge branch 'ni/cst-next' into ni/mp/cst-next 
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
 2016-09-06 15:24:30 +02:00
vanhofen
05c8ddd772 temporary fix CFileHelpers.copyFile() syntax 
Origin commit data
------------------
Commit: 81d9b2b027
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-05 (Mon, 05 Sep 2016)

Origin message was:
------------------
- temporary fix CFileHelpers.copyFile() syntax
 2016-09-05 13:30:56 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00