diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-26 02:02:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-26 02:02:43 +0300 |
| commit | ee12ea1f64fe7efcbfdba7e663de1663f3367834 (patch) | |
| tree | a4461d79b2ef5a2a4bd498e2063c78a4c9fe1cf6 /src/gui | |
| parent | 651dee7fb3c45ed18c490dc039677daed1c33aa9 (diff) | |
| download | manaplus-ee12ea1f64fe7efcbfdba7e663de1663f3367834.tar.gz manaplus-ee12ea1f64fe7efcbfdba7e663de1663f3367834.tar.bz2 manaplus-ee12ea1f64fe7efcbfdba7e663de1663f3367834.tar.xz manaplus-ee12ea1f64fe7efcbfdba7e663de1663f3367834.zip | |
Rename InventoryType::Mail into InventoryType::MailEdit.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 8 | ||||
| -rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 2ba797bf9..6d4dc8432 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1701,7 +1701,7 @@ void PopupMenu::showPopup(Window *const parent, case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -2814,7 +2814,7 @@ void PopupMenu::addItemMenu(const Item *const item, case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 26c6e2e06..f71a7e35a 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -661,7 +661,7 @@ void ItemContainer::mousePressed(MouseEvent &event) case InventoryType::Cart: src = DragDropSource::Cart; break; - case InventoryType::Mail: + case InventoryType::MailEdit: src = DragDropSource::Mail; break; case InventoryType::Craft: @@ -768,7 +768,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) case InventoryType::Npc: dst = DragDropSource::Npc; break; - case InventoryType::Mail: + case InventoryType::MailEdit: dst = DragDropSource::Mail; break; case InventoryType::Cart: diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index cd688be9b..183c775ee 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -127,7 +127,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -319,7 +319,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: break; @@ -382,7 +382,7 @@ void InventoryWindow::storeSortOrder() const case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -831,7 +831,7 @@ void InventoryWindow::close() case InventoryType::Trade: case InventoryType::Npc: case InventoryType::Vending: - case InventoryType::Mail: + case InventoryType::MailEdit: case InventoryType::Craft: case InventoryType::TypeEnd: break; diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index d99fd602f..e1b3a16de 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -81,7 +81,7 @@ MailViewWindow::MailViewWindow(const MailMessage *const message, // TRANSLATORS: mail view window label mMessageLabel(new Label(this, strprintf("%s %s", _("Message:"), message->text.c_str()))), - mInventory(new Inventory(InventoryType::Mail, itemsCount)), + mInventory(new Inventory(InventoryType::MailEdit, itemsCount)), mItemContainer(new ItemContainer(this, mInventory)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), |