diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp index 6f9315160..6d40e5004 100644 --- a/src/gui/adzap.cpp +++ b/src/gui/adzap.cpp @@ -31,9 +31,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp index d2aae62c7..2978386f0 100644 --- a/src/gui/audio_select.cpp +++ b/src/gui/audio_select.cpp @@ -36,9 +36,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 70fbaf400..9b7e4496d 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -37,9 +37,9 @@ #include #include -#include #include +#include #include #include diff --git a/src/gui/audioplayer_setup.cpp b/src/gui/audioplayer_setup.cpp index 601706292..e75882e14 100644 --- a/src/gui/audioplayer_setup.cpp +++ b/src/gui/audioplayer_setup.cpp @@ -38,10 +38,10 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index 3486f1609..00802de69 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -53,7 +54,6 @@ #include #include -#include #include #ifdef ENABLE_LCD4LINUX diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index fb753822b..2abf70373 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -40,6 +40,7 @@ #include #include #include "widget/icons.h" +#include "widget/menue_options.h" #include "widget/stringinput.h" #include "widget/progresswindow.h" @@ -48,7 +49,6 @@ #include #include -#include #include #include #include diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp index 3775c206d..f87a790db 100644 --- a/src/gui/cec_setup.cpp +++ b/src/gui/cec_setup.cpp @@ -35,10 +35,10 @@ #include #include -#include #include #include +#include #include diff --git a/src/gui/daemon_control.cpp b/src/gui/daemon_control.cpp index a8f7520e7..da3d0ee5d 100644 --- a/src/gui/daemon_control.cpp +++ b/src/gui/daemon_control.cpp @@ -29,7 +29,8 @@ #include #include -#include + +#include #include diff --git a/src/gui/glcdsetup.cpp b/src/gui/glcdsetup.cpp index 0f3fbd097..b61969b22 100644 --- a/src/gui/glcdsetup.cpp +++ b/src/gui/glcdsetup.cpp @@ -34,7 +34,7 @@ #include #include #include "glcdsetup.h" -#include +#include #include #include #include "glcdthemes.h" diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp index eebee9c57..314eedf50 100644 --- a/src/gui/hdd_menu.cpp +++ b/src/gui/hdd_menu.cpp @@ -49,6 +49,7 @@ #include //NI #include +#include #include #include #include @@ -59,7 +60,6 @@ #include #include -#include #include #include diff --git a/src/gui/infoicons_setup.cpp b/src/gui/infoicons_setup.cpp index c2ed8d190..fcdeeae8f 100644 --- a/src/gui/infoicons_setup.cpp +++ b/src/gui/infoicons_setup.cpp @@ -30,9 +30,9 @@ #include #include -#include #include #include +#include #include #include diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 8e6440918..5552f3ff2 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -39,10 +39,10 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index 6f73feaaa..b66efba0f 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -37,12 +37,12 @@ #include #include -#include #include #include #include #include +#include #include diff --git a/src/gui/mediaplayer_setup.cpp b/src/gui/mediaplayer_setup.cpp index 55a21867a..8721c04ca 100644 --- a/src/gui/mediaplayer_setup.cpp +++ b/src/gui/mediaplayer_setup.cpp @@ -38,9 +38,9 @@ #include #include -#include #include +#include #include #include diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index bdfe34339..04b938f94 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include #include @@ -48,6 +47,7 @@ #include #include +#include #include #include #include diff --git a/src/gui/moviebrowser/mb.cpp b/src/gui/moviebrowser/mb.cpp index 93b1689cb..eafd6f7cd 100644 --- a/src/gui/moviebrowser/mb.cpp +++ b/src/gui/moviebrowser/mb.cpp @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -63,7 +64,6 @@ #include #include #include -#include #include // for statfs #include #include diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 8a951160f..d5ad018fb 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -61,8 +62,6 @@ #include #include -#include - #include #include #include diff --git a/src/gui/netfs_setup.cpp b/src/gui/netfs_setup.cpp index ab507ce4b..317b2080a 100644 --- a/src/gui/netfs_setup.cpp +++ b/src/gui/netfs_setup.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp index 64b288eec..241911bc4 100644 --- a/src/gui/network_service.cpp +++ b/src/gui/network_service.cpp @@ -29,8 +29,8 @@ #include #include +#include #include "network_service.h" -#include #include diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index ff14bce34..886192b69 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -53,7 +54,6 @@ #include #include -#include #include #include diff --git a/src/gui/osd_progressbar_setup.cpp b/src/gui/osd_progressbar_setup.cpp index 7f88e65ad..9d79b6fb9 100644 --- a/src/gui/osd_progressbar_setup.cpp +++ b/src/gui/osd_progressbar_setup.cpp @@ -32,9 +32,9 @@ #include #include -#include #include +#include #include #include diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 2793db34e..336d9e4c9 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -36,7 +36,6 @@ #include #include -#include #include #include "osd_setup.h" @@ -53,6 +52,7 @@ #include #include #include +#include #include #include #include diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 43b8cdf6f..b18765223 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -39,10 +39,10 @@ #include #include -#include #include #include +#include #include diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp index dbf434017..12a2d76d1 100644 --- a/src/gui/personalize.cpp +++ b/src/gui/personalize.cpp @@ -158,7 +158,6 @@ #include #include #include -#include #include #include #include @@ -171,6 +170,7 @@ #include #include #include +#include #include #include "widget/msgbox.h" #include "widget/hintbox.h" diff --git a/src/gui/plugins_hide.cpp b/src/gui/plugins_hide.cpp index b81bbf48e..5c6c7134a 100644 --- a/src/gui/plugins_hide.cpp +++ b/src/gui/plugins_hide.cpp @@ -33,10 +33,10 @@ #include #include -#include #include #include +#include #include "gui/pluginlist.h" #include "gui/plugins.h" diff --git a/src/gui/quadpip_setup.cpp b/src/gui/quadpip_setup.cpp index ba51ecbbf..64d86ff46 100644 --- a/src/gui/quadpip_setup.cpp +++ b/src/gui/quadpip_setup.cpp @@ -29,10 +29,11 @@ #include "quadpip_setup.h" #include -#include #include #include +#include + #include #include diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 59f2438b4..7f4e3e565 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -37,13 +37,13 @@ #include #include #include -#include #include "record_setup.h" #include #include #include +#include #include #include #include diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 1786ef71f..c24de7220 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -38,7 +38,6 @@ #include #include -#include #include #include @@ -47,6 +46,7 @@ #include #include +#include #include #include diff --git a/src/gui/subchannel_select.cpp b/src/gui/subchannel_select.cpp index 5bdb0dd5c..5786a57ef 100644 --- a/src/gui/subchannel_select.cpp +++ b/src/gui/subchannel_select.cpp @@ -35,9 +35,10 @@ #include #include -#include #include "subchannel_select.h" + +#include #include extern CRemoteControl *g_RemoteControl; diff --git a/src/gui/update.cpp b/src/gui/update.cpp index f0d6b8b4d..0d5c298f3 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -52,6 +51,7 @@ #if ENABLE_PKG_MANAGEMENT #include #endif +#include #include #include diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp index a6db4ecb9..d723748f5 100644 --- a/src/gui/update_settings.cpp +++ b/src/gui/update_settings.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include #include #include diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index eb734e3a3..b467584dd 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -69,9 +69,9 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 3491d70a3..cf44e002d 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -37,10 +37,10 @@ #include #include -#include #include #include +#include #ifdef ENABLE_GRAPHLCD #include diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 1669d1876..113e0347a 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -39,9 +39,9 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp index 00ef555cd..9a584acd4 100644 --- a/src/gui/webchannels_setup.cpp +++ b/src/gui/webchannels_setup.cpp @@ -32,12 +32,12 @@ #include #include #include +#include #include #include #include "webchannels_setup.h" #include -#include #include const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] = diff --git a/src/mymenu.h b/src/gui/widget/menue_options.h similarity index 80% rename from src/mymenu.h rename to src/gui/widget/menue_options.h index 4fd090ef4..e780e8da3 100644 --- a/src/mymenu.h +++ b/src/gui/widget/menue_options.h @@ -2,27 +2,26 @@ const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] = { { 0, LOCALE_OPTIONS_OFF }, - { 1, LOCALE_OPTIONS_ON } + { 1, LOCALE_OPTIONS_ON } }; #define OPTIONS_OFF1_ON0_OPTION_COUNT 2 const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTION_COUNT] = { { 1, LOCALE_OPTIONS_OFF }, - { 0, LOCALE_OPTIONS_ON } + { 0, LOCALE_OPTIONS_ON } }; #define MESSAGEBOX_NO_YES_OPTION_COUNT 2 const CMenuOptionChooser::keyval MESSAGEBOX_NO_YES_OPTIONS[MESSAGEBOX_NO_YES_OPTION_COUNT] = { - { 0, LOCALE_MESSAGEBOX_NO }, + { 0, LOCALE_MESSAGEBOX_NO }, { 1, LOCALE_MESSAGEBOX_YES } }; -//NI #define OPTIONS_START0_STOP1_OPTION_COUNT 2 const CMenuOptionChooser::keyval OPTIONS_START0_STOP1_OPTIONS[OPTIONS_START0_STOP1_OPTION_COUNT] = { - { 0, LOCALE_OPTIONS_START}, - { 1, LOCALE_OPTIONS_STOP } + { 0, LOCALE_OPTIONS_START }, + { 1, LOCALE_OPTIONS_STOP } }; diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp index 1699242a3..1def3b37d 100644 --- a/src/gui/zapit_setup.cpp +++ b/src/gui/zapit_setup.cpp @@ -32,10 +32,10 @@ #include #include -#include #include #include +#include CZapitSetup::CZapitSetup() { diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index eceadf0ce..df61133e3 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -30,7 +30,6 @@ #include "global.h" #include "neutrino.h" -#include "mymenu.h" #include @@ -73,6 +72,7 @@ #include "gui/update.h" #include "gui/vfd_setup.h" #include "gui/videosettings.h" +#include "gui/widget/menue_options.h" #include "driver/record.h" #include "driver/display.h"