summaryrefslogtreecommitdiff
path: root/src/gui/shortcutcontainer.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-28Fixed the wrapping of item and emoticon shortcut windowsBjørn Lindeijer1-4/+4
Take into account incomplete rows.
2009-03-27Removed all the static initializations of mAlphaBjørn Lindeijer1-1/+1
They happened before the configuration was initialized, so that didn't make any sense. It never showed up as a problem since the value is constantly set in the draw methods anyway.
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-3/+2
Conflicts: Many files.
2009-03-09Add an interface for eAthena's storage systemJared Adams1-3/+2
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-19/+13
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-19/+13
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-15More copyright header fixesBjørn Lindeijer1-1/+1
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-3/+3
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-5/+6
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-3/+3
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-8/+3
Conflicts: A lot of files...
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-04Went through the gui folder and revised the include statements to notIra Rice1-7/+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-30Exposed most gui elements to take alpha values. There are still a fewIra Rice1-1/+3
spots that could also be fixed up as well, but require other methods to fix them (the filled color rectangles on the progress bars, as well as the text on them as well, as an example). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-12Updated the po files so that they shouldn't generate errors for us anyIra Rice1-2/+1
more, as well as a few more code style fixes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-3/+6
code so that only one term is used everywhere (to simplify maintainability), as well as corrected several variable names and comments where there was copy/pasted code, but it wasn't corrected. Also moved emote shortcuts back to where they were originally, to reduce player confusion when the next build comes around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-09Now, the real stage 2.0 of smiley window.Forge1-164/+1
All is done, and all files are now in the tree. (ok, copyright of new files is still opened... do as you want, if you care) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-04Smiley track: step 1.9Forge1-0/+237
The window listing the smiley is ok (F11). The window for shortcut of smiley is in progress (F12) So far, you can use any available smiley directly (mouse interface) and can get a reminder of the keybinding in the shortcut window. Yet to be done (for final step 2.0): * Transform the keybinding into the actual mapping of the shortcut seen in F12 * Drag & Drop from F11 to F12 windows and from F12 to F12 * Code factorisation for class ShortcutContainer and derivatives Item & Smiley (so far, most code is shared, but actually in 3 places, should keep only specific code in leaf-class, and main code in parent) Revision of copyright message (so far, only a cut-paste of inspiring previous files) * Save shortcut-smiley mapping on exit (and reload on start) (with protection against changing smiley-list)