Ticket #1521: confirm.diff

src/interface/Mainfrm.cpp

@@ -791 +791 @@
 
 void CMainFrame::OnClose(wxCloseEvent &event)
 {
+    if (GetState()->IsRemoteConnected() && GetState()->IsRemoteIdle())
+    {
+        CConditionalDialog dlg(this, CConditionalDialog::confirmexit, CConditionalDialog::yesno);
+        dlg.SetTitle(_("Close FileZilla"));
+
+        dlg.AddText(_("You are still connected to a server."));
+        dlg.AddText(_("Do you really want to close FileZilla?"));
+
+        if (!dlg.Run())
+            return;
+    }
+
     if (!m_bQuit)
     {
         RememberSizes();

src/interface/sitemanager.cpp

@@ -6 +6 @@
 #include "filezillaapp.h"
 #include "ipcmutex.h"
 #include "wrapengine.h"
+#include "conditionaldialog.h"
 
 std::map<int, CSiteManagerItemData*> CSiteManager::m_idMap;
 
@@ -671 +672 @@
     wxTreeItemId item = pTree->GetSelection();
     if (!item.IsOk() || item == pTree->GetRootItem() || item == m_ownSites || IsPredefinedItem(item))
         return;
-        
+
+    CConditionalDialog dlg(this, CConditionalDialog::sitemanager_confirmdelete, CConditionalDialog::yesno);
+    dlg.SetTitle(_("Delete Site Manager entry"));
+
+    dlg.AddText(_("Do you really want to delete selected entry?"));
+
+    if (!dlg.Run())
+        return;
+
     pTree->Delete(item);
 }
 

src/interface/conditionaldialog.h

@@ -13 +13 @@
     enum DialogType
     {
         rawcommand_quote,
-        viewhidden
+        viewhidden,
+        confirmexit,
+        sitemanager_confirmdelete
     };
 
     CConditionalDialog(wxWindow* parent, enum DialogType type, enum Modes mode, bool checked = false);