summaryrefslogtreecommitdiff
path: root/src/gui/trade.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-05-23Fixed a few strings for better translationKess Vargavind1-1/+1
Just a few notes that would help us translators immensly: * Please do not split one sentence into several strings * Please try to refrain from inserting extra spaces into the strings (cherry picked from commit 9712489ef67f95d6a5fa1fc3102bb7c4ee6a1f59)
2009-05-06Clean up the bypass code for the ItemAmountWindowJared Adams1-9/+2
2009-05-03Moved strprintf into stringutils.{h,cpp}Bjørn Lindeijer1-1/+0
2009-04-29Removed underscores from some non-conforming filenamesBjørn Lindeijer1-1/+1
We don't use underscores in the filenames generally, and let's be consistent on that matter.
2009-04-22FIx trading under eAthenaJared Adams1-5/+3
2009-04-21Trade system - Removing debug informationsblue1121-2/+2
Remove forgotten debug information on the GUI
2009-04-21Trade systemblue1121-17/+46
Handler & GUI modification, to make the three steps systems working. Protocol changes for the same reason Player.cpp changes because it uses the cancel method which signature has changed
2009-04-19Made ItemContainer wrap items depending on its width againBjørn Lindeijer1-3/+7
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-15Merge the trade dialogJared Adams1-80/+40
2009-04-07Moved basic widgets into the gui/widgets directoryBjørn Lindeijer1-5/+5
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-04-06Add TMWServ's SkillHandlerJared Adams1-3/+2
Also namespace both Player- and TradeHandlers
2009-04-03Fill in TMWServ's TradeHandlerJared Adams1-39/+5
Also started temparary implementation of the Net::getXHandler() methods and started using them.
2009-04-02Fixed number of trade window slotsBjørn Lindeijer1-7/+4
On eAthena you can only trade up to 10 items at a time. For now I don't care whether tmwserv would handle more, we'll unify that later. It's not so nice anyway to hardcode the number of rows and columns in my opinion.
2009-03-31Implement a few more handlers for eAthenaJared Adams1-33/+35
Party, skill, and trade handlers made for eAthena.
2009-03-30Fix a bug in tradeJared Adams1-2/+3
There's still an offset problem that I can't figure out.
2009-03-27Moved the inventory and storage offset handling into netcodeBjørn Lindeijer1-7/+4
No need to complicate the item containers and inventory classes with a silly offset used by the eAthena server. Also fixed the logToStandardOut option by reading it from the config after the configuration has been initialized.
2009-03-27Clean up of most of the Network pointersBjørn Lindeijer1-5/+0
Now that messages can be sent without requiring a pointer to the Network instance, a lot of cleanup was possible.
2009-03-27Made eAthena's Network class statically accessibleBjørn Lindeijer1-12/+6
Now the instance doesn't need to be passed into the MessageOut class anymore. Expect a lot of cleanup in the next commit.
2009-03-27Clean up chat and chat tabs some moreJared Adams1-1/+1
2009-03-27Fixed inventory window. Not resizable though.Bjørn Lindeijer1-11/+3
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-26Major clean up of ChatTab handlingJared Adams1-1/+1
ChatTabs now manage their own adding/removal from the chat window, which lost most of it's chat related messages. Whisper handling is stil done by the ChatWindow, but it no longer manages any other tabs. ChannelTab handling is now the sole responsability of the Channels they are attached to. The general tab is handled by Game.
2009-03-27Compile warning fixesBjørn Lindeijer1-1/+1
Mostly unsigned/signed mismatches and an unused variable.
2009-03-26Remove redundancy, fix variable names and other code cleanupsBjørn Lindeijer1-11/+12
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-33/+54
Conflicts: A lot of files.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-46/+37
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-47/+123
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-19Simplified trading dialog controls.Ira Rice1-28/+19
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-18Fix up the NPC interraction widnows a bitJared Adams1-13/+14
2009-03-14Made a label class derived from the guichan label class which utilizesIra Rice1-5/+4
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-11Don't move stuff from inventory when not visibleJared Adams1-0/+2
2009-03-11Don't move stuff from inventory when not visibleJared Adams1-0/+2
2009-03-10Extended window layout to take relative positions, as well as offsets toIra Rice1-1/+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-09Add an interface for eAthena's storage systemJared Adams1-2/+2
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+0
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-1/+0
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-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-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-3/+5
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 fixesBjørn Lindeijer1-2/+2
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-2/+0
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-2/+2
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/+0
(merged from eAthena client)
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-2/+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-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-16Revised trade window to use the window layout code. Loosely based on theIra Rice1-94/+67
trade window in TMW's mainline client. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-08Made remaining dialogs translatableBjørn Lindeijer1-2/+2
Most strings are now translatable. Please do report any missing ones. Strings excluded from translation are anything that gets written to the log file or is otherwise not shown in the GUI. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-01-06Added support for internationalizationIra Rice1-25/+18
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>