mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CVolumeBar: Reactivate position 'higher center' for volume bar

Browse Source
This commit is contained in:
Michael Liebmann
2013-06-06 11:03:17 +02:00
parent d08d18522e
commit c70167b58f
6 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1736,6 +1736,7 @@ settings.pos_bottom_center unten zentriert
settings.pos_bottom_left unten links settings.pos_bottom_left unten links
settings.pos_bottom_right unten rechts settings.pos_bottom_right unten rechts
settings.pos_default_center zentriert settings.pos_default_center zentriert
settings.pos_higher_center höher zentriert
settings.pos_top_center oben zentriert settings.pos_top_center oben zentriert
settings.pos_top_left oben links settings.pos_top_left oben links
settings.pos_top_right oben rechts settings.pos_top_right oben rechts

1
data/locale/english.locale
View File

@@ -1736,6 +1736,7 @@ settings.pos_bottom_center bottom center
settings.pos_bottom_left bottom left settings.pos_bottom_left bottom left
settings.pos_bottom_right bottom right settings.pos_bottom_right bottom right
settings.pos_default_center center settings.pos_default_center center
settings.pos_higher_center higher center
settings.pos_top_center top center settings.pos_top_center top center
settings.pos_top_left top left settings.pos_top_left top left
settings.pos_top_right top right settings.pos_top_right top right

5
src/gui/osd_setup.cpp
View File

@@ -332,7 +332,7 @@ const CMenuOptionChooser::keyval INFOBAR_SUBCHAN_DISP_POS_OPTIONS[INFOBAR_SUBCH
{ 4 , LOCALE_INFOVIEWER_SUBCHAN_INFOBAR } { 4 , LOCALE_INFOVIEWER_SUBCHAN_INFOBAR }
}; };
#define VOLUMEBAR_DISP_POS_OPTIONS_COUNT 6 #define VOLUMEBAR_DISP_POS_OPTIONS_COUNT 7
const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_OPTIONS_COUNT]= const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_OPTIONS_COUNT]=
{ {
{ 0 , LOCALE_SETTINGS_POS_TOP_RIGHT }, { 0 , LOCALE_SETTINGS_POS_TOP_RIGHT },
@@ -340,7 +340,8 @@ const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_
{ 2 , LOCALE_SETTINGS_POS_BOTTOM_LEFT }, { 2 , LOCALE_SETTINGS_POS_BOTTOM_LEFT },
{ 3 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT }, { 3 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT },
{ 4 , LOCALE_SETTINGS_POS_TOP_CENTER }, { 4 , LOCALE_SETTINGS_POS_TOP_CENTER },
{ 5 , LOCALE_SETTINGS_POS_BOTTOM_CENTER } { 5 , LOCALE_SETTINGS_POS_BOTTOM_CENTER },
{ 6 , LOCALE_SETTINGS_POS_HIGHER_CENTER }
}; };
#define MENU_DISP_POS_OPTIONS_COUNT 5 #define MENU_DISP_POS_OPTIONS_COUNT 5

4
src/gui/volumebar.cpp
View File

@@ -148,6 +148,10 @@ void CVolumeBar::initVolumeBarPosition()
x = ((sw - width) / 2) + x - h_spacer/2; x = ((sw - width) / 2) + x - h_spacer/2;
y = (sh + frameBuffer->getScreenY()) - height - v_spacer; y = (sh + frameBuffer->getScreenY()) - height - v_spacer;
break; break;
case 6:// higher center
x = ((sw - width) / 2) + x - h_spacer/2;
y = (sh + frameBuffer->getScreenY()) - sh/10;
break;
} }
} }

1
src/system/locals.h
View File

@@ -1763,6 +1763,7 @@ typedef enum
LOCALE_SETTINGS_POS_BOTTOM_LEFT, LOCALE_SETTINGS_POS_BOTTOM_LEFT,
LOCALE_SETTINGS_POS_BOTTOM_RIGHT, LOCALE_SETTINGS_POS_BOTTOM_RIGHT,
LOCALE_SETTINGS_POS_DEFAULT_CENTER, LOCALE_SETTINGS_POS_DEFAULT_CENTER,
LOCALE_SETTINGS_POS_HIGHER_CENTER,
LOCALE_SETTINGS_POS_TOP_CENTER, LOCALE_SETTINGS_POS_TOP_CENTER,
LOCALE_SETTINGS_POS_TOP_LEFT, LOCALE_SETTINGS_POS_TOP_LEFT,
LOCALE_SETTINGS_POS_TOP_RIGHT, LOCALE_SETTINGS_POS_TOP_RIGHT,

1
src/system/locals_intern.h
View File

@@ -1763,6 +1763,7 @@ const char * locale_real_names[] =
"settings.pos_bottom_left", "settings.pos_bottom_left",
"settings.pos_bottom_right", "settings.pos_bottom_right",
"settings.pos_default_center", "settings.pos_default_center",
"settings.pos_higher_center",
"settings.pos_top_center", "settings.pos_top_center",
"settings.pos_top_left", "settings.pos_top_left",
"settings.pos_top_right", "settings.pos_top_right",