summaryrefslogtreecommitdiff
path: root/src/gui/buy.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-23/+58
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-24/+45
Conflicts: Many files.
2009-03-23Move all TMWServ-specific code to net/tmwservJared Adams1-1/+1
Also fix several instances where the same net handler was being used for both servers, and a few other related oddities.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-4/+20
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-19Forgot to remove some now unneeded includes.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Made the plus and minus buttons in the last commit look moreIra Rice1-2/+2
aesthetically pleasing. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Reformatted the item amount window and the buy/sell windows so thatIra Rice1-19/+43
their guis are similarly laid out. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-19Make sure positionable dialogs start out centeredJared Adams1-0/+1
2009-03-18Fix up the NPC interraction widnows a bitJared Adams1-0/+7
2009-03-18Fix up the NPC interraction widnows a bitJared Adams1-0/+7
2009-03-14Made a label class derived from the guichan label class which utilizesIra Rice1-6/+5
the palette colors. While technically, this can be accomplished through other means, it's rather clumsy overall, and is prone to introducing in programmer errors. This commit finally catches every case where text is used, and applies the text color from the color dialog to each of them appropriately. Signed-off-by: Ira Rice <irarice@gmail.com>
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-02-26Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+1
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-26Fixed an error in shoplistboxes as identified by Octalot.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-25Fix NPC handling to not need a handle on the NPCJared Adams1-1/+1
The Being ID is used instead, as that is all that was ever really needed.
2009-02-23Hide the buy/sell dialogs when there is no NPCJared Adams1-0/+7
2009-02-18Centralize current_npc cleanupJared Adams1-1/+1
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-15Add configurable units systemJared Adams1-2/+6
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-09Mostly whitespace and formatting changesBjørn Lindeijer1-7/+6
(merged from eAthena client)
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 NPC text dialog to use the layout code, so that window resizingIra Rice1-1/+1
isn't broken. Also added a string which should be translated in the Buy class for substitution by gettext. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Used layout for buy, sell and item amount dialogsBjørn Lindeijer1-61/+16
(changes by Guillaume Melquiond, merged from the mainline client)
2009-01-06Added support for internationalizationIra Rice1-15/+20
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-11-22While there is still a small visual artifact, this patch fixes the buy Ira Rice1-3/+0
window so that it properly reports how much money you have.
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-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-08-18Fixed bug with GP shown being incorrect after purchasing from NPC vendor ↵Lloyd Bryant1-5/+5
(code from TMW svn, r4449)
2008-07-25Applied patch by ElvenProgrammer to remember window locations between sessionsLloyd Bryant1-0/+1
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer1-7/+8
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines Moved item icon from ItemInfo class to the Item class, so that it can be loaded on demand. Results in faster startup time and reduced memory usage. ........
2008-04-11Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but becauseBjørn Lindeijer1-3/+2
of quite a bit of GUI differences there were additional changes and probably additional issues. You have been warned. ;) Merged revisions 4045-4049,4051-4059 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for gcn::TabbedArea usage) ........ r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines Fixed problem with row height in shop list box. ........
2008-04-07Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except forBjørn Lindeijer1-8/+8
gcn::TabbedArea usage)
2007-11-15Moved item icon from ItemInfo class to the Item class, so that it can be loadedBjørn Lindeijer1-6/+8
on demand. Results in faster startup time and reduced memory usage.
2007-10-28Separated auto-resizing into two categories: "set" and "add". Removed ↵Guillaume Melquiond1-1/+1
useless code.
2007-10-27Improved layout handler to support trees of nested arrays. Needed for ↵Guillaume Melquiond1-1/+0
converting and fixing the trade window.
2007-10-21Converted sell dialog box to layout handler. Removed some useless code from ↵Guillaume Melquiond1-4/+1
buy dialog box.
2007-10-21Converted dialog box to layout handler.Guillaume Melquiond1-55/+16
2007-10-19Marked buy and sell dialog boxes as translatable.Guillaume Melquiond1-16/+18
2007-09-19Merged 0.0 changes from revision 3362 to 3580 to trunk.Bjørn Lindeijer1-47/+78
2007-09-12Allowed selection of items that cannot be afforded, so that their descriptionsBjørn Lindeijer1-9/+7
are still accessible. Also made sure the player's money value of ShopItemList gets updated.
2007-08-28Made buy dialog resizable and added a WindowListener class for listening forBjørn Lindeijer1-24/+55
window resize and move events.
2007-08-19buy/sell fixed minimum quantity 1.Joshua Langley1-15/+17
2007-08-14Enabled buying and selling from NPCs.Guillaume Melquiond1-9/+3
2007-08-13Started conversion of buy/sell to new server.Guillaume Melquiond1-2/+2
2007-06-04Merged 0.0 changes from revision 3234 to 3317 to trunk.Bjørn Lindeijer1-70/+47
2007-06-02Some cleanup of buy/sell dialog code.Bjørn Lindeijer1-68/+44