merged upstream changes

This commit is contained in:
Siddharth committed 2013-10-27 11:48:59 +05:30
commit b50f4d4287
60 files changed
+775 -424

No files matched your search

+2 -6
View File
@@ -29,7 +29,7 @@ void TouchControlVisibilityScreen::CreateViews() {
LinearLayout *topBar = new LinearLayout(ORIENT_HORIZONTAL);
I18NCategory *di = GetI18NCategory("Dialog");
topBar->Add(new Choice(di->T("Back")))->OnClick.Handle<TouchControlVisibilityScreen>(this, &TouchControlVisibilityScreen::OnBack);
topBar->Add(new Choice(di->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
topBar->Add(new Choice(di->T("Toggle All")))->OnClick.Handle(this, &TouchControlVisibilityScreen::OnToggleAll);
vert->Add(topBar);
@@ -94,12 +94,8 @@ void TouchControlVisibilityScreen::CreateViews() {
}
}
UI::EventReturn TouchControlVisibilityScreen::OnBack(UI::EventParams &e) {
screenManager()->finishDialog(this, DR_OK);
void TouchControlVisibilityScreen::onFinish(DialogResult result) {
g_Config.Save();
return UI::EVENT_DONE;
}
UI::EventReturn TouchControlVisibilityScreen::OnToggleAll(UI::EventParams &e) {