Allow send rename pet chat command without new pet name.

This name will be asked from player.

5 files changed, 133 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f439aedf2..988b3b99f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1103,6 +1103,8 @@ SET(SRCS
     listeners/guiconfiglistener.h
     listeners/guitableactionlistener.cpp
     listeners/guitableactionlistener.h
+    listeners/inputactionreplaylistener.cpp
+    listeners/inputactionreplaylistener.h
     listeners/inventorylistener.h
     events/inputguievent.h
     input/key.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 18acf1956..24ddf07da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,6 +190,8 @@ manaplus_SOURCES += events/actionevent.h \
 	      listeners/guiconfiglistener.h \
 	      listeners/guitableactionlistener.cpp \
 	      listeners/guitableactionlistener.h \
+	      listeners/inputactionreplaylistener.cpp \
+	      listeners/inputactionreplaylistener.h \
 	      listeners/inventorylistener.h \
 	      render/graphics.h \
 	      events/inputguievent.h \
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index 061a7dd6d..7e2c849ac 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -31,12 +31,15 @@
 
 #include "gui/chatconsts.h"
 
+#include "listeners/inputactionreplaylistener.h"
+
 #include "net/chathandler.h"
 #include "net/net.h"
 #include "net/pethandler.h"
 #include "net/serverfeatures.h"
 
 #include "utils/chatutils.h"
+#include "utils/gettext.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
@@ -85,7 +88,15 @@ impHandler(setPetName)
 {
     const std::string args = event.args;
     if (args.empty())
+    {
+        const Being *const pet = getPet();
+        if (!pet)
+            return false;
+        inputActionReplayListener.openDialog(_("Rename your pet"),
+            pet->getName(),
+            InputAction::PET_SET_NAME);
         return false;
+    }
 
     petHandler->setName(args);
     return true;
diff --git a/src/listeners/inputactionreplaylistener.cpp b/src/listeners/inputactionreplaylistener.cpp
new file mode 100644
index 000000000..1a948f029
--- /dev/null
+++ b/src/listeners/inputactionreplaylistener.cpp
@@ -0,0 +1,63 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "listeners/inputactionreplaylistener.h"
+
+#include "gui/windows/editdialog.h"
+
+#include "input/inputmanager.h"
+
+#include "debug.h"
+
+InputActionReplayListener inputActionReplayListener;
+
+InputActionReplayListener::InputActionReplayListener() :
+    ActionListener(),
+    mDialog(nullptr)
+{
+}
+
+void InputActionReplayListener::openDialog(const std::string &caption,
+                                           const std::string &text,
+                                           const InputAction::Type action0)
+{
+    mDialog = new EditDialog(caption, text, "OK");
+    mDialog->postInit();
+    mDialog->addActionListener(this);
+    mAction = action0;
+}
+
+void InputActionReplayListener::action(const ActionEvent &event)
+{
+    if (event.getId() != "OK")
+    {
+        mDialog = nullptr;
+        mAction = InputAction::NO_VALUE;
+        return;
+    }
+    if (mDialog)
+    {
+        inputManager.executeChatCommand(mAction,
+            mDialog->getMsg(),
+            nullptr);
+        mDialog = nullptr;
+    }
+    mAction = InputAction::NO_VALUE;
+}
diff --git a/src/listeners/inputactionreplaylistener.h b/src/listeners/inputactionreplaylistener.h
new file mode 100644
index 000000000..97447a4e5
--- /dev/null
+++ b/src/listeners/inputactionreplaylistener.h
@@ -0,0 +1,55 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LISTENERS_INPUTACTIONREPLAYLISTENER_H
+#define LISTENERS_INPUTACTIONREPLAYLISTENER_H
+
+#include "listeners/actionlistener.h"
+
+#include "input/inputaction.h"
+
+#include "localconsts.h"
+
+class EditDialog;
+
+class InputActionReplayListener final : public ActionListener
+{
+    public:
+        InputActionReplayListener();
+
+        A_DELETE_COPY(InputActionReplayListener)
+
+        void action(const ActionEvent &event) override final;
+
+        void setDialog(EditDialog *const dialog)
+        { mDialog = dialog; }
+
+        void openDialog(const std::string &caption,
+                        const std::string &text,
+                        const InputAction::Type action0);
+
+    protected:
+        EditDialog *mDialog;
+        InputAction::Type mAction;
+};
+
+extern InputActionReplayListener inputActionReplayListener;
+
+#endif  // LISTENERS_INPUTACTIONREPLAYLISTENER_H