From 7d68ba851291f4ae8d8c200ab2a87dc5f48ece61 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 20 Mar 2011 12:33:04 +0000 Subject: [PATCH] fix special character for ssid git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1315 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1c7c35af1a7be5ead427407af031592d6d9db0d3 Author: Jacek Jendrzej Date: 2011-03-20 (Sun, 20 Mar 2011) Origin message was: ------------------ -fix special character for ssid git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1315 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/eventlist.cpp | 2 +- src/gui/network_setup.cpp | 5 ++--- src/gui/widget/stringinput.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 543c66faf..554e9101f 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -1217,7 +1217,7 @@ int CEventFinderMenu::showMenu(void) m_search_channelname ==""; } - CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-.: "); + CStringInputSMS stringInput(LOCALE_EVENTFINDER_KEYWORD,m_search_keyword, 20, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'"); CMenuForwarder* mf2 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD ,true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_1 ); CMenuOptionChooser* mo0 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST , m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, NULL, CRCInput::RC_2); diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index ed3684e2b..a1ee235cd 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -227,9 +227,8 @@ void CNetworkSetup::showNetworkSetup() //auto start CMenuOptionChooser* o1 = new CMenuOptionChooser(LOCALE_NETWORKMENU_SETUPONSTARTUP, &network_automatic_start, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-. "); - CStringInputSMS * networkSettings_key = new CStringInputSMS(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-. "); - + CStringInputSMS * networkSettings_ssid = new CStringInputSMS(LOCALE_NETWORKMENU_SSID, &network_ssid, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789 -_/()<>=+.,:!?\\'"); + CStringInputSMS * networkSettings_key = new CStringInputSMS(LOCALE_NETWORKMENU_PASSWORD, &network_key, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.! "); //dhcp network_dhcp = networkConfig->inet_static ? NETWORK_DHCP_OFF : NETWORK_DHCP_ON; diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index 201e690e6..c2ec05a2b 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -616,7 +616,7 @@ void CStringInputSMS::initSMS(const char * const Valid_Chars) { last_digit = -1; // no key pressed yet const char CharList[10][11] = { "0 -_/()<>=", // 10 characters - "1+.,:!?\\", + "1+.,:!?\\'",//' for c't search ;) "abc2รค", "def3", "ghi4",