mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

small space/tab/comma fixes

Browse Source
This commit is contained in:
BPanther
2021-06-17 23:01:08 +02:00
committed by Thilo Graf
parent 794a6fec77
commit c406ff3bec
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/osd_setup.cpp
View File

@@ -508,10 +508,10 @@ const CMenuOptionChooser::keyval OPTIONS_COLORED_EVENTS_OPTIONS[OPTIONS_COLORED_
{ {
{ 0, LOCALE_MISCSETTINGS_COLORED_EVENTS_0 }, //none { 0, LOCALE_MISCSETTINGS_COLORED_EVENTS_0 }, //none
{ 1, LOCALE_MISCSETTINGS_COLORED_EVENTS_1 }, //current { 1, LOCALE_MISCSETTINGS_COLORED_EVENTS_1 }, //current
{ 2, LOCALE_MISCSETTINGS_COLORED_EVENTS_2 }, //next { 2, LOCALE_MISCSETTINGS_COLORED_EVENTS_2 } //next
}; };
#define OPTIONS_COL_GRADIENT_OPTIONS_COUNT CC_COLGRAD_TYPES //TODO: add modes for intensity #define OPTIONS_COL_GRADIENT_OPTIONS_COUNT CC_COLGRAD_TYPES //TODO: add modes for intensity
const CMenuOptionChooser::keyval OPTIONS_COL_GRADIENT_OPTIONS[OPTIONS_COL_GRADIENT_OPTIONS_COUNT] = const CMenuOptionChooser::keyval OPTIONS_COL_GRADIENT_OPTIONS[OPTIONS_COL_GRADIENT_OPTIONS_COUNT] =
{ {
{ CC_COLGRAD_OFF , LOCALE_OPTIONS_OFF }, { CC_COLGRAD_OFF , LOCALE_OPTIONS_OFF },
@@ -520,14 +520,14 @@ const CMenuOptionChooser::keyval OPTIONS_COL_GRADIENT_OPTIONS[OPTIONS_COL_GRADIE
{ CC_COLGRAD_LIGHT_2_DARK , LOCALE_COLOR_GRADIENT_L2D }, //light to dark { CC_COLGRAD_LIGHT_2_DARK , LOCALE_COLOR_GRADIENT_L2D }, //light to dark
{ CC_COLGRAD_DARK_2_LIGHT , LOCALE_COLOR_GRADIENT_D2L }, //dark to light { CC_COLGRAD_DARK_2_LIGHT , LOCALE_COLOR_GRADIENT_D2L }, //dark to light
{ CC_COLGRAD_COL_LIGHT_DARK_LIGHT , LOCALE_COLOR_GRADIENT_LDL }, //light dark light { CC_COLGRAD_COL_LIGHT_DARK_LIGHT , LOCALE_COLOR_GRADIENT_LDL }, //light dark light
{ CC_COLGRAD_COL_DARK_LIGHT_DARK , LOCALE_COLOR_GRADIENT_DLD }, //dark light dark { CC_COLGRAD_COL_DARK_LIGHT_DARK , LOCALE_COLOR_GRADIENT_DLD } //dark light dark
}; };
#define OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS_COUNT 2 #define OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS_COUNT 2
const CMenuOptionChooser::keyval OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS[OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS_COUNT] = const CMenuOptionChooser::keyval OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS[OPTIONS_COL_GRADIENT_DIRECTION_OPTIONS_COUNT] =
{ {
{ CFrameBuffer::gradientHorizontal , LOCALE_COLOR_GRADIENT_MODE_DIRECTION_HOR }, //horizontal { CFrameBuffer::gradientHorizontal , LOCALE_COLOR_GRADIENT_MODE_DIRECTION_HOR }, //horizontal
{ CFrameBuffer::gradientVertical , LOCALE_COLOR_GRADIENT_MODE_DIRECTION_VER }, //vertical { CFrameBuffer::gradientVertical , LOCALE_COLOR_GRADIENT_MODE_DIRECTION_VER } //vertical
}; };
/* these are more descriptive... */ /* these are more descriptive... */
@@ -692,9 +692,7 @@ int COsdSetup::showOsdSetup()
resCount = 1; resCount = 1;
} }
int videoSystem = COsdHelpers::getInstance()->getVideoSystem(); int videoSystem = COsdHelpers::getInstance()->getVideoSystem();
bool enable = ((resCount > 1) && bool enable = ((resCount > 1) && COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) && (g_settings.video_Mode != VIDEO_STD_AUTO));
COsdHelpers::getInstance()->isVideoSystem1080(videoSystem) &&
(g_settings.video_Mode != VIDEO_STD_AUTO));
CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, enable, this); CMenuOptionChooser * osd_res = new CMenuOptionChooser(LOCALE_COLORMENU_OSD_RESOLUTION, &g_settings.osd_resolution, kext, resCount, enable, this);
osd_res->OnAfterChangeOption.connect(sigc::mem_fun(frameBuffer->getInstance(), &CFrameBuffer::clearIconCache)); osd_res->OnAfterChangeOption.connect(sigc::mem_fun(frameBuffer->getInstance(), &CFrameBuffer::clearIconCache));
osd_res->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION); osd_res->setHint("", LOCALE_MENU_HINT_OSD_RESOLUTION);
@@ -1019,7 +1017,7 @@ private:
CChangeObserver * observer; CChangeObserver * observer;
CConfigFile * configfile; CConfigFile * configfile;
int32_t defaultvalue; int32_t defaultvalue;
std::string value; std::string value;
protected: protected:
@@ -1173,10 +1171,10 @@ const CMenuOptionChooser::keyval PROGRESSBAR_INFOBAR_POSITION_OPTIONS[PROGRESSBA
#define LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT 4 #define LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT 4
const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT]= const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_COUNT]=
{ {
{ 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 }, { 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 },
{ 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 }, { 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 },
{ 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 }, { 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 },
{ 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 } { 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 }
}; };
//menus //menus
@@ -1201,9 +1199,9 @@ void COsdSetup::showOsdMenusSetup(CMenuWidget *menu_menus)
#define HDD_STATFS_OPTION_COUNT 3 #define HDD_STATFS_OPTION_COUNT 3
const CMenuOptionChooser::keyval HDD_STATFS_OPTIONS[HDD_STATFS_OPTION_COUNT] = const CMenuOptionChooser::keyval HDD_STATFS_OPTIONS[HDD_STATFS_OPTION_COUNT] =
{ {
{ SNeutrinoSettings::HDD_STATFS_OFF, LOCALE_OPTIONS_OFF }, { SNeutrinoSettings::HDD_STATFS_OFF, LOCALE_OPTIONS_OFF },
{ SNeutrinoSettings::HDD_STATFS_ALWAYS, LOCALE_HDD_STATFS_ALWAYS }, { SNeutrinoSettings::HDD_STATFS_ALWAYS, LOCALE_HDD_STATFS_ALWAYS },
{ SNeutrinoSettings::HDD_STATFS_RECORDING, LOCALE_HDD_STATFS_RECORDING } { SNeutrinoSettings::HDD_STATFS_RECORDING, LOCALE_HDD_STATFS_RECORDING }
}; };
// channellogos // channellogos
@@ -1527,7 +1525,7 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
return true; return true;
} }
#ifdef ENABLE_CHANGE_OSD_RESOLUTION #ifdef ENABLE_CHANGE_OSD_RESOLUTION
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_RESOLUTION)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_RESOLUTION))
{ {
if (frameBuffer->osd_resolutions.empty()) if (frameBuffer->osd_resolutions.empty())
return true; return true;
@@ -1684,7 +1682,7 @@ const CMenuOptionChooser::keyval_ext SCREENSHOT_FMT_OPTIONS[SCREENSHOT_FMT_OPTIO
const CMenuOptionChooser::keyval SCREENSHOT_OPTIONS[SCREENSHOT_OPTION_COUNT] = const CMenuOptionChooser::keyval SCREENSHOT_OPTIONS[SCREENSHOT_OPTION_COUNT] =
{ {
{ 0, LOCALE_SCREENSHOT_TV }, { 0, LOCALE_SCREENSHOT_TV },
{ 1, LOCALE_SCREENSHOT_OSD } { 1, LOCALE_SCREENSHOT_OSD }
}; };
void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot) void COsdSetup::showOsdScreenShotSetup(CMenuWidget *menu_screenshot)
@@ -1791,16 +1789,16 @@ void COsdSetup::paintWindowSize(int w, int h)
if (win_demo->isPainted()) if (win_demo->isPainted())
win_demo->kill(); win_demo->kill();
} }
g_settings.window_width = w; g_settings.window_width = w;
g_settings.window_height = h; g_settings.window_height = h;
if (g_settings.window_width > WINDOW_SIZE_MAX) if (g_settings.window_width > WINDOW_SIZE_MAX)
g_settings.window_width = WINDOW_SIZE_MAX; g_settings.window_width = WINDOW_SIZE_MAX;
if (g_settings.window_width < WINDOW_SIZE_MIN) if (g_settings.window_width < WINDOW_SIZE_MIN)
g_settings.window_width = WINDOW_SIZE_MIN; g_settings.window_width = WINDOW_SIZE_MIN;
if (g_settings.window_height > WINDOW_SIZE_MAX) if (g_settings.window_height > WINDOW_SIZE_MAX)
g_settings.window_height = WINDOW_SIZE_MAX; g_settings.window_height = WINDOW_SIZE_MAX;
if (g_settings.window_height < WINDOW_SIZE_MIN) if (g_settings.window_height < WINDOW_SIZE_MIN)
g_settings.window_height = WINDOW_SIZE_MIN; g_settings.window_height = WINDOW_SIZE_MIN;
win_demo->setWidth(frameBuffer->getWindowWidth()); win_demo->setWidth(frameBuffer->getWindowWidth());

