From 595a3957e0aa94ca2036055874e03a6d05f67114 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 19 Feb 2011 11:28:08 -0800 Subject: Reorder store option to the top, so it is more useful. ManaPlus: small fixes. --- src/gui/popupmenu.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src/gui/popupmenu.cpp') diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 3f5ec478b..8dc392efc 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -1092,6 +1092,24 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (isInventory) { + if (InventoryWindow::isStorageActive()) + { + mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); + if (cnt > 1) + { + if (cnt > 10) + { + mBrowserBox->addRow(strprintf("@@store 10|%s@@", + _("Store 10"))); + } + mBrowserBox->addRow(strprintf("@@store half|%s@@", + _("Store half"))); + mBrowserBox->addRow(strprintf("@@store all|%s@@", + _("Store all"))); + } + mBrowserBox->addRow("##3---"); + } + if (item->isEquipment()) { if (item->isEquipped()) @@ -1110,22 +1128,6 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item, if (Net::getInventoryHandler()->canSplit(item)) mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split"))); - if (InventoryWindow::isStorageActive()) - { - mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store"))); - if (cnt > 1) - { - if (cnt > 10) - { - mBrowserBox->addRow(strprintf("@@store 10|%s@@", - _("Store 10"))); - } - mBrowserBox->addRow(strprintf("@@store half|%s@@", - _("Store half"))); - mBrowserBox->addRow(strprintf("@@store all|%s@@", - _("Store all"))); - } - } } // Assume in storage for now // TODO: make this whole system more flexible, if needed -- cgit v1.2.3-60-g2f50