mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,295 Commits 1 Branch 51 Tags
c46bc57c182cbec6b00d4792ac4a3cd27a5cd51c
Commit Graph

13295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
svenhoefer
c32faa8302 - infoviewer: rework tuner icons 
Conflicts:
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png

Signed-off-by: Thilo Graf <dbt@novatux.de>

I think it's not an excellent idea to have many icons for all possible
tuner numbers. We should use one and only icon without any number
and paint a text over the icon. This should be possible with a simple
cc text object that contains a defined png-file file as background
and a digit as text.
 2021-01-03 20:45:57 +01:00
Thilo Graf
0a423563f8 imageinfo.cpp: show machine type and git describe of system 2020-12-25 18:53:52 +01:00
svenhoefer
78928e2633 - satellites.xml: move matze settings to top of file 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-25 18:45:20 +01:00
svenhoefer
3c4972374f - initial settings: update matze settings 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-25 18:44:57 +01:00
svenhoefer
5132a99b11 - enable graphlcd for vu+ only; TODO: needs more fixes 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-25 18:44:30 +01:00
svenhoefer
32c13c0398 - configure: make graphlcd configurable 
Conflicts:
	configure.ac

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-25 18:44:18 +01:00
svenhoefer
c53e15a939 - locales: unified entries for epg plus 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale

Signed-off-by: Thilo Graf <dbt@novatux.de>

supplement to: 8042e3504e
 2020-12-14 20:18:24 +01:00
Knicko007
5b073a2e98 add rc_mutant_hd60.png, and add Mutant-HD60 to Y_Blocks.txt Fix HD61 2020-12-14 20:08:25 +01:00
Thilo Graf
b319a0b6ca bouquetlist.cpp: consider offsets for window width 
supplement to: 	4ea2f46c7c - bouquetlist: rework
 2020-12-13 19:38:41 +01:00
Thilo Graf
8042e3504e locales: unified entries for epg timelines 2020-12-13 17:07:46 +01:00
svenhoefer
6f3ca27ec2 - luaserver: fix paths in small guide 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 16:18:19 +01:00
svenhoefer
bb81d0b7ed - helpers: remove hardcoded path 
Conflicts:
	src/system/helpers.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 16:18:04 +01:00
svenhoefer
75b785ff4f - neutrino: remove hardcoded path 
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 16:01:07 +01:00
svenhoefer
bc8ce81387 - network-service: remove hardcoded paths 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 15:56:30 +01:00
svenhoefer
13b8470789 - motorcontrol: remove hardcoded paths 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 15:56:13 +01:00
svenhoefer
41bbb33f23 - glcd: remove hardcoded paths 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 15:55:12 +01:00
svenhoefer
691c1be6f4 - hdd-menu: remove hardcoded paths 
Conflicts:
	src/gui/hdd_menu.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-12 15:54:22 +01:00
Knicko007
9f6c90d728 fix c&p error 2020-12-10 21:48:19 +01:00
Knicko007
ac7cba615a add mutant_hd60.png 2020-12-10 21:48:05 +01:00
Knicko007
2ba6cfec2b add rc_mutant_hd60.png, and add Mutant-HD60 to Y_Blocks.txt Fix HD61 2020-12-10 21:47:57 +01:00
Thilo Graf
1314b0566c configure: fix broken build 2020-12-08 12:17:37 +01:00
Knicko007
d150640004 fix Y_Blocks.txt 2020-12-07 20:34:25 +01:00
Knicko007
afc6239e34 fix Y_Blocks.txt, change to better rc_ax_hd61.png, thx annie 2020-12-07 20:34:25 +01:00
svenhoefer
d42fce00c0 - yWeb: install all possible rc pictures 
Conflicts:
	data/y-web/images/Makefile.am

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
037fbb2063 - yWeb: disable non-cst remote controls for cst hardware 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
c4d77d9e52 - set RC_tv as g_settings.key_tvradio_mode for hd61 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
1aa288fb38 - rcinput: add KEY_TV2; mapped to RC_tv 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
ece4036a4c - yWeb: fix hd61 remote control 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
d41e697512 - yWeb: add own remote control for hd61 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
d04169be69 - use find_executable() to find scripts 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
cf67ca4cb6 - try to fix path to /.version file 
Conflicts:
	src/gui/imageinfo.cpp
	src/gui/network_setup.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
ea64294d6a - addition to 668b65aa89d2fbe50cf8bb35545183661393981e 
Signed-off-by: Thilo Graf <dbt@novatux.de>

commit was: - arm-hardware: set default osd resolution to 1080
9f5a661336569dec4b564cfb82926af00c5d640e
 2020-12-07 20:34:25 +01:00
