diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index e5d4c0f88..eac08a2a1 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1156,7 +1156,7 @@ settings.missingoptionsconffile Die Neutrino-Einstellungen wurden erweitert.\nDi settings.noconffile Die Neutrino-Einstellungen wurden nicht\ngefunden. Es werden Standardwerte benutzt. settings.pos_bottom_left unten links settings.pos_bottom_right unten rechts -settings.pos_default_center unten Mitte +settings.pos_default_center oben Mitte settings.pos_higher_center erhöht Mitte settings.pos_top_left oben links settings.pos_top_right oben rechts diff --git a/data/locale/english.locale b/data/locale/english.locale index 4c5d5e63e..abb828ca6 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -749,7 +749,7 @@ settings.missingoptionsconffile The neutrino-settings have been updated.\nNew Op settings.noconffile No neutrino-settings found.\nUsing defaults. settings.pos_bottom_left bottom left settings.pos_bottom_right bottom right -settings.pos_default_center bottom center +settings.pos_default_center oben center settings.pos_higher_center higher center settings.pos_top_left oben top left settings.pos_top_right oben top right diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 8f8a4c8bf..d869a1a40 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3692,10 +3692,37 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool int y = g_settings.screen_EndY - 100; #else - int x = frameBuffer->getScreenX() + 10; - int y = frameBuffer->getScreenY() + 0; + int x = frameBuffer->getScreenX(); + int y = frameBuffer->getScreenY(); #endif int vol = g_settings.current_volume; + int sw = frameBuffer->getScreenWidth(); + int sh = frameBuffer->getScreenHeight(); + int borderX = x ; + switch( g_settings.volume_pos ) + { + case 0:// upper right + x = sw - dx; + break; + case 1:// upper left + x = borderX; + break; + case 2:// bottom left + x = borderX; + y = sh - dy; + break; + case 3:// bottom right + x = sw - dx; + y = sh - dy; + break; + case 4:// center default + x = ((sw - dx) / 2) + x; + break; + case 5:// center higher + x = ((sw - dx) / 2) + x; + y = sh - 100; + break; + } fb_pixel_t * pixbuf = NULL; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 2bb99b82c..710392029 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -1506,7 +1506,7 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) funNotifier->changeNotify(NONEXISTANT_LOCALE, (void*) &g_settings.fan_speed); miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_SCRAMBLED_MESSAGE, &g_settings.scrambled_message, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); -// miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_POS, &g_settings.volume_pos, VOLUMEBAR_DISP_POS_OPTIONS, VOLUMEBAR_DISP_POS_OPTIONS_COUNT, true)); + miscSettingsGeneral->addItem(new CMenuOptionChooser(LOCALE_EXTRA_VOLUME_POS, &g_settings.volume_pos, VOLUMEBAR_DISP_POS_OPTIONS, VOLUMEBAR_DISP_POS_OPTIONS_COUNT, true)); miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_GENERAL, true, NULL, miscSettingsGeneral, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED) ); //channellist