mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,205 Commits 1 Branch 51 Tags
b41447432357b459692fe6a9ec034068e3795960
Commit Graph

137 Commits

Author SHA1 Message Date
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
 2014-01-23 14:08:37 +01:00
svenhoefer
6995e1a765 - adapt ShowHint handling from martii's neutrino-mp 2014-01-22 12:11:52 +01:00
M. Liebmann
31842369cc Preparing the input classes for Lua 
- Add non locale variants for CExtendedInput, CStringInput,
  CStringInputSMS, CPINInput
  THX Martii
 2014-01-19 20:57:38 +01:00
M. Liebmann
0a5a7b3146 CScanSettings: convert char[...] configuration values to std::string 2014-01-19 20:57:38 +01:00
M. Liebmann
b41819190d Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
eca8f5459b Merge remote-tracking branch 'check/next-cc' 
Conflicts:
	src/neutrino.cpp
 2014-01-19 13:37:24 +01:00
Jacek Jendrzej
7b40b61c9a remove CURRENTSERVICES_XML after reload channels 2014-01-18 21:02:23 +01:00
Stefan Seyfried
a92141d147 Merge remote-tracking branch 'check/next-cc' 2014-01-12 14:41:44 +01:00
[CST] Focus
468a8df8f4 gui/scan_setup.cpp: fix separator between sat and cable scan option 2014-01-08 16:11:18 +04:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...
 2013-12-25 22:51:23 +01:00
[CST] Focus
a0afda1c11 gui/scan_setup.cpp: fix tune timeout: value is in 1/10 sec (100ms) 2013-12-23 19:53:32 +04:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing
 2013-12-22 21:25:05 +01:00
martii
b69bdc38d9 gui/scan_setup: use locale when displaying seconds 2013-12-22 16:36:13 +01:00
martii
18c97c17d3 gui/scan_setup: use language specific decimal separator 2013-12-22 16:36:13 +01:00
martii
a0f2960501 gui/scan_setup: show unit for motor speed 2013-12-22 16:36:13 +01:00
martii
60e6647244 gui/scan_setup: add unit to fe timeout chooser 
(and add unit-locals from martiis-neutrino-mp)
 2013-12-21 22:04:32 +01:00
Stefan Seyfried
5976f03ca2 Merge remote-tracking branch 'check/next-cc' 2013-12-07 18:28:56 +01:00
M. Liebmann
101fe3a4b8 CScanSetup: Remove duplicate separator line from cable scanmenu 2013-12-01 16:39:35 +01:00
Stefan Seyfried
9ca8b57ed9 fix manual terrestrial scan (untested) 2013-12-01 01:11:51 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
[CST] Focus
4e48e81914 gui/scan_setup.cpp: fix memleaks 2013-11-29 17:27:10 +04:00
Stefan Seyfried
548448456a Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-13 14:04:15 +01:00
[CST] Focus
3022dc251d gui/scan_setup.cpp: remove tuner name from tuner setup menu header for easymenu mode 2013-11-12 17:21:36 +04:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
[CST] Focus
339b047019 gui/scan_setup.cpp: force fe link on master change, too 2013-11-08 15:54:20 +04:00
[CST] Focus
7c4b9d3fdd gui/scan_setup.cpp: disable frontend setup, if record running 2013-11-08 15:50:23 +04:00
[CST] Focus
70725b323b gui/scan_setup.cpp: do not add satellites to select from disabled frontend; 
add intro items for scan menu not dependent on wizard mode:
after wizard mode disabled, code add one more item (subhead), and saved
selected invalidated, as result ie no selected item at all
 2013-11-05 15:34:24 +04:00
[CST] Focus
8ef3efc72d gui/scan_setup.cpp: set wizard mode for frontend setup menu 2013-11-05 11:44:44 +04:00
[CST] Focus
de8262f03f gui/scan_setup.cpp: fix 96b7d939ca, 
do not show tuner name in tuner select menu for easymenu mode
 2013-11-01 09:08:58 +04:00
[CST] Focus
96b7d939ca gui/scan_setup.cpp: add tuner type to tuner select menu 2013-10-30 18:44:48 +04:00
[CST] Focus
7bf76aad3d gui/scan_setup.cpp: fix broken zapit config for frontend setup 2013-10-25 16:17:55 +04:00
[CST] Focus
c437b8cf6a gui/scan_setup.cpp: fix crashes due to move tuner setup; 
auto-save settings;
re-order menu options;
should fix satSelect memleak
 2013-10-25 15:51:34 +04:00
[CST] Focus
067891fe52 move tuner setup to Service menu 2013-10-25 14:27:38 +04:00
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
 2013-10-21 22:58:55 +02:00
[CST] Focus
17bc0f968d gui/scan_setup.cpp: cleanup, fix FEC options on mixed sat+cable box 2013-09-16 14:36:22 +04:00
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
 2013-09-01 19:46:10 +02:00
Jacek Jendrzej
5e60b64469 gui/scan_setup:fix override gotoXXLongitude & gotoXXLatitude with uninitialized zapit_lat or zapit_long 2013-09-01 14:35:35 +02:00
[CST] Focus
5b57fc6150 gui/scan_setup.cpp: disable frontend motor options, if more not master or independent 2013-07-23 16:10:28 +04:00
[CST] Focus
baf2df01dd gui/scan_setup.cpp: show sat diseqc and rotor position in sat config menu 2013-07-18 14:51:59 +04:00
[CST] Focus
ae1abb6fa6 gui/scan_setup.cpp: fix use usals for all option, use per-frontend use_usals 2013-07-18 14:51:59 +04:00
[CST] Focus
4d7fb7e362 gui/scan_setup.cpp: fix manual frequency input lenght 2013-07-18 14:51:59 +04:00
Stefan Seyfried
7cfe54dc2f Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
 2013-07-06 19:01:15 +02:00
[CST] Focus
d5e57f8877 start wizard: add easy mode as requested by customers, 
which only ask for gui language and show fast scan (sat) and/or simple cable scan menu
 2013-06-28 15:55:19 +04:00
[CST] Focus
584405883d src/gui/scan_setup.cpp: prevent crash in wizard - channel list not created yet 2013-06-28 15:55:19 +04:00
[CST] Focus
5c60ba98e6 Revert "gui/scan_setup.cpp: disable intro items in select satellite -" 
seems to be fixed.

This reverts commit 41aaf96278.
 2013-06-27 15:03:48 +04:00
Stefan Seyfried
5b44feae1b Revert "gui/scan_setup.cpp: disable intro items in select satellite -" 
This reverts commit 41aaf96278.
 2013-06-16 21:22:47 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
[CST] Focus
9412f3a041 gui/scan_setup.cpp: add flag to ignore manual scan params update, while scan menu active 2013-06-10 15:57:20 +04:00
[CST] Focus
41aaf96278 gui/scan_setup.cpp: disable intro items in select satellite - 
multi-page menu with intro items has old bug with last item refresh/clear
 2013-06-02 10:49:13 +04:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
 2013-06-02 10:46:42 +04:00