GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return

This commit is contained in:
[CST] Focus
2012-05-07 15:37:02 +04:00
parent 1f8710013c
commit 0319c4faad
26 changed files with 1 additions and 33 deletions

View File

@@ -191,7 +191,6 @@ int CAudioSetup::showAudioSetup()
#endif
int res = audioSettings->exec(NULL, "");
audioSettings->hide();
selected = audioSettings->getSelected();
delete audioSettings;
return res;

View File

@@ -119,7 +119,6 @@ int CAudioPlayerSetup::showAudioPlayerSetup()
audioplayerSetup->addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true ));
int res = audioplayerSetup->exec (NULL, "");
audioplayerSetup->hide ();
delete audioplayerSetup;
return res;
}

View File

@@ -99,7 +99,6 @@ int CCECSetup::showMenu()
cec->addItem(cec2);
int res = cec->exec(NULL, "");
cec->hide();
delete cec;
return res;

View File

@@ -78,7 +78,6 @@ int CInfoMenu::showMenu()
info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, &streaminfo, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
int res = info->exec(NULL, "");
info->hide();
delete info;
return res;
}

View File

@@ -230,7 +230,6 @@ int CKeybindSetup::showKeySetup()
keySettings->addItem(new CMenuForwarder(LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC, true, g_settings.repeat_genericblocker, &keySettings_repeat_genericblocker));
int res = keySettings->exec(NULL, "");
keySettings->hide();
//check if rc hardware selection has changed before leaving the menu
if (org_remote_control_hardware != g_settings.remote_control_hardware) {

View File

@@ -227,7 +227,6 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
personalize->addPersonalizedItems();
res = media->exec(NULL, "");
media->hide();
delete media;
delete personalize;

View File

@@ -95,7 +95,6 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
mediaSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_NAME, true, NULL, &asetup, "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
int res = mediaSetup->exec (NULL, "");
mediaSetup->hide ();
selected = mediaSetup->getSelected();
delete mediaSetup;
return res;

View File

@@ -212,7 +212,6 @@ int CMiscMenue::showMiscSettingsMenu()
#endif /*CPU_FREQ*/
int res = misc_menue.exec(NULL, "");
misc_menue.hide();
delete fanNotifier;
delete sectionsdConfigNotifier;
return res;

View File

@@ -325,7 +325,6 @@ int CNetworkSetup::showNetworkSetup()
while(true) {
int res = menu_return::RETURN_EXIT;
ret = networkSettings->exec(NULL, "");
networkSettings->hide();
if (settingsChanged())
res = saveChangesDialog();

View File

@@ -444,7 +444,6 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
int res = osd_menu->exec(NULL, "");
osd_menu->hide();
delete osd_menu;
delete radiotextNotifier;
@@ -709,7 +708,6 @@ int COsdSetup::showContextChanlistMenu()
#endif
int res = menu_chanlist->exec(NULL, "");
menu_chanlist->hide();
cselected = menu_chanlist->getSelected();
delete menu_chanlist;
return res;

View File

@@ -105,7 +105,6 @@ int COsdLangSetup::showLocalSetup()
//langNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
int res = localSettings->exec(NULL, "");
localSettings->hide();
delete localSettings;
delete langNotifier;
return res;

View File

@@ -107,6 +107,5 @@ void CParentalSetup::showParentalSetup()
plock->addItem( new CMenuForwarder(LOCALE_PARENTALLOCK_CHANGEPIN, true, g_settings.parentallock_pincode, &pinChangeWidget));
plock->exec(NULL, "");
plock->hide();
delete plock;
}

View File

@@ -324,7 +324,6 @@ int CPersonalizeGui::ShowPersonalizationMenu()
pMenu->addItem(new CMenuForwarder(LOCALE_PERSONALIZE_HELP, true, NULL, this, "personalize_help", CRCInput::RC_help, NEUTRINO_ICON_BUTTON_HELP));
int res = pMenu->exec(NULL, "");
pMenu->hide();
delete pMenu;
delete uMenu;
delete pinChangeWidget;
@@ -517,7 +516,6 @@ int CPersonalizeGui::ShowMenuOptions(const int& widget)
}
options_count = pm->getItemsCount();
int res = pm->exec (NULL, "");
pm->hide ();
delete pm;
return res;
}

View File

@@ -111,7 +111,6 @@ int CPictureViewerSetup::showPictureViewerSetup()
picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_DEFDIR, true, g_settings.network_nfs_picturedir, this, "picturedir"));
int res = picviewsetup->exec(NULL, "");
picviewsetup->hide();
delete picviewsetup;
return res;
}

View File

