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

update settings: don't use sms input for update.url

Browse Source 
Now use file browser to select url config file, but you can
define USE_SMS_INPUT in update_settings.h to use old methode.
The SMS-Methode is not very user friendly
This commit is contained in:
Thilo Graf
2012-06-08 23:16:34 +02:00
parent 643b9f485f
commit be0ea475b7
2 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gui/update_settings.cpp
View File

@@ -46,12 +46,16 @@
CUpdateSettings::CUpdateSettings() CUpdateSettings::CUpdateSettings()
{ {
width = w_max (40, 10); width = w_max (40, 10);
input_url_file = new CStringInputSMS(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""<EFBFBD>$%&/()=?-. "); #ifdef USE_SMS_INPUT
input_url_file = new CStringInputSMS(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_url_file, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789!""$%&/()=?-. ");
#endif
} }
CUpdateSettings::~CUpdateSettings() CUpdateSettings::~CUpdateSettings()
{ {
#ifdef USE_SMS_INPUT
delete input_url_file; delete input_url_file;
#endif
} }
#define FLASHUPDATE_UPDATEMODE_OPTION_COUNT 2 #define FLASHUPDATE_UPDATEMODE_OPTION_COUNT 2
@@ -76,6 +80,20 @@ int CUpdateSettings::exec(CMenuTarget* parent, const std::string &actionKey)
return res; return res;
} }
#ifndef USE_SMS_INPUT
else if(actionKey == "select_url_config_file"){
CFileBrowser fileBrowser;
CFileFilter fileFilter;
fileFilter.addFilter("conf");
fileFilter.addFilter("urls");
fileBrowser.Filter = &fileFilter;
if (fileBrowser.exec("/var/etc") == true)
strncpy(g_settings.softupdate_url_file, fileBrowser.getSelectedFile()->Name.c_str(), 31);
return res;
}
#endif
res = initMenu(); res = initMenu();
return res; return res;
@@ -88,17 +106,21 @@ int CUpdateSettings::initMenu()
w_upsettings.addIntroItems(LOCALE_FLASHUPDATE_SETTINGS); w_upsettings.addIntroItems(LOCALE_FLASHUPDATE_SETTINGS);
CMenuForwarder * fw_url_input = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_mode, g_settings.softupdate_url_file, input_url_file, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); #ifdef USE_SMS_INPUT
CMenuForwarder * fw_update_dir = new CMenuForwarder(LOCALE_EXTRA_UPDATE_DIR, !g_settings.softupdate_mode, g_settings.update_dir , this, "update_dir", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); CMenuForwarder * fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_mode, g_settings.softupdate_url_file, input_url_file, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
#else
CMenuForwarder * fw_url = new CMenuForwarder(LOCALE_FLASHUPDATE_URL_FILE, g_settings.softupdate_mode, g_settings.softupdate_url_file, this, "select_url_config_file", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED);
#endif
CMenuForwarder * fw_update_dir = new CMenuForwarder(LOCALE_EXTRA_UPDATE_DIR, !g_settings.softupdate_mode, g_settings.update_dir , this, "update_dir", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
CUrlConfigSetupNotifier url_setup_notifier(fw_url_input, fw_update_dir); CUrlConfigSetupNotifier url_setup_notifier(fw_url, fw_update_dir);
CMenuOptionChooser *oj_mode = new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true, &url_setup_notifier); CMenuOptionChooser *oj_mode = new CMenuOptionChooser(LOCALE_FLASHUPDATE_UPDATEMODE, &g_settings.softupdate_mode, FLASHUPDATE_UPDATEMODE_OPTIONS, FLASHUPDATE_UPDATEMODE_OPTION_COUNT, true, &url_setup_notifier);
w_upsettings.addItem(oj_mode); w_upsettings.addItem(oj_mode);
w_upsettings.addItem(GenericMenuSeparatorLine); w_upsettings.addItem(GenericMenuSeparatorLine);
w_upsettings.addItem(fw_update_dir); w_upsettings.addItem(fw_update_dir);
w_upsettings.addItem(fw_url_input); w_upsettings.addItem(fw_url);
int res = w_upsettings.exec (NULL, ""); int res = w_upsettings.exec (NULL, "");

7
src/gui/update_settings.h
View File

@@ -35,7 +35,12 @@
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#include "gui/update.h" #include "gui/update.h"
// #define USE_SMS_INPUT
#ifdef USE_SMS_INPUT
#include "gui/widget/stringinput.h" #include "gui/widget/stringinput.h"
#endif
#include <string> #include <string>
@@ -56,7 +61,9 @@ class CUpdateSettings : public CMenuTarget
int initMenu(); int initMenu();
CFlashExpert *fe; CFlashExpert *fe;
#ifdef USE_SMS_INPUT
CStringInputSMS *input_url_file; CStringInputSMS *input_url_file;
#endif
public: public:
CUpdateSettings(); CUpdateSettings();