Address feedback

Author: iota97

UI/ControlMappingScreen.cpp

@@ -352,8 +352,8 @@ void KeyMappingDialog::CreatePopupContents(UI::ViewGroup *parent) {
 	LinearLayout *items = new LinearLayoutList(ORIENT_VERTICAL);
 	items->SetSpacing(5.0f);
 
-	static const std::string hint = "Hint: you may map the same key to different PSP button to be able to press multiple one with a single key!";
-	parent->Add(new TextView(km->T(hint), FLAG_DYNAMIC_ASCII | FLAG_WRAP_TEXT, true, new LinearLayoutParams(Margins(10,0))));
+	static const std::string hint = "Hint: Mapping the same key to multiple PSP buttons will press both at once";
+	parent->Add(new TextView(km->T(hint), FLAG_WRAP_TEXT, true, new LinearLayoutParams(Margins(10,0))));
 
 	std::vector<KeyDef> mappings;
 	KeyMap::KeyFromPspButton(pspBtn_, &mappings, false);
@@ -402,8 +402,8 @@ void KeyMappingDialog::CreatePopupContents(UI::ViewGroup *parent) {
 	}
 
 	items->Add(new Spacer(10.0));
-	Choice *b = items->Add(new Choice(di->T("Back"), new LinearLayoutParams(FILL_PARENT, 45)));
-	b->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
+	Button *b = items->Add(new Button(di->T("Cancel"), new LinearLayoutParams(FILL_PARENT, 45)));
+	b->OnClick.Handle<UIScreen>(this, &UIScreen::OnCancel);
 
 	scroll->Add(items);
 	parent->Add(scroll);

UI/ControlMappingScreen.h

@@ -24,6 +24,7 @@
 
 #include "Common/UI/View.h"
 #include "Common/UI/UIScreen.h"
+#include "Common/StringUtils.h"
 #include "Common/Data/Text/I18n.h"
 
 #include "Core/ControlMapper.h"
@@ -62,16 +63,12 @@ class KeyMappingNewKeyDialog : public PopupScreen {
 		pspBtn_ = btn;
 	}
 
-	virtual bool key(const KeyInput &key) override;
-	virtual bool axis(const AxisInput &axis) override;
+	bool key(const KeyInput &key) override;
+	bool axis(const AxisInput &axis) override;
 
 protected:
 	void CreatePopupContents(UI::ViewGroup *parent) override;
 
-	virtual bool FillVertical() const override { return false; }
-	virtual bool ShowButtons() const override { return true; }
-	virtual void OnCompleted(DialogResult result) override {}
-
 private:
 	int pspBtn_;
 	std::function<void(KeyDef)> callback_;
@@ -83,17 +80,14 @@ class BindingChoice;
 class KeyMappingDialog : public PopupScreen {
 public:
 	explicit KeyMappingDialog(int btn, std::shared_ptr<I18NCategory> i18n)
-		: PopupScreen(std::string(i18n->T("Mapping for"))+" "+i18n->T(KeyMap::GetPspButtonName(btn))), pspBtn_(btn) {}
+		: PopupScreen(ReplaceAll(i18n->T("Mapping for %1"), "%1", i18n->T(KeyMap::GetPspButtonName(btn)))), pspBtn_(btn) {}
 
-	virtual bool key(const KeyInput &key) override;
-	virtual bool axis(const AxisInput &axis) override;
+	bool key(const KeyInput &key) override;
+	bool axis(const AxisInput &axis) override;
 
 protected:
 	void CreatePopupContents(UI::ViewGroup *parent) override;
 
-	virtual bool FillVertical() const override { return false; }
-	virtual bool ShowButtons() const override { return true; }
-
 private:
 	int pspBtn_;
 	BindingChoice *selected_;