svenhoefer
29f98ffcaf - cst-hardware/hd2: set default video mode and osd resolution to 1080 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
1e5e12dfb2 - yWeb: allow remote controls for hd6x 
Conflicts:
	data/y-web/Y_Settings_yWeb.yhtm

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
2492ad9771 - arm-hardware: set default osd resolution to 1080 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
7f8e1c1b42 - arm-hardware: set default video mode to 1080p50 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
809294eda4 - videosettings: fix video modes for vu+ boxes 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
6a1f078f73 - lcd4l: remove some hardcoded paths 
Conflicts:
	src/driver/lcd4l.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
d8f2186139 - glcd: remove obsolete include 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
a25ae98227 - data/oled/themes: remove some hardcoded paths 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
37fb4e4e4f - data/scripts: remove some hardcoded paths 
Conflicts:
	data/config/settingsupdate.conf.in
	data/scripts/backup.sh
	data/scripts/backup_flash.sh.in
	data/scripts/restore_flash.sh.in

Signed-off-by: Thilo Graf <dbt@novatux.de>

Files adapted because conflicts and possible build errors.
 2020-12-07 20:34:25 +01:00
svenhoefer
f57fac5a5a - acinclude: introduce DATADIR_VAR 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
28d5e66f90 - fix 56fb558f1cb04056d451cfe55c1631381889f6a4 
Signed-off-by: Thilo Graf <dbt@novatux.de>

commit was: - setting_helpers: remove some hardcoded paths

d5950fbe60226f8eb999c561f6ddc543f709e807
 2020-12-07 20:34:25 +01:00
svenhoefer
7e66bb8364 - data/control: remove some hardcoded paths 
Conflicts:
	data/control/migration.sh.in

Signed-off-by: Thilo Graf <dbt@novatux.de>

Adopted only proforma.
 2020-12-07 20:34:25 +01:00
svenhoefer
80b126a2f4 - data/config: remove some hardcoded paths 
Conflicts:
	data/config/settingsupdate.conf.in

Signed-off-by: Thilo Graf <dbt@novatux.de>

Files adapted because of different configurations.
 2020-12-07 20:34:25 +01:00
svenhoefer
78f18b483f - configure: try to split AC_CONFIG_FILES by category 
Conflicts:
	configure.ac

Signed-off-by: Thilo Graf <dbt@novatux.de>

AC_CONFIG_FILES for themes not picked, because of build error.
 2020-12-07 20:34:25 +01:00
svenhoefer
388c819813 - revert frontend/scan changes 
This reverts commits

01: 7c109f36dd4297499f98c25720b7622eb5d15d41
02: be39dcf90561d819be19d4a53e285733b86f2a2a
03: 2f6346c63620a88152a5936e424f50236257df55
04: 95a6a7b45f7e6e4b5addf36c72ef572c220f6509
05: ffe8a28150607dcefd2f94e8eb94fcd07cf94998
06: 7b6a945d76fa50f59fb8d2c3d37fa707ff1028fa
07: 927f09bb2de79bb318934963fcdb65c31fe17b8b
08: b9522992e9d4b7d2b0cb2b2d32a56c01b1c5df97
09: fd8a6c469b88516fa18c3b10dc87e05a687425c5
10: b530a78ffb5593d4287a5f15adad8bf239363b93
11: 25b9c4b40e17d28202d19896e4fd04efbcdaa9d5

 Conflicts:
	src/zapit/src/frontend.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

Adopted parts because of conflicts:

01: untouched/not picked                     - frontend_types.h: fix unused-variable
02: 3c5ea6452c frontend_types.h: fix missing name of enum typedef
03: 03b5192fe3 fix transponders
04: untouched/not picked                     fix typo
05: 61579e130a adopt scansettings to new frontend handling
06: cde88688ca fix multistream (thx BP for testing)
07: b019079220 DVB-T2 fix
08: b9522992e9d4b7d2b0cb2b2d32a56c01b1c5df97 cosmetics
09: 414043913e fix frontend-parameters
10: untouched/not picked                     Revert "Revert "frontend multistream fixes""
11: untouched/not picked                     Revert "Revert "complete rebuild of frontend cmds""
 2020-12-07 20:34:25 +01:00
svenhoefer
9ebc8c5cc6 - update: fix a61759855f4f6a38c4d9e069786e4bf7a4562c38 
Signed-off-by: Thilo Graf <dbt@novatux.de>

commit was: b7f2ffb5fb
 - update: fix new partition for hd6x using g_info.hw_caps->startup_file
 2020-12-07 20:34:25 +01:00
svenhoefer
68acb05116 - setting_helpers: remove some hardcoded paths 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00
svenhoefer
9685c38221 - localize: remove some hardcoded paths 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2020-12-07 20:34:25 +01:00