mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

add menu volume pos

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@384 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 945904bf31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-18 (Thu, 18 Feb 2010)

Origin message was:
------------------
-add menu volume pos

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@384 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2010-02-18 21:23:52 +00:00
parent b7472d77d8
commit 7b691b4939
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -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

2
data/locale/english.locale
View File

@@ -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

31
src/neutrino.cpp
View File

@@ -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;

2
src/neutrino_menue.cpp
View File

@@ -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