mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/keybind_setup: fix painted key name after use loadkeys conf

Browse Source
This commit is contained in:
Jacek Jendrzej
2019-03-24 16:15:41 +01:00
parent 54885c0f56
commit 27c03b02b4
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/keybind_setup.cpp
View File

@@ -100,13 +100,16 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey)
if (fileBrowser.exec(CONFIGDIR) == true) { if (fileBrowser.exec(CONFIGDIR) == true) {
CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str()); CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str());
printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str()); printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str());
for (int i = 0; i < KEYBINDS_COUNT; i++){
keychooser[i]->reinitName();
}
} }
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
else if(actionKey == "savekeys") { else if(actionKey == "savekeys") {
CFileBrowser fileBrowser; CFileBrowser fileBrowser;
fileBrowser.Dir_Mode = true; fileBrowser.Dir_Mode = true;
if (fileBrowser.exec("/media") == true) { if (fileBrowser.exec(CONFIGDIR) == true) {
std::string fname = "keys.conf"; std::string fname = "keys.conf";
CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname); CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname);
sms->exec(NULL, ""); sms->exec(NULL, "");

5
src/gui/widget/keychooser.cpp
View File

@@ -52,6 +52,11 @@ void CKeyChooser::paint()
CMenuWidget::paint(); CMenuWidget::paint();
} }
void CKeyChooser::reinitName()
{
keyName = CRCInput::getKeyName(*key);
}
int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &) int CKeyChooserItem::exec(CMenuTarget* parent, const std::string &)
{ {
neutrino_msg_t msg; neutrino_msg_t msg;

2
src/gui/widget/keychooser.h
View File

@@ -39,7 +39,7 @@ class CKeyChooser : public CMenuWidget
public: public:
CKeyChooser(unsigned int * const Key, const neutrino_locale_t title, const std::string & Icon = ""); CKeyChooser(unsigned int * const Key, const neutrino_locale_t title, const std::string & Icon = "");
~CKeyChooser(); ~CKeyChooser();
void reinitName();
void paint(); void paint();
const std::string & getKeyName(){return keyName;}; const std::string & getKeyName(){return keyName;};
}; };