summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-04-22Some string fixesKess Vargavind1-3/+3
2009-04-20Reduced the weight of a few gui windows and popups which wrapped theirIra Rice1-4/+0
TextBoxes in ScrollAreas, but never needed to scroll (and disabled both the horizontal and vertical scrollbars, which makes using a scrollarea kind of pointless to begin with). Signed-off-by: Ira Rice <irarice@gmail.com> Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-04-15Made the PopupMenu a Popup subclassBjørn Lindeijer1-8/+1
It's a natural better fit. The SkinLoader was changed into a singleton, since it's used by both Window and Popup classes.
2009-04-15Fix some memory problemsJared Adams1-0/+1
2009-04-15Trim out (npc) tag from NPC names in PopupMenuTametomo1-2/+8
Generally, it's good to tack on this tag onto nearly everything, but for popup options, it looks a tad tacky. Signed-off-by: Tametomo <irarice@gmail.com> Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-04-15Some PopupMenu cleanups/fixes and additions.Tametomo1-17/+25
Signed-off-by: Tametomo <irarice@gmail.com> Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2009-04-10Fix popup to prevent an item from showing on warpsJared Adams1-1/+2
2009-04-09Remove a segfault when exiting the clientJared Adams1-3/+1
2009-04-09Add a popup menu item to add Being name to chatJared Adams1-11/+10
2009-04-07Moved basic widgets into the gui/widgets directoryBjørn Lindeijer1-1/+2
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-05Implement TMWServ's Admin-, Chat-, and MapHandlersJared Adams1-1/+1
2009-04-02Partially fixed compilation for TMWServ. src/gui/buysell.cpp still needs to ↵Philipp Sehmisch1-1/+1
be fixed.
2009-04-02Add some missing handler for eAthenaJared Adams1-0/+17
Also expand aAthena's AdminHandler
2009-04-01Some cleanupJared Adams1-7/+1
2009-04-01Make eAthena's inventory handlerJared Adams1-4/+0
Also cleanup some related #ifdefs in LocalPlayer.
2009-03-29Fix up eAthena party handling some moreJared Adams1-3/+2
2009-03-27Made eAthena's Network class statically accessibleBjørn Lindeijer1-2/+1
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-27Fixed inventory window. Not resizable though.Bjørn Lindeijer1-2/+4
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/+4
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-27Fixed include structure in resource/ directoryBjørn Lindeijer1-21/+23
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-25A host of code style fixesBjørn Lindeijer1-1/+1
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-6/+6
Conflicts: A lot of files.
2009-03-25Relaxed collision and fringe naming slightly so that they just need toIra Rice1-1/+1
start with collision or fringe, instead of being required to be the same case throughout the beginning of the layer name. Also made a default name for popup menus so that their skins can also be changed by users. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-25Modified skin loading to save and load a skin's XML path, as well asIra Rice1-1/+3
modified the skin loading method to take a default value, in case the value in the configuration file fails to load for one reason or another. While this doesn't directly expose skinning on a per window basis to the user at the moment, it does allow people to change what skins get loaded with which windows now without needing to modify the code. TODO: Determine a decent approach to allowing the user to change their window skins in game, as well as moving all widget skin loading to the skin class (for instance, the button skins, progressbar skins, etc.) so that different skin configurations can use different widget skins. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-5/+5
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-3/+43
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-11Added a new Popup class, which overall is functionally similar to theIra Rice1-5/+5
Window class, but stripped down to the bare essential functionality to just draw and position them. This means no resizing, no close buttons, no ability to move them, etc. This should help reduce the overhead in drawing speech bubbles, as well as other popup type dialogs, but is also not a drop in replacement for the Window class as well. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+1
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-05Removed a check I added in the previous commit which isn't necessary.Ira Rice1-9/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-05Got rid of Sint{8,16,32} and Uint32 for being IDBjørn Lindeijer1-27/+39
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-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-10Removed many pointless comparisons with NULLBjørn Lindeijer1-24/+10
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
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-11Removed many pointless comparisons with NULLBjørn Lindeijer1-10/+10
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-99/+99
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-15/+10
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-91/+91
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-91/+103
Conflicts: Almost everywhere.
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer1-1/+0
(merged from eAthena client)
2009-02-06Sanitized item links so that at no point is the internal representationIra Rice1-11/+10
of the item link shown. This should help make it easier for people to represent the square brackets with item links, and prevent people from forging item links when they never see the internal representation of an item link. Should also reduce confusion from people who haven't upgraded their clients as well, as they wonder what all the junk is around the item name. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-04Went through the gui folder and revised the include statements to notIra Rice1-4/+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-26Removed the description option from right click menus on items. WithIra Rice1-7/+0
item popups, this is no longer useful, as well as it never doing anything to begin with. 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-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-20Added WoW style item adding to chat window. Right click, then leftDavid Athay1-0/+7
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-06Merged layout handler from mainlineBjørn Lindeijer1-1/+1
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
2009-01-06Added support for internationalizationIra Rice1-23/+26
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>
2009-01-06Merged layout handler from mainlineBjørn Lindeijer1-1/+1
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
2009-01-06Added support for internationalizationBjørn Lindeijer1-12/+17
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
2008-12-07Some small updates and reformattingBjørn Lindeijer1-1/+0
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-06 22:03:17 +0000