Commit Graph

49 Commits

Author SHA1 Message Date
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
svenhoefer
af90286a30 - start_wizard: use a global enum; switch detection from bool to int 2015-05-15 03:46:50 +02:00
svenhoefer
910497f762 - add and use LOCALEDIR variable; move LOCALEDIR_VAR to global.h 2015-05-06 22:58:54 +02:00
Jacek Jendrzej
422c91d117 add pugixml 2015-04-28 10:12:23 +02:00
svenhoefer
9041bff59c - remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Jacek Jendrzej
40fe7fae34 prevent possible segfault std::string if value NULL 2015-03-20 11:57:12 +01:00
Christian Schuett
62aa1c0b76 reload plugins after changing language to respect localization 2015-03-16 11:55:13 +01:00
Stefan Seyfried
48fdfc5e5e Merge remote-tracking branch 'test/cst-next'
Conflicts:
	src/gui/osdlang_setup.cpp
2015-02-19 14:10:26 +01:00
Stefan Seyfried
51bbb756e8 Merge remote-tracking branch 'check/cst-next-fixed'
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/osdlang_setup.cpp
2015-02-19 13:59:13 +01:00
Jacek Jendrzej
8655264791 src/gui/osdlang_setup.cpp fix path 2015-02-15 14:52:06 +01:00
Stefan Seyfried
b6a406deb4 osdlang_setup: avoid unnecessary (char *) casts 2015-02-14 14:31:11 +01:00
Stefan Seyfried
03932f2b04 osdlang_setup: avoid unnecessary (char *) casts 2015-02-10 14:57:15 +01:00
svenhoefer
1eb652688a - osdlang_setup.cpp: change user-dir for locales, to match the ...
... given path in system/localize.cpp
2015-02-09 08:51:33 +01:00
Stefan Seyfried
b5a64e6887 Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
2b5e7b5ba3 use empty to check string 2015-01-09 17:15:11 +01:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
martii
81ca577fb8 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp
2014-09-24 19:50:35 +04:00
martii
e84782bc4c drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp
2014-09-15 11:44:08 +04:00
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2014-04-27 19:14:06 +02:00
[CST] Focus
793c3aab5a gui/osdlang_setup.cpp: revert language selection to old behaviour: close menu after select 2014-03-06 16:09:10 +04:00
martii
eb206ae523 gui/widget/menue, gui/osdlang_setup: drop CMenuOptionLanguageChooser class 2014-03-02 21:31:26 +01:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc'
Lightly tested only...
2013-12-25 22:51:23 +01:00
martii
cbc9299df8 convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
2013-12-25 12:08:14 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc'
Only compile-tested.
2013-11-30 20:17:31 +01:00
[CST] Focus
caced88719 gui/osdlang_setup.cpp: fix memleak 2013-11-29 17:27:11 +04:00
Stefan Seyfried
ffd4daea7c neutrino: fix most hardcoded paths 2013-03-10 02:01:52 +01:00
[CST] Bas
8dfa226920 neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths. 2013-01-25 10:33:40 +08:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.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/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
Stefan Seyfried
4009fea6d8 fix compilation with gcc-4.7 by including unistd.h 2012-10-06 17:32:45 +02:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
2012-07-23 01:02:29 +02:00
[CST] Focus
cfc377b76e gui/osdlang_setup.cpp: add menu hints 2012-07-08 21:40:18 +04:00
[CST] Focus
fc9edbec5b gui/osdlang_setup.cpp: fix CLangSelectNotifier::changeNotify - no need to repaint menu 2012-05-31 17:40:50 +04:00
[CST] Focus
8e06495776 comment some found not used variables 2012-05-08 16:18:16 +04:00
[CST] Focus
0319c4faad GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return 2012-05-07 15:37:02 +04:00
[CST] Focus
1f8710013c gui/osdlang_setup.cpp: comment CLangSelectNotifier->changeNotify on every menu show 2012-05-07 15:10:57 +04:00
[CST] Focus
5cb86b5857 gui/osdlang_setup.cpp: fix memleak - with dynamic menus locale = strdup never freed 2012-05-07 14:57:01 +04:00
[CST] Focus
7a8a5b15b5 gui/osdlang_setup.cpp: add 'none' option for prefered lang selection,
for canceling selection if any
2012-05-07 13:58:30 +04:00
[CST] Focus
8a32116bc3 gui/osdlang_setup.cpp: fix memleak - CLangSelectNotifier 2012-05-07 13:21:54 +04:00
[CST] Focus
5e5e6ac9ef gui/osdlang_setup.cpp: fix memleaks when using CMenuForwarder 2012-05-05 14:02:14 +04:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
Stefan Seyfried
f130d20b64 neutrino: improve timezone handling
* only offer timezones which are actually installed in the system
* symlink the timezone file to /etc/localtime instead of copying
2012-04-17 19:33:57 +02:00
satbaby
2591100c42 remove never used volues
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-03-04 17:25:48 +00:00
thilo
8b5857909b *neutrino menu: remove parameter 'mwidth' from widget constructor
Hope we don't need it anymore...

*neutrino menu: remove select functions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1909 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-25 23:48:30 +00:00
thilo
eff98c661e *neutrino menu: fix 'memory ' of selected items in submenues
Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!

In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index

-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter

Hope it' works fine. If you find any menu without  a 'memory', please add an index.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-25 23:48:18 +00:00
focus
3c5a037292 Return menu result, to close all menus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1876 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-22 11:30:50 +00:00
thilo
026a27a521 *neutrino: cleanup unused members and includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-21 09:08:32 +00:00
thilo
c63e151448 *neutrino osdlang_setup: remember last selected item
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1006 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-08 14:32:37 +00:00
thilo
a508e4ab5f tuxbox-port: modul files added
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@894 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-11-27 23:16:38 +00:00