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

change font scaling menu

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1235 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
satbaby
2011-02-28 21:21:29 +00:00
parent 58edffa82f
commit f0279136ac
5 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/locale/deutsch.locale
View File

@@ -528,7 +528,9 @@ fontmenu.infobar Infobar
fontmenu.menu Menü fontmenu.menu Menü
fontmenu.scaling Schriftgrössenfaktor fontmenu.scaling Schriftgrössenfaktor
fontmenu.scaling_x Horizontal (in %) fontmenu.scaling_x Horizontal (in %)
fontmenu.scaling_x_hint2 Horizontal (in %) min 50 / max 200
fontmenu.scaling_y Vertikal (in %) fontmenu.scaling_y Vertikal (in %)
fontmenu.scaling_y_hint2 Vertikal (in %) min 50 / max 200
fontmenu.sizes Schriftgrössen fontmenu.sizes Schriftgrössen
fontsize.channel_num_zap Direktauswahl fontsize.channel_num_zap Direktauswahl
fontsize.channellist Kanalliste fontsize.channellist Kanalliste
@@ -765,7 +767,7 @@ miscsettings.shutdown_count_hint1 Bitte warten...
miscsettings.shutdown_count_hint2 Sie können die Box jetzt ausschalten! miscsettings.shutdown_count_hint2 Sie können die Box jetzt ausschalten!
miscsettings.shutdown_real Standbymodus miscsettings.shutdown_real Standbymodus
miscsettings.shutdown_real_rcdelay Verzögertes Ausschalten miscsettings.shutdown_real_rcdelay Verzögertes Ausschalten
miscsettings.sleeptimer Ausschalten bei Inaktivität (min) miscsettings.sleeptimer Ausschalten nach Inaktivität
miscsettings.sptsmode SPTS-Mode Treiber laden miscsettings.sptsmode SPTS-Mode Treiber laden
miscsettings.virtual_zap_mode Virtual Zap miscsettings.virtual_zap_mode Virtual Zap
motorcontrol.calc_positions Positionen (Neu)-Berechne(n)) motorcontrol.calc_positions Positionen (Neu)-Berechne(n))

2
data/locale/english.locale
View File

@@ -528,7 +528,9 @@ fontmenu.infobar Infobar
fontmenu.menu Menu fontmenu.menu Menu
fontmenu.scaling Global Font Zoom Factor fontmenu.scaling Global Font Zoom Factor
fontmenu.scaling_x Horizontal (in %) fontmenu.scaling_x Horizontal (in %)
fontmenu.scaling_x_hint2 Horizontal (in %) min 50 / max 200
fontmenu.scaling_y Vertical (in %) fontmenu.scaling_y Vertical (in %)
fontmenu.scaling_y_hint2 Vertical (in %) min 50 / max 200
fontmenu.sizes Font sizes fontmenu.sizes Font sizes
fontsize.channel_num_zap direct selection fontsize.channel_num_zap direct selection
fontsize.channellist Channellist fontsize.channellist Channellist

30
src/gui/osd_setup.cpp
View File

@@ -118,13 +118,35 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
else if (actionKey == "font_scaling") { else if (actionKey == "font_scaling") {
int xre = g_settings.screen_xres; int xre = g_settings.screen_xres;
int yre = g_settings.screen_yres; int yre = g_settings.screen_yres;
char val_x[4] = {0};
char val_y[4] = {0};
snprintf(val_x,sizeof(val_x), "%03d",g_settings.screen_xres);
snprintf(val_y,sizeof(val_y), "%03d",g_settings.screen_yres);
CMenuWidget fontscale(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_COLORS); CMenuWidget fontscale(LOCALE_FONTMENU_HEAD, NEUTRINO_ICON_COLORS);
fontscale.addIntroItems(LOCALE_FONTMENU_SCALING); fontscale.addIntroItems(LOCALE_FONTMENU_SCALING);
fontscale.addItem(new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_X, &xre, true, 50, 200));
fontscale.addItem(new CMenuOptionNumberChooser(LOCALE_FONTMENU_SCALING_Y, &yre, true, 50, 200));
fontscale.exec(NULL, "");
CStringInput * xres_count = new CStringInput(LOCALE_FONTMENU_SCALING_X, val_x,50,200, 3, LOCALE_FONTMENU_SCALING, LOCALE_FONTMENU_SCALING_X_HINT2, "0123456789 ");
CMenuForwarder *m_x = new CMenuForwarder(LOCALE_FONTMENU_SCALING_X, true, val_x, xres_count);
CStringInput * yres_count = new CStringInput(LOCALE_FONTMENU_SCALING_Y, val_y,50,200, 3, LOCALE_FONTMENU_SCALING, LOCALE_FONTMENU_SCALING_Y_HINT2, "0123456789 ");
CMenuForwarder *m_y = new CMenuForwarder(LOCALE_FONTMENU_SCALING_Y, true, val_y, yres_count);
fontscale.addItem(m_x);
fontscale.addItem(m_y);
fontscale.exec(NULL, "");
xre = atoi(val_x);
yre = atoi(val_y);
//fallback for min/max bugs ;)
if( xre < 50 || xre > 200 ){
xre = g_settings.screen_xres;
snprintf(val_x,sizeof(val_x), "%03d",g_settings.screen_xres);
}
if( yre < 50 || yre > 200 ){
yre = g_settings.screen_yres;
snprintf(val_y,sizeof(val_y), "%03d",g_settings.screen_yres);
}
if (xre != g_settings.screen_xres || yre != g_settings.screen_yres) { if (xre != g_settings.screen_xres || yre != g_settings.screen_yres) {
printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", xre, yre); printf("[neutrino] new font scale settings x: %d%% y: %d%%\n", xre, yre);
g_settings.screen_xres = xre; g_settings.screen_xres = xre;

2
src/system/locals.h
View File

@@ -555,7 +555,9 @@ typedef enum
LOCALE_FONTMENU_MENU, LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_SCALING, LOCALE_FONTMENU_SCALING,
LOCALE_FONTMENU_SCALING_X, LOCALE_FONTMENU_SCALING_X,
LOCALE_FONTMENU_SCALING_X_HINT2,
LOCALE_FONTMENU_SCALING_Y, LOCALE_FONTMENU_SCALING_Y,
LOCALE_FONTMENU_SCALING_Y_HINT2,
LOCALE_FONTMENU_SIZES, LOCALE_FONTMENU_SIZES,
LOCALE_FONTSIZE_CHANNEL_NUM_ZAP, LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
LOCALE_FONTSIZE_CHANNELLIST, LOCALE_FONTSIZE_CHANNELLIST,

2
src/system/locals_intern.h
View File

@@ -555,7 +555,9 @@ const char * locale_real_names[] =
"fontmenu.menu", "fontmenu.menu",
"fontmenu.scaling", "fontmenu.scaling",
"fontmenu.scaling_x", "fontmenu.scaling_x",
"fontmenu.scaling_x_hint2",
"fontmenu.scaling_y", "fontmenu.scaling_y",
"fontmenu.scaling_y_hint2",
"fontmenu.sizes", "fontmenu.sizes",
"fontsize.channel_num_zap", "fontsize.channel_num_zap",
"fontsize.channellist", "fontsize.channellist",