From 022c033f5709fbb3b2ea24ac40f375552baf0a85 Mon Sep 17 00:00:00 2001 From: ufdada Date: Sun, 20 Oct 2013 17:57:35 +0200 Subject: [PATCH] Translating the Back and Toggle All Buttons Correcting the Toggle all Button function (it was reverting the selection) --- UI/TouchControlVisibilityScreen.cpp | 12 +++++++----- UI/TouchControlVisibilityScreen.h | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/UI/TouchControlVisibilityScreen.cpp b/UI/TouchControlVisibilityScreen.cpp index e447d8edcc..f47aba7dfc 100644 --- a/UI/TouchControlVisibilityScreen.cpp +++ b/UI/TouchControlVisibilityScreen.cpp @@ -28,8 +28,9 @@ void TouchControlVisibilityScreen::CreateViews() { vert->SetSpacing(0); LinearLayout *topBar = new LinearLayout(ORIENT_HORIZONTAL); - topBar->Add(new Choice("Back"))->OnClick.Handle(this, &TouchControlVisibilityScreen::OnBack); - topBar->Add(new Choice("Toggle All"))->OnClick.Handle(this, &TouchControlVisibilityScreen::OnToggleAll); + I18NCategory *di = GetI18NCategory("Dialog"); + topBar->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &TouchControlVisibilityScreen::OnBack); + topBar->Add(new Choice(di->T("Toggle All")))->OnClick.Handle(this, &TouchControlVisibilityScreen::OnToggleAll); vert->Add(topBar); I18NCategory *co = GetI18NCategory("Controls"); @@ -97,8 +98,9 @@ UI::EventReturn TouchControlVisibilityScreen::OnBack(UI::EventParams &e) { } UI::EventReturn TouchControlVisibilityScreen::OnToggleAll(UI::EventParams &e) { - for (auto i = keyToggles.begin(); i != keyToggles.end(); ++i) - *i->second = !*i->second; - + for (auto i = keyToggles.begin(); i != keyToggles.end(); ++i) { + *i->second = toggleSwitch; + } + toggleSwitch = !toggleSwitch; return UI::EVENT_DONE; } diff --git a/UI/TouchControlVisibilityScreen.h b/UI/TouchControlVisibilityScreen.h index 248dffed53..c6b248bfb4 100644 --- a/UI/TouchControlVisibilityScreen.h +++ b/UI/TouchControlVisibilityScreen.h @@ -26,6 +26,7 @@ public: TouchControlVisibilityScreen() { } virtual void CreateViews(); + bool toggleSwitch; protected: virtual UI::EventReturn OnBack(UI::EventParams &e);