@@ -90,7 +90,6 @@ int CProxySetup::showProxySetup()
mn->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, &softUpdate_proxypass, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
int res = mn->exec(NULL, "");
mn->hide();
delete mn;
return res;
}

View File

@@ -214,7 +214,6 @@ int CRecordSetup::showRecordSetup()
recordingSettings->addItem(new CMenuForwarder(LOCALE_RECORDINGMENU_APIDS, true, NULL, &recordingaAudioSettings, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE));
int res = recordingSettings->exec(NULL, "");
recordingSettings->hide();
delete recordingSettings;
delete RecordingSafetyNotifier;
delete APIDNotifier;

View File

@@ -409,7 +409,6 @@ int CScanSetup::showScanMenu()
}
int res = settings->exec(NULL, "");
settings->hide();
//delete satSelect;
delete satOnOff;
@@ -517,7 +516,6 @@ int CScanSetup::showFrontendSetup(int number)
setupMenu->addItem(new CMenuForwarder(LOCALE_MOTORCONTROL_HEAD, true, NULL, this, "satfind", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
int res = setupMenu->exec(NULL, "");
setupMenu->hide();
feselected = setupMenu->getSelected();
/* add configured satellites to satSelect in case they changed */
@@ -569,7 +567,6 @@ int CScanSetup::showScanMenuLnbSetup()
}
if(count) {
res = sat_setup->exec(NULL, "");
sat_setup->hide();
for (int i = 0; i < count; i++)
delete tmp[i];
}
@@ -686,7 +683,6 @@ int CScanSetup::showScanMenuSatFind()
sat_findMenu->addItem(new CMenuForwarder(LOCALE_MOTORCONTROL_HEAD, allow_start, NULL, &mcontrol, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
int res = sat_findMenu->exec(NULL, "");
sat_findMenu->hide();
delete sat_findMenu;
return res;
}

View File

@@ -161,7 +161,6 @@ int CSettingsManager::showMenu()
mset->addItem(new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER));
int res = mset->exec(NULL, "");
mset->hide();
delete resetNotifier;
delete mset;
return res;

View File

@@ -84,7 +84,6 @@ int CSleepTimerWidget::exec(CMenuTarget* parent, const std::string &actionKey)
}
int ret = inbox->exec (NULL, "");
inbox->hide ();
delete inbox;
/* exit pressed, cancel timer setup */

View File

@@ -114,7 +114,6 @@ int CSoftwareUpdate::showSoftwareUpdate()
softUpdate->addItem(new CMenuForwarder(LOCALE_FLASHUPDATE_CHECKUPDATE, true, NULL, &flash, "", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW ));
int res = softUpdate->exec (NULL, "");
softUpdate->hide ();
delete softUpdate;
return res;
}

View File

@@ -334,7 +334,6 @@ void CTestMenu::showTestMenu()
//TestMenu->addItem(new CMenuForwarderNonLocalized("22 Khz OFF", true, NULL, this, "22koff"));
TestMenu->exec(NULL, "");
TestMenu->hide();
selected = TestMenu->getSelected();
delete TestMenu;
}

View File

@@ -174,7 +174,6 @@ int CThemes::Show()
}
int res = themes.exec(NULL, "");
themes.hide();
if (file_name.length() > 1) {
saveFile((char*)((std::string)USERDIR + file_name + FILE_PREFIX).c_str());

View File

@@ -134,7 +134,6 @@ int CUserMenuSetup::showSetup()
}
int res = ums->exec(NULL, "");
ums->hide();
return res;
}

View File

@@ -135,7 +135,6 @@ int CVfdSetup::showSetup()
vfds->addItem(lcd_clock_channelname_menu);
int res = vfds->exec(NULL, "");
vfds->hide();
delete vfds;
return res;

View File

@@ -243,7 +243,6 @@ int CVideoSettings::showVideoSetup()
videosetup->addItem(vs_videomodes_fw); //video modes submenue
int res = videosetup->exec(NULL, "");
videosetup->hide();
selected = videosetup->getSelected();
delete videosetup;
return res;

View File

@@ -75,7 +75,6 @@ void CZapitSetup::showMenu()
zapit->addItem(zapit2 = new CMenuForwarder(LOCALE_ZAPITSETUP_LAST_RADIO , !g_settings.uselastchannel, g_settings.StartChannelRadio, &select, "radio", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW ));
zapit->exec(NULL, "");
zapit->hide();
delete zapit;
}
@@ -175,7 +174,6 @@ void CSelectChannelWidget::InitZapitChannelHelper(CZapitClient::channelsMode mod
}
}
mctv.exec (NULL, "");
mctv.hide ();
// delete dynamic created objects
for(unsigned int count=0;count<toDelete.size();count++)