From dd9d5c89e14682955c9a2f2393f48e4e1a38f102 Mon Sep 17 00:00:00 2001
From: dumaosen <35170687+dumaosen@users.noreply.github.com>
Date: Wed, 29 May 2019 01:14:01 +0800
Subject: [PATCH] Use icons in general_text_field (#3944)

* Use icons in general_text_field

* Use icons for general_text_field

* Add </buttonbar>

* Use 4 spaces
---
 .../dialogs/general_text_field_dialog.stkgui  | 17 +++++----
 .../dialogs/general_text_field_dialog.cpp     | 36 ++++++++++++-------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/data/gui/dialogs/general_text_field_dialog.stkgui b/data/gui/dialogs/general_text_field_dialog.stkgui
index 9bec063dd..22a0fedb7 100644
--- a/data/gui/dialogs/general_text_field_dialog.stkgui
+++ b/data/gui/dialogs/general_text_field_dialog.stkgui
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <stkgui>
-    <div x="2%" y="10%" width="96%" height="80%" layout="vertical-row" >
-        <label id="title" raw_text="Text" proportion="1"/>
+    <div x="2%" y="6%" width="96%" height="88%" layout="vertical-row" >
+        <label id="title" raw_text="Text" height="36%"/>
 
         <spacer height="7%" width="10" />
         <textbox id="textfield" width="75%"  align="center"/>
+        <spacer height="9%" width="10" />
+        
+        <buttonbar id="buttons" height="36%" width="30%" align="center">
 
-        <spacer height="7%" width="20" />
-        <button id="ok" I18N="In the general textfield dialog" text="OK" align="center" proportion="1"/>
+            <icon-button id="ok" width="128" height="128" icon="gui/icons/green_check.png"
+                I18N="In the general textfield dialog" text="OK" align="center"/>
 
-        <spacer height="5%" width="20" />
-        <button id="cancel" I18N="In the general textfield dialog" text="Cancel" align="center" proportion="1"/>
+            <icon-button id="cancel" width="128" height="128" icon="gui/icons/remove.png"
+                I18N="In the general textfield dialog" text="Cancel" align="center"/>
+
+        </buttonbar>
     </div>
 </stkgui>
diff --git a/src/states_screens/dialogs/general_text_field_dialog.cpp b/src/states_screens/dialogs/general_text_field_dialog.cpp
index dd6d2aa52..ade5ad458 100644
--- a/src/states_screens/dialogs/general_text_field_dialog.cpp
+++ b/src/states_screens/dialogs/general_text_field_dialog.cpp
@@ -18,8 +18,9 @@
 #include "states_screens/dialogs/general_text_field_dialog.hpp"
 
 #include "guiengine/engine.hpp"
-#include "guiengine/widgets/button_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/text_box_widget.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/string_utils.hpp"
@@ -59,18 +60,27 @@ GeneralTextFieldDialog::~GeneralTextFieldDialog()
 
 // -----------------------------------------------------------------------------
 GUIEngine::EventPropagation GeneralTextFieldDialog::processEvent(const std::string& eventSource)
-{
-    if (eventSource == "cancel")
+{ 
+    GUIEngine::RibbonWidget* buttons_ribbon =
+        getWidget<GUIEngine::RibbonWidget>("buttons");
+    
+    if(eventSource == "buttons")
     {
-        dismiss();
-        return GUIEngine::EVENT_BLOCK;
-    }
-    else if (eventSource == "ok")
-    {
-        // If validation callback return true, dismiss the dialog
-        if (!m_self_destroy && m_val_cb(m_title, m_text_field))
-            m_self_destroy = true;
-        return GUIEngine::EVENT_BLOCK;
+        const std::string& button =
+	    buttons_ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+
+	if (button == "cancel")
+        {
+            dismiss();
+            return GUIEngine::EVENT_BLOCK;
+        }
+        else if (button == "ok")
+        {
+	    // If validation callback return true, dismiss the dialog
+            if (!m_self_destroy && m_val_cb(m_title, m_text_field))
+                m_self_destroy = true;
+            return GUIEngine::EVENT_BLOCK;
+        }
     }
     return GUIEngine::EVENT_LET;
 }   // processEvent
@@ -79,7 +89,7 @@ GUIEngine::EventPropagation GeneralTextFieldDialog::processEvent(const std::stri
 void GeneralTextFieldDialog::onEnterPressedInternal()
 {
     // Cancel button pressed
-    ButtonWidget* cancel_button = getWidget<ButtonWidget>("cancel");
+    IconButtonWidget* cancel_button = getWidget<IconButtonWidget>("cancel");
     if (GUIEngine::isFocusedForPlayer(cancel_button, PLAYER_ID_GAME_MASTER))
     {
         std::string fake_event = "cancel";