summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.h
AgeCommit message (Collapse)AuthorFilesLines
2010-12-06Removed superfluous #includes taken from checkheaders list.Yohann Ferreira1-1/+0
Resolves: Mana-Mantis #265. Trivial fix.
2010-11-11Have the event system channels use enums instead of stringsChuck Miller1-1/+1
Reviewed-by: Freeyorp
2010-09-25Merge branch '1.0'Thorbjørn Lindeijer1-0/+5
Conflicts: src/actorspritemanager.h src/beingmanager.cpp src/game.cpp src/gui/beingpopup.cpp src/gui/chat.cpp src/gui/chat.h src/gui/inventorywindow.h src/gui/itempopup.cpp src/gui/socialwindow.cpp src/gui/statuswindow.cpp src/gui/widgets/chattab.cpp src/gui/widgets/chattab.h src/net/tmwa/inventoryhandler.cpp src/net/tmwa/partyhandler.cpp src/party.cpp src/sound.cpp src/utils/stringutils.cpp src/utils/stringutils.h
2010-09-08Adding missing updates for buttons in InventoryWindowStefan Dombrowski1-1/+6
Reviewed-by: Thorbjorn
2010-08-26Merged testing branch into master.Yohann Ferreira1-2/+2
2010-08-01Remove isActive methods from NPC dialogs and InventoryWindowJared Adams1-5/+0
Uses counts in PlayerInfo instead. Reviewed-by: Chuck Miller
2010-07-17Modify how attributes and stats are handledChuck Miller1-6/+11
Handling moved from LocalPlayer to PlayerInfo class Event system used to update windows Reviewed-by: Jared Adams
2010-04-25Fix some storage bugsJared Adams1-0/+2
Reviewed-by: Bertram
2010-03-25Remove the type boolean from InventoryWindowJared Adams1-1/+1
This moves inventory/storage type into the Inventory class, having size default to a call to the netcode to get the sive for the given type. Reviewed-by: Chuck Miller
2010-03-25Merge StorageWindow into InventoryWindowJared Adams1-13/+22
Reviewed-by: Chuck Miller
2010-03-25Eliminate the logic methods from InventoryWindow and StorageWindowJared Adams1-15/+11
2010-02-22Modify copyright headersFreeyorp1-1/+2
2010-02-20License header update for The Mana ClientThorbjørn Lindeijer1-4/+3
2010-02-07Updated Copyright year to 2010!Bertram1-1/+1
Also added the update copyright tool from the Wormux Team. ( And not forgetting credit's due. :P )
2010-01-14Auto-store featureBlue Sans Douze1-0/+1
Autostore is a feature that allow you a fast store-retreive by pressing emote key and clicking on the object you want to move. All the stack will be moved that way.
2010-01-12Standardize header orderJared Adams1-2/+2
Also remove some extra new lines and fix eAthena's PartyTab define guards.
2009-11-07More eAthena guild stuffJared Adams1-1/+1
Also some related chenges elsewhere
2009-11-03Remove more _SUPPORT ifdefs and do some cleanupJared Adams1-1/+5
2009-05-14Fixes to outfit windowDennis Friis1-0/+1
- Moved the outfit button onto the Inventory window - Fixed 'unequip first' saving bug Patch by QOAL
2009-05-06Don't show the split button for eAthenaJared Adams1-0/+5
2009-05-06Remove more inventory handling support #ifdefsJared Adams1-8/+0
This also fixes some minor bugs and centralizes some logic.
2009-04-19Made ItemContainer wrap items depending on its width againBjørn Lindeijer1-1/+0
This is instead of taking a fixed number of rows and columns. The inventory and trade window are now resizable again. Other smaller changes: * Don't use bold font for the labels in the item container * Changed "(Eq)" back to "Eq." * Removed the ugly grid lines
2009-04-07Moved basic widgets into the gui/widgets directoryBjørn Lindeijer1-1/+1
In an attempt to make the GUI code a little more structured, basic widgets are now put in gui/widgets. Many includes were also cleaned up.
2009-03-27Fixed inventory window. Not resizable though.Bjørn Lindeijer1-2/+2
Resizing of the inventory window may come back later. Also did some more code cleanups, moving defines to enums, getting rid of eAthena-specific offset handling (to be done in the network layer), etc. Mantis-issue: 666
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+3
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-25Merged relevent changes from TMW commitIra Rice1-3/+3
dfcc6397848d4597b386b688f689352de6c19ae2 Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-5/+5
Conflicts: A lot of files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-6/+37
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer1-1/+1
Using unsigned rarely makes sense, especially when the server doesn't use it either. Other uses of unsigned should be reviewed. In all other cases, int is the fastest integer type on any architecture. Using 8 or 16 bits can basically only be a memory optimization.
2009-03-06Microoptimization in compile speedBjørn Lindeijer1-4/+4
No need to include localplayer.h from inventorywindow.h
2009-02-15Fixed compiler warningsBjørn Lindeijer1-1/+1
Comparison between signed and unsigned integer expressions.
2009-02-15Add configurable units systemJared Adams1-2/+1
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04A few more pointers which weren't getting deleted.Ira Rice1-0/+5
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-1/+0
include anything not needed by that specific widget or window. This appears to have cleaned up system performance a bit on my current setup, where it went from idling on 45% in game with opengl down to 30% now. Also moved iptostring to the tostring header, as importing all of network.h is a little overkill to use that function, and it goes along with the basic functions that are in that header file anyways. TODO: find out a way to get rid of warnings when a class doesn't use this function. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Cleaned up inventory includes, as well as adding right click popup menusIra Rice1-2/+2
to the item shortcut container. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified the inventory window so that weight and slots used are shown asIra Rice1-0/+6
progress bars. Suggestion made by Forge. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Repaired item weight and slot reporting.Ira Rice1-1/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Goofed up the default inventory size that shows with inventory windows.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Modified the inventory window to be more TMW translation friendly.Ira Rice1-1/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-2/+2
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-20Reflowed inventory window to use layout code, as well as fixed the npcIra Rice1-16/+1
list dialog to be more consistant with other windows. Also revised the skill window to default to being only as big as the number of skills listed. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-0/+2
clicking on add to chat to put the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2009-01-16Trimmed out some now unneeded fields in the inventory window.Ira Rice1-6/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-13Added WoW style item adding to chat window. Right Ctrl and Left click to put ↵David Athay1-0/+2
the item in the chat input. Left click the item link to show a popup description, and click the link again to remove the popup.
2008-12-08Compacted the inventory window layout.Ira Rice1-2/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-2/+0
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Whitespace and indentation fixesBjørn Lindeijer1-5/+0
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?