From ee91014c48de4512af59dcec1513ef6fe70e6b54 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 22 Nov 2014 15:54:41 +0100 Subject: [PATCH] - align most CKeyboardInput calls to the changes in 88c6640 --- src/gui/bedit/bouqueteditor_bouquets.cpp | 2 +- src/gui/eventlist.cpp | 2 +- src/gui/keybind_setup.cpp | 2 +- src/gui/moviebrowser.cpp | 2 +- src/gui/network_setup.cpp | 8 ++++---- src/gui/nfs.cpp | 10 +++++----- src/gui/proxyserver_setup.cpp | 6 +++--- src/gui/record_setup.cpp | 2 +- src/gui/settings_manager.cpp | 2 +- src/gui/themes.cpp | 2 +- src/gui/timerlist.cpp | 2 +- src/gui/user_menue_setup.cpp | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index f5f6111b5..9501c9cb7 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -527,7 +527,7 @@ std::string CBEBouquetWidget::inputName(const char * const defaultName, const ne { std::string Name = defaultName; - CKeyboardInput * nameInput = new CKeyboardInput(caption, &Name, 29); + CKeyboardInput * nameInput = new CKeyboardInput(caption, &Name); nameInput->exec(this, ""); delete nameInput; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 292557a22..8187a5fc2 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -1357,7 +1357,7 @@ int CEventFinderMenu::showMenu(void) int shortcut = 1; - CKeyboardInput stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20); + CKeyboardInput stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword); CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red); CMenuOptionChooser* mo0 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++)); diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 3806456c9..6bc6da1b8 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -108,7 +108,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey) fileBrowser.Dir_Mode = true; if (fileBrowser.exec("/var/tuxbox") == true) { std::string fname = "keys.conf"; - CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname, 30); + CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname); sms->exec(NULL, ""); std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname; printf("[neutrino keybind_setup] save keys: %s\n", sname.c_str()); diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 727bd42ee..5476c67ad 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3471,7 +3471,7 @@ bool CMovieBrowser::showYTMenu() mainMenu.addItem(GenericMenuSeparatorLine); std::string search = m_settings.ytsearch; - CKeyboardInput stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search, 20); + CKeyboardInput stringInput(LOCALE_MOVIEBROWSER_YT_SEARCH, &search); mainMenu.addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_YT_SEARCH, true, search, &stringInput, NULL, CRCInput::RC_green)); mainMenu.addItem(new CMenuOptionChooser(LOCALE_MOVIEBROWSER_YT_ORDERBY, &m_settings.ytorderby, YT_ORDERBY_OPTIONS, YT_ORDERBY_OPTION_COUNT, true, NULL, CRCInput::RC_nokey, "", true)); sprintf(cnt, "%d", cYTFeedParser::SEARCH); diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 53c23b23a..17a5c5ac7 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -244,7 +244,7 @@ int CNetworkSetup::showNetworkSetup() CIPInput networkSettings_NameServer(LOCALE_NETWORKMENU_NAMESERVER, &network_nameserver, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2); //hostname - CKeyboardInput networkSettings_Hostname(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 30, NULL, NULL, LOCALE_NETWORKMENU_HOSTNAME_HINT1, LOCALE_NETWORKMENU_HOSTNAME_HINT2); + CKeyboardInput networkSettings_Hostname(LOCALE_NETWORKMENU_HOSTNAME, &network_hostname, 0, NULL, NULL, LOCALE_NETWORKMENU_HOSTNAME_HINT1, LOCALE_NETWORKMENU_HOSTNAME_HINT2); //auto start CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); @@ -301,9 +301,9 @@ int CNetworkSetup::showNetworkSetup() if(ifcount > 1) // if there is only one, its probably wired { //ssid - CKeyboardInput * networkSettings_ssid = new CKeyboardInput(LOCALE_NETWORKMENU_SSID, &network_ssid, 30); + CKeyboardInput * networkSettings_ssid = new CKeyboardInput(LOCALE_NETWORKMENU_SSID, &network_ssid); //key - CKeyboardInput * networkSettings_key = new CKeyboardInput(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30); + CKeyboardInput * networkSettings_key = new CKeyboardInput(LOCALE_NETWORKMENU_PASSWORD, &network_key); CMenuForwarder *m9 = new CMenuDForwarder(LOCALE_NETWORKMENU_SSID , networkConfig->wireless, network_ssid , networkSettings_ssid ); CMenuForwarder *m10 = new CMenuDForwarder(LOCALE_NETWORKMENU_PASSWORD , networkConfig->wireless, network_key , networkSettings_key ); CMenuForwarder *m11 = new CMenuForwarder(LOCALE_NETWORKMENU_SSID_SCAN , networkConfig->wireless, NULL, this, "scanssid"); @@ -394,7 +394,7 @@ int CNetworkSetup::showNetworkSetup() void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp) { //prepare ntp input - CKeyboardInput * networkSettings_NtpServer = new CKeyboardInput(LOCALE_NETWORKMENU_NTPSERVER, &g_settings.network_ntpserver, 30, sectionsdConfigNotifier, NULL, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2); + CKeyboardInput * networkSettings_NtpServer = new CKeyboardInput(LOCALE_NETWORKMENU_NTPSERVER, &g_settings.network_ntpserver, 0, sectionsdConfigNotifier, NULL, LOCALE_NETWORKMENU_NTPSERVER_HINT1, LOCALE_NETWORKMENU_NTPSERVER_HINT2); CStringInput * networkSettings_NtpRefresh = new CStringInput(LOCALE_NETWORKMENU_NTPREFRESH, &g_settings.network_ntprefresh, 3,LOCALE_NETWORKMENU_NTPREFRESH_HINT1, LOCALE_NETWORKMENU_NTPREFRESH_HINT2 , "0123456789 ", sectionsdConfigNotifier); diff --git a/src/gui/nfs.cpp b/src/gui/nfs.cpp index 20daf6fb8..ba1348e74 100644 --- a/src/gui/nfs.cpp +++ b/src/gui/nfs.cpp @@ -251,20 +251,20 @@ int CNFSMountGui::menuEntry(int nr) mountMenuEntryW.addIntroItems(); CIPInput ipInput(LOCALE_NFS_IP, &g_settings.network_nfs[nr].ip, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2); - CKeyboardInput dirInput(LOCALE_NFS_DIR, &g_settings.network_nfs[nr].dir, 30); + CKeyboardInput dirInput(LOCALE_NFS_DIR, &g_settings.network_nfs[nr].dir); CMenuOptionChooser *automountInput= new CMenuOptionChooser(LOCALE_NFS_AUTOMOUNT, &g_settings.network_nfs[nr].automount, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true); - CKeyboardInput options1Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options1, 30); + CKeyboardInput options1Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options1); CMenuForwarder *options1_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, NULL, &options1Input); - CKeyboardInput options2Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options2, 30); + CKeyboardInput options2Input(LOCALE_NFS_MOUNT_OPTIONS, &g_settings.network_nfs[nr].mount_options2); CMenuForwarder *options2_fwd = new CMenuForwarder(LOCALE_NFS_MOUNT_OPTIONS, true, NULL, &options2Input); - CKeyboardInput userInput(LOCALE_NFS_USERNAME, &g_settings.network_nfs[nr].username, 30); + CKeyboardInput userInput(LOCALE_NFS_USERNAME, &g_settings.network_nfs[nr].username); CMenuForwarder *username_fwd = new CMenuForwarder(LOCALE_NFS_USERNAME, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &userInput); - CKeyboardInput passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password, 30); + CKeyboardInput passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password); CMenuForwarder *password_fwd = new CMenuForwarder(LOCALE_NFS_PASSWORD, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &passInput); CMACInput macInput(LOCALE_RECORDINGMENU_SERVER_MAC, &g_settings.network_nfs[nr].mac, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2); diff --git a/src/gui/proxyserver_setup.cpp b/src/gui/proxyserver_setup.cpp index 846bd9bc0..25db5d61d 100644 --- a/src/gui/proxyserver_setup.cpp +++ b/src/gui/proxyserver_setup.cpp @@ -81,17 +81,17 @@ int CProxySetup::showProxySetup() neutrino_locale_t subtitle = (menue_title == LOCALE_FLASHUPDATE_PROXYSERVER_SEP ? NONEXISTANT_LOCALE : LOCALE_FLASHUPDATE_PROXYSERVER_SEP); mn->addIntroItems(subtitle); - CKeyboardInput softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 23, NULL, NULL, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2); + CKeyboardInput softUpdate_proxy(LOCALE_FLASHUPDATE_PROXYSERVER, &g_settings.softupdate_proxyserver, 0, NULL, NULL, LOCALE_FLASHUPDATE_PROXYSERVER_HINT1, LOCALE_FLASHUPDATE_PROXYSERVER_HINT2); CMenuForwarder * mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYSERVER, true, g_settings.softupdate_proxyserver, &softUpdate_proxy, NULL, CRCInput::RC_red); mf->setHint("", LOCALE_MENU_HINT_NET_PROXYSERVER); mn->addItem(mf); - CKeyboardInput softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 23, NULL, NULL, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2); + CKeyboardInput softUpdate_proxyuser(LOCALE_FLASHUPDATE_PROXYUSERNAME, &g_settings.softupdate_proxyusername, 0, NULL, NULL, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT1, LOCALE_FLASHUPDATE_PROXYUSERNAME_HINT2); mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYUSERNAME, true, g_settings.softupdate_proxyusername, &softUpdate_proxyuser, NULL, CRCInput::RC_green); mf->setHint("", LOCALE_MENU_HINT_NET_PROXYUSER); mn->addItem(mf); - CKeyboardInput softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 20, NULL, NULL, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2); + CKeyboardInput softUpdate_proxypass(LOCALE_FLASHUPDATE_PROXYPASSWORD, &g_settings.softupdate_proxypassword, 0, NULL, NULL, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT1, LOCALE_FLASHUPDATE_PROXYPASSWORD_HINT2); mf = new CMenuForwarder(LOCALE_FLASHUPDATE_PROXYPASSWORD, true, g_settings.softupdate_proxypassword, &softUpdate_proxypass, NULL, CRCInput::RC_yellow); mf->setHint("", LOCALE_MENU_HINT_NET_PROXYPASS); mn->addItem(mf); diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 81e092a8e..b385c2d3f 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -244,7 +244,7 @@ int CRecordSetup::showRecordSetup() } //filename template - CKeyboardInput* filename_template = new CKeyboardInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 21, NULL, NULL, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2); + CKeyboardInput* filename_template = new CKeyboardInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template, 0, NULL, NULL, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2); CMenuForwarder* ft = new CMenuDForwarder(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, true, g_settings.recording_filename_template, filename_template, NULL, CRCInput::RC_1); ft->setHint("", LOCALE_MENU_HINT_RECORD_FILENAME_TEMPLATE); recordingSettings->addItem(ft); diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index aa2c5d845..948593dd0 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -90,7 +90,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey) if (fileBrowser.exec("/var/tuxbox") == true) { std::string fname = "neutrino.conf"; - CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname, 30); + CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname); sms->exec(NULL, ""); std::string sname = fileBrowser.getSelectedFile()->Name + "/" + fname; diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp index a8e96d31e..3729042cd 100644 --- a/src/gui/themes.cpp +++ b/src/gui/themes.cpp @@ -157,7 +157,7 @@ int CThemes::Show() readThemes(themes); - CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name, 30); + CKeyboardInput nameInput(LOCALE_COLORTHEMEMENU_NAME, &file_name); CMenuForwarder *m1 = new CMenuForwarder(LOCALE_COLORTHEMEMENU_SAVE, true , NULL, &nameInput, NULL, CRCInput::RC_green); if (mkdirhier(USERDIR) && errno != EEXIST) { diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index e9b5af7b3..1733a89f1 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -1224,7 +1224,7 @@ int CTimerList::newTimer() CMenuOptionChooser* m8 = new CMenuOptionChooser(LOCALE_TIMERLIST_STANDBY, &timerNew_standby_on, TIMERLIST_STANDBY_OPTIONS, TIMERLIST_STANDBY_OPTION_COUNT, false); timerNew_message = std::string(timerNew.message); - CKeyboardInput timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30); + CKeyboardInput timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message); CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg ); timerNew_pluginName = "---"; diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 5f7a5e2be..f0922ee2e 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -208,7 +208,7 @@ int CUserMenuSetup::showSetup() ums->addIntroItems(); int old_key = g_settings.usermenu[button]->key; - CKeyboardInput name(LOCALE_USERMENU_NAME, &g_settings.usermenu[button]->title, 20); + CKeyboardInput name(LOCALE_USERMENU_NAME, &g_settings.usermenu[button]->title); CMenuForwarder * mf = new CMenuForwarder(LOCALE_USERMENU_NAME, true, NULL, &name); ums->addItem(mf);