summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.cpp
AgeCommit message (Collapse)AuthorFilesLines
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-04Went through the gui folder and revised the include statements to notIra Rice1-3/+1
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-28Consolidated setMinWidth into textWrap, since all lines are dependantIra Rice1-12/+2
upon knowing what dimension they have to wrap to or beat in order for text wrapping to work. By adding this to be initiated at the same time as the text wrapping is done, this should decrease visual artifacts caused by not initializing it properly to begin with. Also made the item popups compact to the minimum dimension. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Moved NPC text back to using the textbox. Rationale is that the textboxIra Rice1-13/+27
code is in much better shape than the browserbox code at the moment, and that the move to using the browserbox was a bit silly, as textbox already wraps. 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-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-20Fixed window transparency in NPC text (because the browser box was toldIra Rice1-1/+1
to be opaque, the text area in the NPC window wasn't transparent, and was rather noticeable using Aethyra's color scheme, cause it shows up as white) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Removed the now uneeded add calls, which I accidently left in twoIra Rice1-3/+0
commits ago. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Reflowed NPC text dialog to use the layout code, so that window resizingIra Rice1-6/+11
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-20Switch the NPC text dialog over to a BrowserBoxJared Adams1-32/+14
2009-01-06Added support for internationalizationIra Rice1-2/+4
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-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-1/+0
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-06Fixed NPC dialogs so that they properly wrap. Broken by the last cherryIra Rice1-0/+5
commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Fixed wrapping in some cases, removed draw methodBjørn Lindeijer1-13/+8
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Fixed wrapping in some cases, removed draw methodBjørn Lindeijer1-15/+8
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Made NPC dialogues resizeable.Ira Rice1-4/+33
(cherry picked from Aethyra commit 81299ca9acc39dec62e1e504781721ad0db0d471) Conflicts: src/gui/inventorywindow.cpp src/gui/npc_text.cpp
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-11-01Made NPC dialogues resizeable.Ira Rice1-8/+33
2008-10-25Made the ok dialogue use code that's similar to the speech bubble, so Ira Rice1-1/+2
that it can take advantage of the text box's wrapping code.
2008-10-10Did a little bit of code cleanup (mostly from TMW changes) as well as Ira Rice1-0/+2
properly implemented line wrapping. Now, there are no more visual artifacts for speech boxes, and it always chooses the most optimal box size (which required that npc_text use it also. Do any other gui classes use the textbox class?).
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-04-16Restored the text wrapping in TextBox, since it was based on overriding aBjørn Lindeijer1-4/+4
method that is no longer virtual in Guichan 0.8.0 (gcn::TextBox::setText()).
2007-01-14Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).Bjørn Lindeijer1-2/+2
2006-08-13Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updatesBjørn Lindeijer1-1/+1
from the 0.1.0 branch.
2006-03-09Made the Button ctor accept eventId and action listener.Björn Steinbrink1-4/+1
2006-02-01Simplified button creation code in some windows. Fixed a bug where the game ↵Björn Steinbrink1-1/+2
crashes if there's a message dialog from a npc that no longer exists. Reverted properties to private.
2006-01-22Merged NETWORK branch (includes BEING_OVERHAUL).Björn Steinbrink1-13/+10
2005-10-20Added garbage collection to the ScrollArea class. Fixed slider not being ↵Björn Steinbrink1-5/+0
updated in the item amount box when the buttons are used.
2005-10-18Added automatic widget cleanup to the window class.Björn Steinbrink1-2/+0
2005-10-16Rename {read,write}{Byte,Short,Long} to {read,write}Int{8,16,32}.Björn Steinbrink1-2/+2
2005-10-09* Made Sprite into an interface implemented by both FloorItem and Being, whichBjørn Lindeijer1-6/+9
hook themselves into the map on construction. The improved fringe layer is working as expected now. * Made sure TMW compiles without warnings even when using "-Wconversion -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups. * Added two new small tilesets that contain the desert tiles that are twice and three times the height of a normal tile. One well in new_3-1 has been converted to use the new double tiles for testing purposes.
2005-09-19Got rid of writeSet() calls.Eugenio Favalli1-2/+0
2005-09-17Completed transition to use MessageOut.Eugenio Favalli1-2/+8
2005-09-13Merged with SDL_NET_TEST branch.Björn Steinbrink1-8/+10
2005-06-05Implemented wrapping for textbox (still could use a small fix) and made deathBjørn Lindeijer1-23/+6
notice dialog release modal focus immediately.
2005-05-05Added text wrapping to NPC dialog.Aaron Marks1-3/+22
2005-03-20TMW now uses latest Guichan CVS, and doesn't work with Guichan 0.2.0 anymore!Bjørn Lindeijer1-1/+1
Also fixed a crash on clicking wallpaper in login phase.
2005-03-03Separated graphic/graphic.cpp into graphics.cpp and engine.cpp.Bjørn Lindeijer1-0/+1
2005-02-23Committed patch by Mra, which fixes multiple NPCs talks in one window andBjørn Lindeijer1-0/+1
moves the action listener used with BuySellDialog into that class.
2005-01-08Well improved window container and window widgets a bit, and made a startBjørn Lindeijer1-2/+2
on support for modal dialogs. Still some issues to work out. Tell me if you experience something unsettling.
2005-01-05Removed bugging cancel button from npc dialog and fixed npc sprites.Bjørn Lindeijer1-2/+5
2004-12-30Subclassed ListBox and TextBox for a little better visual appearance.Bjørn Lindeijer1-1/+2
2004-12-29Ported the npc text dialog and some other small updates.Bjørn Lindeijer1-0/+75
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 13:08:25 +0000