summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-10Extended window layout to take relative positions, as well as offsets toIra Rice1-2/+1
that position. This makes it so that when resolutions are changed, the default locations stay relative to the window's position, and not the 800x600 screen resolution. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-10Don't center the NPC interraction dialogsJared Adams1-1/+0
Use the last location the user gave instead. Also, do the same for the inventory dialog.
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+3
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice1-0/+3
as some other optimizations that I could see that cut down on some unneeded redraws, which in turn improved frame rates slightly. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer1-0/+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-0/+1
No need to include localplayer.h from inventorywindow.h
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-15Merge branch 'aethyra/master'Bjørn Lindeijer1-7/+0
2009-02-15Don't make window name translatableBjørn Lindeijer1-1/+1
The window name is used in the configuration file, in contrast to the window title.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Deleted some unneeded delete statements.Ira Rice1-7/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Add configurable units systemJared Adams1-8/+10
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-09Fixed width of the weight label, as noticed by Grimmjow.Ira Rice1-4/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-3/+3
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer1-2/+1
(merged from eAthena client)
2009-02-07Some more include cleanups.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04A few more pointers which weren't getting deleted.Ira Rice1-0/+12
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-30Moved weight and slots back to the top of the inventory window.Ira Rice1-6/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Fixed a few default window sizes so that they look better for first timeIra Rice1-1/+1
client loaders. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Cleaned up inventory includes, as well as adding right click popup menusIra Rice1-0/+1
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-20/+35
progress bars. Suggestion made by Forge. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Fixed use button so that it starts out at the maximum width it willIra Rice1-1/+11
need. TODO: Modify layout rendering to be able to detect resizes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Repaired item weight and slot reporting.Ira Rice1-13/+14
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Modified the inventory window to be more TMW translation friendly.Ira Rice1-10/+15
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer1-1/+1
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-59/+34
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-3/+3
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-57/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Fixed Item Popup window transparency (double setting of the skin)Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15A little bit of code cleanup/simplification.Ira Rice1-1/+0
TODO: Figure out how the itempopup transparency is broken and fix it (broken on code import). Best guess would be that the window is attached to a widget which is then attached to a window, causing a break in updates to the transparency code. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Integrated the ItemPopup class from Legends of Mazzeroth.Ira Rice1-0/+1
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-1/+4
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-06Added support for internationalizationIra Rice1-20/+23
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-17Reintroduced window name propertyBjørn Lindeijer1-1/+2
Still used in the eAthena client and it seems saner to me to have it.
2008-12-14Fixed inconsistency in default window sizesBjørn Lindeijer1-1/+1
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> (cherry picked from eAthena branch, commit 72f5288682f46af1f7c04c002172178c880e060b) Conflicts: src/gui/chat.cpp src/gui/equipmentwindow.cpp src/gui/inventorywindow.cpp src/gui/ministatus.cpp src/gui/setup.cpp src/gui/skill.cpp src/gui/trade.cpp src/gui/window.cpp
2008-12-08Compacted the inventory window layout.Ira Rice1-20/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer1-1/+1
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-2/+2
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Converted DOS to UNIX newlinesBjørn Lindeijer1-2/+1
2008-12-01Fixed a compilation error caused by path relevance.Philipp Sehmisch1-2/+3
2008-11-29Imported patch that Fate made on TMW which which changes the item Ira Rice1-2/+2
container to guarantee that the inventory window always reports what the player has correctly, getting rid of the stale item references that could occur from time to time.
2008-11-22Inventory window now displays amount of slots usedNikos Giagtzoglou1-4/+15
Patch by Nikos, with some improvements by vargavind.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-4/+1
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?
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?
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 16:14:10 +0000