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

osd_setup: introduce g_settings.window_size to scale some windows

Browse Source 
* remove g_settings.big_windows
* add setup window (use up/down to change size)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ed30528f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2013-09-02 20:59:26 +02:00
parent c4ae13fa98
commit 930f73dae6
10 changed files with 112 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
src/gui/osd_setup.cpp
View File

@@ -49,6 +49,7 @@
#include <gui/widget/colorchooser.h>
#include <gui/widget/stringinput.h>
#include <driver/screen_max.h>
#include <driver/neutrinofonts.h>
#include <driver/screen_max.h>
#include <driver/screenshot.h>
@@ -67,12 +68,15 @@ extern std::string ttx_font_file;
COsdSetup::COsdSetup(bool wizard_mode)
{
frameBuffer = CFrameBuffer::getInstance();
colorSetupNotifier = new CColorSetupNotifier();
fontsizenotifier = new CFontSizeNotifier;
osd_menu = NULL;
submenu_menus = NULL;
mfFontFile = NULL;
mfTtxFontFile = NULL;
mfWindowSize = NULL;
win_demo = NULL;
is_wizard = wizard_mode;
@@ -85,6 +89,7 @@ COsdSetup::~COsdSetup()
{
delete colorSetupNotifier;
delete fontsizenotifier;
delete win_demo;
}
//font settings
@@ -184,6 +189,10 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
if(parent != NULL)
parent->hide();
int res = menu_return::RETURN_REPAINT;
neutrino_msg_t msg;
neutrino_msg_data_t data;
if(actionKey == "select_font")
{
CFileBrowser fileBrowser;
@@ -198,7 +207,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
osdFontFile = "(" + getBaseName(fileBrowser.getSelectedFile()->Name) + ")";
mfFontFile->setOption(osdFontFile.c_str());
}
return menu_return::RETURN_REPAINT;
return res;
}
else if(actionKey == "ttx_font")
{
@@ -215,7 +224,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
osdTtxFontFile = "(" + getBaseName(fileBrowser.getSelectedFile()->Name) + ")";
mfTtxFontFile->setOption(osdTtxFontFile.c_str());
}
return menu_return::RETURN_REPAINT;
return res;
}
else if (actionKey == "font_scaling") {
int xre = g_settings.screen_xres;
@@ -236,7 +245,7 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
fontscale.addItem(m_x);
fontscale.addItem(m_y);
int res = fontscale.exec(NULL, "");
res = fontscale.exec(NULL, "");
xre = atoi(val_x);
yre = atoi(val_y);
//fallback for min/max bugs ;)
@@ -258,22 +267,91 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
//return menu_return::RETURN_REPAINT;
return res;
}
else if(actionKey=="window_size") {
if (win_demo == NULL) {
win_demo = new CComponentsShapeSquare(0, 0, 0, 0);
win_demo->setFrameThickness(8);
win_demo->setShadowOnOff(CC_SHADOW_OFF);
win_demo->setColorBody(COL_BACKGROUND);
win_demo->setColorFrame(COL_RED);
win_demo->doPaintBg(true);
}
else {
if (win_demo->isPainted())
win_demo->kill();
}
win_demo->setWidth(frameBuffer->getScreenWidthRel());
win_demo->setHeight(frameBuffer->getScreenHeightRel());
win_demo->setXPos(getScreenStartX(win_demo->getWidth()));
win_demo->setYPos(getScreenStartY(win_demo->getHeight()));
win_demo->paint(CC_SAVE_SCREEN_NO);
int old_window_size = g_settings.window_size;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
bool loop=true;
while (loop) {
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
if ( msg == CRCInput::RC_ok ) {
loop = false;
memset(window_size_value, 0, sizeof(window_size_value));
snprintf(window_size_value, sizeof(window_size_value)-1, "%d", g_settings.window_size);
mfWindowSize->setOption(window_size_value);
break;
} else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) {
g_settings.window_size = old_window_size;
loop = false;
} else if ((msg == CRCInput::RC_up) || (msg == CRCInput::RC_down)) {
if ((msg == CRCInput::RC_up) && (g_settings.window_size < WINDOW_SIZE_MAX)) {
g_settings.window_size += 1;
}
if ((msg == CRCInput::RC_down) && (g_settings.window_size > WINDOW_SIZE_MIN)) {
g_settings.window_size -= 1;
}
if (win_demo->isPainted())
win_demo->kill();
win_demo->setWidth(frameBuffer->getScreenWidthRel());
win_demo->setHeight(frameBuffer->getScreenHeightRel());
win_demo->setXPos(getScreenStartX(win_demo->getWidth()));
win_demo->setYPos(getScreenStartY(win_demo->getHeight()));
win_demo->paint(CC_SAVE_SCREEN_NO);
} else if (msg > CRCInput::RC_MaxRC) {
if ( CNeutrinoApp::getInstance()->handleMsg( msg, data ) & messages_return::cancel_all ) {
loop = false;
res = menu_return::RETURN_EXIT_ALL;
}
}
}
win_demo->kill();
return res;
}
else if(actionKey=="osd.def") {
for (int i = 0; i < SNeutrinoSettings::TIMING_SETTING_COUNT; i++)
g_settings.timing[i] = timing_setting[i].default_timing;
CNeutrinoApp::getInstance()->SetupTiming();
return menu_return::RETURN_REPAINT;
return res;
}
else if(actionKey=="logo_dir") {
const char *action_str = "logo";
chooserDir(g_settings.logo_hdd_dir, false, action_str);
return menu_return::RETURN_REPAINT;
return res;
}
else if(actionKey=="screenshot_dir") {
const char *action_str = "screenshot";
chooserDir(g_settings.screenshot_dir, true, action_str);
return menu_return::RETURN_REPAINT;
return res;
}
else if(strncmp(actionKey.c_str(), "fontsize.d", 10) == 0) {
for (int i = 0; i < 6; i++) {
@@ -286,10 +364,10 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
}
}
fontsizenotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
return menu_return::RETURN_REPAINT;
return res;
}
int res = showOsdSetup();
res = showOsdSetup();
//return menu_return::RETURN_REPAINT;
return res;
@@ -504,10 +582,12 @@ int COsdSetup::showOsdSetup()
mc->setHint("", LOCALE_MENU_HINT_FADE);
osd_menu->addItem(mc);
// big windows
mc = new CMenuOptionChooser(LOCALE_EXTRA_BIGWINDOWS, &g_settings.big_windows, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_BIGWINDOWS);
osd_menu->addItem(mc);
// window size
memset(window_size_value, 0, sizeof(window_size_value));
snprintf(window_size_value, sizeof(window_size_value)-1, "%d", g_settings.window_size);
mfWindowSize = new CMenuForwarder(LOCALE_WINDOW_SIZE, true, window_size_value, this, "window_size", CRCInput::convertDigitToKey(shortcut++));
mfWindowSize->setHint("", LOCALE_MENU_HINT_WINDOW_SIZE);
osd_menu->addItem(mfWindowSize);
osd_menu->addItem(GenericMenuSeparatorLine);