From f236ea1fc9f11aaebc063c0bcf4610a91744cb3f Mon Sep 17 00:00:00 2001 From: Gde Made Novan Priambhada Date: Wed, 9 Aug 2017 04:19:28 +0800 Subject: [PATCH] group chat options and set enabled ptr --- UI/ChatScreen.cpp | 2 +- UI/GameSettingsScreen.cpp | 9 ++++++--- android/ab.cmd | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/UI/ChatScreen.cpp b/UI/ChatScreen.cpp index 817aff9d70..a8619780ed 100644 --- a/UI/ChatScreen.cpp +++ b/UI/ChatScreen.cpp @@ -35,9 +35,9 @@ void ChatMenu::CreatePopupContents(UI::ViewGroup *parent) { } #endif chatEdit_->OnEnter.Handle(this, &ChatMenu::OnSubmit); - bottom->Add(new Button(n->T("Send")))->OnClick.Handle(this, &ChatMenu::OnSubmit); #elif defined(__ANDROID__) bottom->Add(new Button(n->T("Chat Here"),new LayoutParams(FILL_PARENT, WRAP_CONTENT)))->OnClick.Handle(this, &ChatMenu::OnSubmit); + bottom->Add(new Button(n->T("Send")))->OnClick.Handle(this, &ChatMenu::OnSubmit); #endif if (g_Config.bEnableQuickChat) { diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index deb06ec15e..2813fae774 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -619,12 +619,14 @@ void GameSettingsScreen::CreateViews() { networkingSettings->Add(new CheckBox(&g_Config.bEnableAdhocServer, n->T("Enable built-in PRO Adhoc Server", "Enable built-in PRO Adhoc Server"))); networkingSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, n->T("Change Mac Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress); networkingSettings->Add(new PopupSliderChoice(&g_Config.iPortOffset, 0, 60000, n->T("Port offset", "Port offset(0 = PSP compatibility)"), 100, screenManager())); + + + networkingSettings->Add(new ItemHeader(ms->T("Chat"))); networkingSettings->Add(new CheckBox(&g_Config.bEnableNetworkChat, n->T("Enable network chat", "Enable network chat"))); static const char *chatButtonPositions[] = { "Bottom Left", "Bottom Center","Bottom Right","Top Left","Top Center", "Top Right","Center Left","Center Right" }; - networkingSettings->Add(new PopupMultiChoice(&g_Config.iChatButtonPosition, n->T("Chat Button Position"), chatButtonPositions, 0, ARRAY_SIZE(chatButtonPositions), "Chat Button Position", screenManager())); + networkingSettings->Add(new PopupMultiChoice(&g_Config.iChatButtonPosition, n->T("Chat Button Position"), chatButtonPositions, 0, ARRAY_SIZE(chatButtonPositions), "Chat Button Position", screenManager()))->SetEnabledPtr(&g_Config.bEnableNetworkChat); static const char *chatScreenPositions[] = { "Bottom Left", "Bottom Center","Bottom Right","Top Left","Top Center", "Top Right" }; - networkingSettings->Add(new PopupMultiChoice(&g_Config.iChatScreenPosition, n->T("Chat Screen Position"), chatScreenPositions, 0, ARRAY_SIZE(chatScreenPositions), "Chat Screen Position", screenManager())); - + networkingSettings->Add(new PopupMultiChoice(&g_Config.iChatScreenPosition, n->T("Chat Screen Position"), chatScreenPositions, 0, ARRAY_SIZE(chatScreenPositions), "Chat Screen Position", screenManager()))->SetEnabledPtr(&g_Config.bEnableNetworkChat); networkingSettings->Add(new ItemHeader(co->T("QuickChat", "Quick Chat"))); networkingSettings->Add(new CheckBox(&g_Config.bEnableQuickChat, co->T("QuickChat", "Enable Quick Chat"))); #if !defined(MOBILE_DEVICE) && !defined(USING_QT_UI) // TODO: Add all platforms where KEY_CHAR support is added @@ -671,6 +673,7 @@ void GameSettingsScreen::CreateViews() { qc5->OnClick.Handle(this, &GameSettingsScreen::OnChangeQuickChat4); qc5->SetEnabledPtr(&g_Config.bEnableQuickChat); #endif + ViewGroup *toolsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); toolsScroll->SetTag("GameSettingsTools"); LinearLayout *tools = new LinearLayout(ORIENT_VERTICAL); diff --git a/android/ab.cmd b/android/ab.cmd index c2506530a9..b176024cf9 100644 --- a/android/ab.cmd +++ b/android/ab.cmd @@ -5,6 +5,6 @@ copy ..\assets\langregion.ini assets\langregion.ini copy ..\assets\compat.ini assets\compat.ini copy ..\assets\Roboto-Condensed.ttf assets\Roboto-Condensed.ttf copy ..\assets\*.png assets\ -SET NDK=D:\Android\NDK +SET NDK=C:\Android\NDK SET NDK_MODULE_PATH=..\ext;..\ext\native\ext %NDK%/ndk-build -j9 %*