10
src/gui/osd_setup.h
View File

@@ -41,7 +41,7 @@
class CFrameBuffer; class CFrameBuffer;
class COsdSetup : public CMenuTarget, public CChangeObserver class COsdSetup : public CMenuTarget, public CChangeObserver
{ {
private: private:
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;
CColorSetupNotifier *colorSetupNotifier; CColorSetupNotifier *colorSetupNotifier;
@@ -81,10 +81,10 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
void showOsdScreensaverSetup(CMenuWidget *menu_screensaver); void showOsdScreensaverSetup(CMenuWidget *menu_screensaver);
void paintWindowSize(int w, int h); void paintWindowSize(int w, int h);
void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry); void AddFontSettingItem(CMenuWidget &font_Settings, const SNeutrinoSettings::FONT_TYPES number_of_fontsize_entry);
void resetRadioText(); void resetRadioText();
public: public:
enum INFOBAR_CHANNEL_LOGO_POS_OPTIONS enum INFOBAR_CHANNEL_LOGO_POS_OPTIONS
{ {
INFOBAR_NO_LOGO, INFOBAR_NO_LOGO,
INFOBAR_LOGO_AS_CHANNELLUM, INFOBAR_LOGO_AS_CHANNELLUM,
@@ -92,7 +92,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
INFOBAR_LOGO_BESIDE_CHANNELNAME INFOBAR_LOGO_BESIDE_CHANNELNAME
}; };
enum INFOBAR_CHANNEL_LOGO_BACKROUND_OPTIONS enum INFOBAR_CHANNEL_LOGO_BACKROUND_OPTIONS
{ {
INFOBAR_NO_BACKGROUND, INFOBAR_NO_BACKGROUND,
INFOBAR_LOGO_FRAMED, INFOBAR_LOGO_FRAMED,
@@ -104,7 +104,7 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
PRESET_SCREEN_A, PRESET_SCREEN_A,
PRESET_SCREEN_B PRESET_SCREEN_B
}; };
COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF); COsdSetup(int wizard_mode = SNeutrinoSettings::WIZARD_OFF);
~COsdSetup(); ~COsdSetup();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);