diff --git a/data/locale/english.locale b/data/locale/english.locale index 8911d3455..b3c915a2f 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -756,6 +756,7 @@ settings.pos_default_center top center settings.pos_higher_center higher center settings.pos_top_left top left settings.pos_top_right top right +settings.menu_pos Menu position shutdowntimer.announce Box will shutdown in 1 min.\nCancel Sutdown ? sleeptimerbox.announce Sleeptimer in 1 min sleeptimerbox.hint1 Shutdown time in min. (000=off) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 9e58088a1..23a0f5696 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -167,7 +167,6 @@ void CInfoViewer::Init() /* after font size changes, Init() might be called multiple times */ changePB(); - pbBlinkChange = g_settings.progressbar_color; casysChange = g_settings.casystem_display; channellogoChange = g_settings.infobar_show_channellogo; @@ -379,11 +378,6 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con bool fadeIn = g_settings.widget_fade && (!is_visible) && showButtonBar; - if(pbBlinkChange != g_settings.progressbar_color){ - pbBlinkChange = g_settings.progressbar_color; - //changePB(); - } - if (casysChange != g_settings.casystem_display || channellogoChange != g_settings.infobar_show_channellogo){ casysChange = g_settings.casystem_display; channellogoChange = g_settings.infobar_show_channellogo; diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index d36a4edc8..9775d6f93 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -94,7 +94,6 @@ class CInfoViewer int lastsnr, lastsig, lasthdd, lastvar, lasttime; CProgressBar *snrscale, *sigscale, *hddscale, *varscale, *timescale; - bool pbBlinkChange; void changePB(); bool casysChange; bool channellogoChange; diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp index f2ad3f00c..c93e0c535 100644 --- a/src/gui/motorcontrol.cpp +++ b/src/gui/motorcontrol.cpp @@ -91,7 +91,6 @@ void CMotorControl::Init(void) stepDelay = 10; sigscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT); snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT); - pbBlinkChange = g_settings.progressbar_color; } int CMotorControl::exec(CMenuTarget* parent, const std::string &) @@ -107,19 +106,6 @@ int CMotorControl::exec(CMenuTarget* parent, const std::string &) CZapitClient::commandSetScanSatelliteList sat; sat_iterator_t sit; -#if 0 - if(pbBlinkChange != g_settings.progressbar_color){ - pbBlinkChange = g_settings.progressbar_color; - if(sigscale){ - delete sigscale; - sigscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT); - } - if(snrscale){ - delete snrscale; - snrscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT); - } - } -#endif sigscale->reset(); snrscale->reset(); lastsnr = lastsig = -1; diff --git a/src/gui/motorcontrol.h b/src/gui/motorcontrol.h index 59ec6ea65..9232e1dbf 100644 --- a/src/gui/motorcontrol.h +++ b/src/gui/motorcontrol.h @@ -67,7 +67,6 @@ class CMotorControl : public CMenuTarget int satfindpid; int lastsnr, lastsig; CProgressBar *snrscale, *sigscale; - bool pbBlinkChange; void paint(); void paintMenu(void); void paintStatus(void); diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 051a8c6ed..4f41fbe54 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -81,7 +81,6 @@ CScanTs::CScanTs() sigscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT); snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT); - pbBlinkChange = g_settings.progressbar_color; } extern int scan_pids; @@ -117,19 +116,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) if(scan_all) scan_mode |= 0xFF00; -#if 0 - if(pbBlinkChange != g_settings.progressbar_color){ - pbBlinkChange = g_settings.progressbar_color; - if(sigscale){ - delete sigscale; - sigscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT); - } - if(snrscale){ - delete snrscale; - snrscale = new CProgressBar(g_settings.progressbar_color, BAR_WIDTH, BAR_HEIGHT); - } - } -#endif sigscale->reset(); snrscale->reset(); lastsig = lastsnr = -1; diff --git a/src/gui/scan.h b/src/gui/scan.h index 1ef967448..ff832efc1 100644 --- a/src/gui/scan.h +++ b/src/gui/scan.h @@ -66,7 +66,6 @@ class CScanTs : public CMenuTarget uint32_t done; int lastsnr, lastsig; CProgressBar *snrscale, *sigscale; - bool pbBlinkChange; void paint(bool fortest = false); void paintLineLocale(int x, int * y, int width, const neutrino_locale_t l); diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 57781f3f0..c2b2a553b 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -511,6 +511,27 @@ void CMenuWidget::paint() else sb_width=0; + switch(g_settings.menu_pos) { + case 0: //DEFAULT_CENTER + break; + case 1: //TOP_LEFT + y = offy + frameBuffer->getScreenY() + 10; + x = offx + frameBuffer->getScreenX() + 10; + break; + case 2: //TOP_RIGHT + y = offy + frameBuffer->getScreenY() + 10; + x = offx + frameBuffer->getScreenX() + frameBuffer->getScreenWidth() - width - sb_width - 10; + break; + case 3: //BOTTOM_LEFT + y = offy + frameBuffer->getScreenY() + frameBuffer->getScreenHeight() - height - 10; + x = offx + frameBuffer->getScreenX() + 10; + break; + case 4: //BOTTOM_RIGHT + y = offy + frameBuffer->getScreenY() + frameBuffer->getScreenHeight() - height - 10; + x = offx + frameBuffer->getScreenX() + frameBuffer->getScreenWidth() - width - sb_width - 10; + break; + } + //frameBuffer->paintBoxRel(x,y, width+sb_width,hheight, COL_MENUHEAD_PLUS_0); frameBuffer->paintBoxRel(x, y, width+sb_width, hheight, COL_MENUHEAD_PLUS_0, ROUND_RADIUS, CORNER_TOP); //FIXME rounded diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 1a37ba865..eec33551b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -795,6 +795,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.casystem_display = configfile.getBool("casystem_display", false ); g_settings.scrambled_message = configfile.getBool("scrambled_message", true ); g_settings.volume_pos = configfile.getInt32("volume_pos", 0 ); + g_settings.menu_pos = configfile.getInt32("menu_pos", 0 ); //audio g_settings.audio_AnalogMode = configfile.getInt32( "audio_AnalogMode", 0 ); g_settings.audio_DolbyDigital = configfile.getBool("audio_DolbyDigital" , false); @@ -1305,8 +1306,9 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setBool("progressbar_color" , g_settings.progressbar_color ); configfile.setInt32("infobar_show_channellogo" , g_settings.infobar_show_channellogo ); configfile.setBool("casystem_display" , g_settings.casystem_display ); - configfile.setBool("scrambled_message" , g_settings.scrambled_message ); - configfile.setInt32("volume_pos" , g_settings.volume_pos ); + configfile.setBool("scrambled_message" , g_settings.scrambled_message ); + configfile.setInt32("volume_pos" , g_settings.volume_pos ); + configfile.setInt32("menu_pos" , g_settings.menu_pos); //audio configfile.setInt32( "audio_AnalogMode", g_settings.audio_AnalogMode ); @@ -2562,7 +2564,6 @@ int CNeutrinoApp::run(int argc, char **argv) hdd->exec(NULL, ""); delete hdd; - pbBlinkChange = g_settings.progressbar_color; InitZapper(); InitRecordingSettings(recordingSettings); InitStreamingSettings(streamingSettings); @@ -3697,6 +3698,7 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool int dx = 0;//256 int dy = 0;//32 frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME,&dx,&dy); +printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy); dx *=16; dy *=2; #if 0 // orig @@ -3715,23 +3717,23 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool { case 0:// upper right x = sw - dx; - break; + break; case 1:// upper left - break; + break; case 2:// bottom left y = sh - dy; - break; + break; case 3:// bottom right x = sw - dx; y = sh - dy; - break; + break; case 4:// center default x = ((sw - dx) / 2) + x; - break; + break; case 5:// center higher x = ((sw - dx) / 2) + x; y = sh - 100; - break; + break; } fb_pixel_t * pixbuf = NULL; @@ -3740,14 +3742,7 @@ void CNeutrinoApp::setVolume(const neutrino_msg_t key, const bool bDoPaint, bool pixbuf = new fb_pixel_t[dx * dy]; if(pixbuf!= NULL) frameBuffer->SaveScreen(x, y, dx, dy, pixbuf); -#if 0 - if(pbBlinkChange != g_settings.progressbar_color){ - pbBlinkChange = g_settings.progressbar_color; - if(g_volscale) - delete g_volscale; - g_volscale = new CProgressBar(g_settings.progressbar_color, 200, 15, 50, 100, 80, true); - } -#endif + frameBuffer->paintBoxRel(x , y , dx, dy, COL_INFOBAR_SHADOW_PLUS_1, dy/2); frameBuffer->paintBoxRel (x + dy + (dy/4)-2, y+(dy/4)-2, ((dy/2)*12.5) +4, dy/2+4, COL_INFOBAR_PLUS_3); frameBuffer->paintBoxRel (x + dy + (dy/4), y+(dy/4), (dy/2)*12.5, dy/2, COL_INFOBAR_PLUS_0); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 7f04494ab..f87ab46b5 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -1476,6 +1476,16 @@ const CMenuOptionChooser::keyval VOLUMEBAR_DISP_POS_OPTIONS[VOLUMEBAR_DISP_POS_ { 5 , LOCALE_SETTINGS_POS_HIGHER_CENTER } }; +#define MENU_DISP_POS_OPTIONS_COUNT 5 +const CMenuOptionChooser::keyval MENU_DISP_POS_OPTIONS[MENU_DISP_POS_OPTIONS_COUNT]= +{ + { 0 , LOCALE_SETTINGS_POS_DEFAULT_CENTER }, + { 1 , LOCALE_SETTINGS_POS_TOP_RIGHT }, + { 2 , LOCALE_SETTINGS_POS_TOP_LEFT }, + { 3 , LOCALE_SETTINGS_POS_BOTTOM_LEFT }, + { 4 , LOCALE_SETTINGS_POS_BOTTOM_RIGHT } +}; + void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) { dprintf(DEBUG_DEBUG, "init miscsettings\n"); @@ -1507,6 +1517,7 @@ void CNeutrinoApp::InitMiscSettings(CMenuWidget &miscSettings) 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_SETTINGS_MENU_POS, &g_settings.menu_pos, MENU_DISP_POS_OPTIONS, MENU_DISP_POS_OPTIONS_COUNT, true)); miscSettings.addItem( new CMenuForwarder(LOCALE_MISCSETTINGS_GENERAL, true, NULL, miscSettingsGeneral, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED) ); //channellist diff --git a/src/system/locals.h b/src/system/locals.h index a0f284d5c..b89d5e764 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -992,6 +992,7 @@ typedef enum { LOCALE_SETTINGS_POS_HIGHER_CENTER, LOCALE_SETTINGS_POS_TOP_LEFT, LOCALE_SETTINGS_POS_TOP_RIGHT, + LOCALE_SETTINGS_MENU_POS, LOCALE_SHUTDOWNTIMER_ANNOUNCE, LOCALE_SHUTDOWN_RECODING_QUERY, LOCALE_SLEEPTIMERBOX_ANNOUNCE, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 6eb2b4965..32857705c 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -992,6 +992,7 @@ const char *locale_real_names[] = { "settings.pos_higher_center", "settings.pos_top_left", "settings.pos_top_right", + "settings.menu_pos", "shutdowntimer.announce", "shutdown.recoding_query", "sleeptimerbox.announce", diff --git a/src/system/settings.h b/src/system/settings.h index 203c046da..02c271a7e 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -67,6 +67,7 @@ struct SNeutrinoSettings int casystem_display; int scrambled_message; int volume_pos; + int menu_pos; //audio int audio_AnalogMode;