mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-24 03:39:43 +00:00
Code Issues Releases Wiki Activity

Add missing confirmation dialog for deleting map notes

Browse source
This commit is contained in:
scrawl 2014-09-07 03:18:01 +02:00
parent 6e2673daf3
commit 271c921cf8
4 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwgui/confirmationdialog.cpp
View file

@ -13,12 +13,15 @@ namespace MWGui
mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ConfirmationDialog::onOkButtonClicked); mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ConfirmationDialog::onOkButtonClicked);
} }
void ConfirmationDialog::open(const std::string& message) void ConfirmationDialog::open(const std::string& message, const std::string& confirmMessage, const std::string& cancelMessage)
{ {
setVisible(true); setVisible(true);
mMessage->setCaptionWithReplacing(message); mMessage->setCaptionWithReplacing(message);
mCancelButton->setCaptionWithReplacing(cancelMessage);
mOkButton->setCaptionWithReplacing(confirmMessage);
int height = mMessage->getTextSize().height + 72; int height = mMessage->getTextSize().height + 72;
mMainWidget->setSize(mMainWidget->getWidth(), height); mMainWidget->setSize(mMainWidget->getWidth(), height);

2
apps/openmw/mwgui/confirmationdialog.hpp
View file

@ -9,7 +9,7 @@ namespace MWGui
{ {
public: public:
ConfirmationDialog(); ConfirmationDialog();
void open(const std::string& message); void open(const std::string& message, const std::string& confirmMessage="#{sOk}", const std::string& cancelMessage="#{sCancel}");
virtual void exit(); virtual void exit();
typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void; typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;

10
apps/openmw/mwgui/mapwindow.cpp
View file

@ -17,6 +17,7 @@
#include "../components/esm/globalmap.hpp" #include "../components/esm/globalmap.hpp"
#include "widgets.hpp" #include "widgets.hpp"
#include "confirmationdialog.hpp"
namespace namespace
{ {
@ -567,6 +568,15 @@ namespace MWGui
} }
void MapWindow::onNoteEditDelete() void MapWindow::onNoteEditDelete()
{
ConfirmationDialog* confirmation = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
confirmation->open("#{sDeleteNote}", "#{sYes}", "#{sNo}");
confirmation->eventCancelClicked.clear();
confirmation->eventOkClicked.clear();
confirmation->eventOkClicked += MyGUI::newDelegate(this, &MapWindow::onNoteEditDeleteConfirm);
}
void MapWindow::onNoteEditDeleteConfirm()
{ {
mCustomMarkers.deleteMarker(mEditingMarker); mCustomMarkers.deleteMarker(mEditingMarker);

1
apps/openmw/mwgui/mapwindow.hpp
View file

@ -198,6 +198,7 @@ namespace MWGui
void onMapDoubleClicked(MyGUI::Widget* sender); void onMapDoubleClicked(MyGUI::Widget* sender);
void onNoteEditOk(); void onNoteEditOk();
void onNoteEditDelete(); void onNoteEditDelete();
void onNoteEditDeleteConfirm();
void onNoteDoubleClicked(MyGUI::Widget* sender); void onNoteDoubleClicked(MyGUI::Widget* sender);
void globalMapUpdatePlayer(); void globalMapUpdatePlayer();