summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2011-11-12Removed hiding of button popup when setting the text to emptyYohann Ferreira2-8/+2
The text is never set to an empty string, especially not while the mouse is over the button. The popup will be updated or hidden by mouseMoved anyway. Reviewed-by: Thorbjorn Lindeijer
2011-11-12Removed some Channel and ChannelTab related sillinessThorbjørn Lindeijer1-5/+0
* Channel always has a ChannelTab, so need to check it for null * Removed duplicate handling of 'topic' command * No need to set Channel::mTab twice Reviewed-by: Yohann Ferreira
2011-11-12Fixed the button popup incorrectly shown when loading the window menu.Yohann Ferreira1-3/+1
This was due to a small logic error when setting the popup text. Reviewed-by: Erik Schilling
2011-11-01Merge github.com:mana/manaYohann Ferreira11-38/+30
Conflicts: src/localplayer.cpp src/net/manaserv/beinghandler.cpp src/net/manaserv/charhandler.cpp
2011-10-25Change the wrong, but mostly supported WIN32 macro to the correct _WIN32, ↵Bernd Wachter1-2/+2
enforced by -std=c++0x Reviewed-by: Thorbjørn Lindeijer
2011-10-23Fixed a certain class of Doxygen warningsThorbjørn Lindeijer10-36/+28
All cases of documentation for non-existing parameters are now fixed. Also marked a few getters as 'const', removed some superfluous 'inline' keywords and removed the unused 'forceQuantity' option from ItemContainer. Reviewed-by: Yohann Ferreira
2011-09-28Merge github.com:mana/manaYohann Ferreira5-1/+19
2011-09-29Fixed item popup still visible after closing inventory window.Erik Schilling5-1/+19
Reviewed-by: Bertram.
2011-09-28Small changes requested by o11c - part 2.Yohann Ferreira1-39/+38
Most noticeably I added the shortcut in a popup, even when there are no images to the image buttons in the windowmenu.
2011-09-28Small changes requested by o11c - part 1.Yohann Ferreira2-3/+8
2011-09-28Added true arrows graphics to tab area buttons.Yohann Ferreira2-3/+7
2011-09-28Made the shortcuts link actually use the plural in its caption.Yohann Ferreira1-4/+4
2011-09-28The shortcuts are now refreshed when reassigning keys.Yohann Ferreira3-8/+69
2011-09-28Added icons to the confirm and cancel button of the quit dialog.Yohann Ferreira2-2/+6
This a good example of use for the new graphics and button functionalities.
2011-09-28Fixed back the special window display in a basic but working way.Yohann Ferreira2-1/+4
This to avoid cluttering the gui until Crush has the time to fulfill his issue about those.
2011-09-28Added a naive way to display the window keyboard shortcut.Yohann Ferreira2-10/+31
This is not updated once the keys are reassigned but it will do the trick for now.
2011-09-28Reached the state where the menu bar is now using image buttons.Yohann Ferreira1-7/+7
I had to adapt a bit the images given by Enchilado to do that.
2011-09-28Made the button icon only shown when the icon file is valid.Yohann Ferreira3-9/+9
And falls back to the text based caption otherwise.
2011-09-28Added the setup button icon and optimized the image size.Yohann Ferreira1-1/+1
2011-09-28Changed the Social button to an image one.Yohann Ferreira4-12/+25
I also made the client able to keep the old behaviour, and i changed the button api to not require the icon frames size as it could easily guess them.
2011-09-28Added textpopup on mouse hovering support to buttons.Yohann Ferreira3-2/+74
I added a use of it to the menu buttons.
2011-09-28Small chages requested by o11c - part 2.Yohann Ferreira1-39/+38
Most noticeably i added the shortcut in a popup, even when there are no images to the image buttons in the windowmenu.
2011-09-28Small changes requested by o11c - part 1.Yohann Ferreira2-3/+8
2011-09-16Renamed Map::DebugFlags enumeratorsThorbjørn Lindeijer2-14/+14
Their name is a bit more clear with DEBUG prefix rather than MAP prefix. They're already scoped in the Map class anyway. MAP_NORMAL was changed to DEBUG_NONE to represent no debug flags. Acked-by: Bertram
2011-09-13Renamed Map::DebugFlags enumeratorsThorbjørn Lindeijer2-14/+14
Their name is a bit more clear with DEBUG prefix rather than MAP prefix. They're already scoped in the Map class anyway. MAP_NORMAL was changed to DEBUG_NONE to represent no debug flags. Acked-by: Bertram
2011-08-30Merge branch 'equipment-fix'Yohann Ferreira6-42/+45
2011-08-30Added a way to specify where the equipment boxes will display.Yohann Ferreira1-18/+4
A <box> sub tag was added to the <slot> tag with a x and y parameter to do so.
2011-08-30Made the popup-menu work again for equip/unequip processes.Yohann Ferreira6-24/+41
I disabled the drop from equipment window since it was more simple to implement, and because it seemed useless or even bad for the user experience to me.
2011-08-25Merge branch 'equipment-fix' of github.com:Bertram25/manaYohann Ferreira4-128/+170
2011-08-19Merge git://gitorious.org/~bertram/mana/mana-equipment-fix into equipment-fixYohann Ferreira4-128/+170
2011-08-18Removed unnecessary warning about windows that might be movedThorbjørn Lindeijer1-9/+3
Keeping the windows within the visible area is expected behavior, no matter for how long it has been broken. It makes little sense to warn about expected behavior.
2011-08-18Removed unnecessary warning about windows that might be movedThorbjørn Lindeijer1-9/+3
Keeping the windows within the visible area is expected behavior, no matter for how long it has been broken. It makes little sense to warn about expected behavior.
2011-08-18Improved equip slots description for both protocols.Yohann Ferreira3-5/+30
Now the itempopup is also telling what equip slot is under the mouse pointer.
2011-08-18Made the equipment window not use server specific code again.Yohann Ferreira2-104/+87
I also made the number of slots displayed taken from the equip.xml file for manaserv.
2011-08-18Made the client able to successfully equip/unequip!Yohann Ferreira1-20/+13
2011-08-18Add functions to make the item popup able to tell whether the itemYohann Ferreira2-1/+42
is equipped or not. It will be used quite soon to visually see the slot names.
2011-08-11Added true arrows graphics to tab area buttons.Yohann Ferreira2-3/+7
2011-08-11Made the shortcuts link actually use the plural in its caption.Yohann Ferreira1-4/+4
2011-08-11The shortcuts are now refreshed when reassigning keys.Yohann Ferreira3-8/+69
2011-08-11Added icons to the confirm and cancel button of the quit dialog.Yohann Ferreira2-2/+6
This a good example of use for the new graphics and button functionalities.
2011-08-11Fixed back the special window display in a basic but working way.Yohann Ferreira2-1/+4
This to avoid cluttering the gui until Crush has the time to fulfill his issue about those.
2011-08-11Added a naive way to display the window keyboard shortcut.Yohann Ferreira2-10/+31
This is not updated once the keys are reassigned but it will do the trick for now.
2011-08-11Reached the state where the menu bar is now using image buttons.Yohann Ferreira1-7/+7
I had to adapt a bit the images given by Poison ivy to do that.
2011-08-11Made the button icon only shown when the icon file is valid.Yohann Ferreira3-9/+9
And falls back to the text based caption otherwise.
2011-08-11Added the setup button icon and optimized the image size.Yohann Ferreira1-1/+1
2011-08-11Changed the Social button to an image one.Yohann Ferreira4-12/+25
I also made the client able to keep the old behaviour, and i changed the button api to not require the icon frames size as it could easily guess them.
2011-08-11Added textpopup on mouse hovering support to buttons.Yohann Ferreira3-2/+74
I added a use of it to the menu buttons.
2011-06-22Merge branch 'master' of gitorious.org:~bertram/mana/mana-any-square-tile-sizeYohann Ferreira5-12/+26
2011-06-19More C++0x Windows compilation fixes.Philipp Sehmisch1-4/+5
Another case of M_PI being no longer defined in cmath.h _MAX_PATH doesn't work anymore, but there is still MAX_PATH putenv doesn't work anymore, so I replaced it with a function from the WINApi Reviewed-by: Thorbjorn
2011-06-17First pass on removing tile hard coded values.Yohann Ferreira5-12/+26
Every files has been checked against the hard coded 32 values except the map.cpp file. I also added convenience functions in the Game class, centralized the default item icon size, and removed two unused defines in being.cpp.