From b1d2dc573da58236e8a972bbab7a52345aeee8c1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 3 Apr 2012 02:57:47 +0300
Subject: Add option clear to context menu in drops window.

---
 src/dropshortcut.cpp  | 13 ++++++++++---
 src/dropshortcut.h    |  2 ++
 src/gui/popupmenu.cpp | 10 +++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 4deb8901d..c3ba98a27 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -43,9 +43,7 @@ DropShortcut::DropShortcut():
     mItemSelected(-1),
     mItemColorSelected(1)
 {
-    for (int i = 0; i < DROP_SHORTCUT_ITEMS; i++)
-        mItems[i] = -1;
-
+    clear();
     load();
     mLastDropIndex = 0;
 }
@@ -225,3 +223,12 @@ void DropShortcut::setItem(int index)
     mItemColors[index] = mItemColorSelected;
     save();
 }
+
+void DropShortcut::clear()
+{
+    for (int i = 0; i < DROP_SHORTCUT_ITEMS; i++)
+    {
+        mItems[i] = -1;
+        mItemColors[i] = 1;
+    }
+}
diff --git a/src/dropshortcut.h b/src/dropshortcut.h
index 6a0ef49e9..ea11f34e0 100644
--- a/src/dropshortcut.h
+++ b/src/dropshortcut.h
@@ -141,6 +141,8 @@ class DropShortcut
          */
         void dropItems(int cnt = 1);
 
+        void clear();
+
     private:
 
         /**
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index d37e8f351..d896b9420 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1403,13 +1403,10 @@ void PopupMenu::handleLink(const std::string &link,
             }
         }
     }
-    else if (link == "load old drop shortcuts")
+    else if (link == "clear drops")
     {
         if (dropShortcut)
-        {
-            dropShortcut->load(true);
-            dropShortcut->save();
-        }
+            dropShortcut->clear();
     }
     else if (link == "edit spell" && mSpell)
     {
@@ -2022,8 +2019,7 @@ void PopupMenu::showDropPopup(int x, int y, Item *item)
         mBrowserBox->addRow("chat", _("Add to chat"));
         mBrowserBox->addRow("##3---");
     }
-    mBrowserBox->addRow("load old drop shortcuts",
-        _("Load old drop shortcuts"));
+    mBrowserBox->addRow("clear drops", _("Clear drop window"));
     mBrowserBox->addRow("##3---");
     mBrowserBox->addRow("cancel", _("Cancel"));
 
-- 
cgit v1.2.3-60-g2f50