diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-26 03:18:49 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-26 03:18:49 +0300 |
| commit | e72b6ef50fbfe22d3c856e06db00d55643a4c148 (patch) | |
| tree | 5d01d23e312dd28408d98c6146518e964f81c23b /src/gui/windows | |
| parent | ee12ea1f64fe7efcbfdba7e663de1663f3367834 (diff) | |
| download | mv-e72b6ef50fbfe22d3c856e06db00d55643a4c148.tar.gz mv-e72b6ef50fbfe22d3c856e06db00d55643a4c148.tar.bz2 mv-e72b6ef50fbfe22d3c856e06db00d55643a4c148.tar.xz mv-e72b6ef50fbfe22d3c856e06db00d55643a4c148.zip | |
Add inventory type for mail view window. Not allow drag from/to this inventory.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/maileditwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/mailviewwindow.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 183c775ee..7a3716291 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -128,6 +128,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Npc: case InventoryType::Vending: case InventoryType::MailEdit: + case InventoryType::MailView: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -320,6 +321,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : case InventoryType::Npc: case InventoryType::Vending: case InventoryType::MailEdit: + case InventoryType::MailView: case InventoryType::Craft: case InventoryType::TypeEnd: break; @@ -383,6 +385,7 @@ void InventoryWindow::storeSortOrder() const case InventoryType::Npc: case InventoryType::Vending: case InventoryType::MailEdit: + case InventoryType::MailView: case InventoryType::Craft: case InventoryType::TypeEnd: default: @@ -832,6 +835,7 @@ void InventoryWindow::close() case InventoryType::Npc: case InventoryType::Vending: case InventoryType::MailEdit: + case InventoryType::MailView: case InventoryType::Craft: case InventoryType::TypeEnd: break; diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp index 5dfa769f6..64391e8ae 100644 --- a/src/gui/windows/maileditwindow.cpp +++ b/src/gui/windows/maileditwindow.cpp @@ -74,7 +74,7 @@ MailEditWindow::MailEditWindow() : mMoneyField(new IntTextField(this, 0, 0, settings.enableNewMailSystem ? INT_MAX : 10000000)), mMessageField(new TextField(this)), - mInventory(new Inventory(InventoryType::Mail, + mInventory(new Inventory(InventoryType::MailEdit, settings.enableNewMailSystem ? -1 : 1)), mItemContainer(new ItemContainer(this, mInventory)), mItemScrollArea(new ScrollArea(this, mItemContainer, diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index e1b3a16de..6a55f6a2e 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::MailEdit, itemsCount)), + mInventory(new Inventory(InventoryType::MailView, itemsCount)), mItemContainer(new ItemContainer(this, mInventory)), mItemScrollArea(new ScrollArea(this, mItemContainer, fromBool(getOptionBool("showitemsbackground"), Opaque), |