summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2012-02-12Fixed inventory displayYohann Ferreira1-3/+6
The filter system added while ago used to override the item slot true order, even when being empty. I now made the draw ordering change only when the filter is in use. Reviewed-by: Thorbjørn Lindeijer
2012-02-12Restored manaserv-less buildsYohann Ferreira3-5/+29
I made sure the manaserv based custom server don't get deleted when running a manaserv-less client session. Reviewed-by: Thorbjørn Lindeijer
2012-02-11Made items equippable by double click in inventoryErik Schilling1-2/+9
+ Fixed disabling of use button when possible Reviewed-by: bjorn.
2012-02-11Fixed issues with the help texts and small NEWS file updatesThorbjørn Lindeijer2-6/+2
* Changes were made to the way BrowserBox does colors that the help files were not adapted to. For example, there is no more ##P for choosing the previous color and applying a color changes it persistently rather than returning to default text color after each line wrap. Rather than changing the behavior of BrowserBox back I've just adapted the help files. * Set a monospace font on the Help window because this was originally the case and the text still relies on that for its layout. * zlib and CSV support was already cherry-picked into 0.5.1 so it is removed from the 0.6.0 changelog. Reviewed-by: Erik Schilling
2012-02-10Arbitrary small code cleanupsThorbjørn Lindeijer3-7/+5
Reviewed-by: Erik Schilling
2012-02-09Fixed wallpaper prescaling issuesThorbjørn Lindeijer1-17/+26
Image::SDLgetScaledImage was changed so that it tries to find an existing scaled version of the image first, and generates it when none exists. When it needs to generate one, this resource is added to the resource manager, partly to avoid duplicating the work later but mainly to keep memory management straightforward. This function also used to leak the scaled SDL_Surface since it wrongly assumed that Image::load would free it. To avoid filling up the memory with scaled wallpapers that are waiting 30 seconds until they will be deleted, the Resource::decRef function was extended with a parameter that allows telling it what to do with orphans. Calling decRef with Resource::DeleteImmediately will delete the resource immediately in case the resource is orphaned. Reviewed-by: Yohann Ferreira
2012-02-09Allow changing fullscreen resolution without restartThorbjørn Lindeijer1-63/+59
Unified Graphics:setFullscreen and Graphics:resize into a single Graphics:changeVideoMode function that tries to restore the existing mode when changing to the new mode didn't work, and exists with an error when that also fails. Split up handling of SDL_VIDEORESIZE and the adapting to new resolution in the Client class, so that the second part could also be called when changing resolution fullscreen mode. The Video tab in the Setup window now also filters out any modes smaller than 640x480 since the game won't properly adapt to that resolution anyway. Reviewed-by: Yohann Ferreira
2012-02-09Setting y-offset back to 3 for status effect iconsStefan Dombrowski1-1/+1
This is broken with current TMW client-data, so it has to be fixed there.
2012-02-09Avoid a crash after selecting one's character linked to emotes.Yohann Ferreira1-3/+3
This happened when the emote shortcut config has got too high ids in it, i.e. when testing different client version on the same host. Reviewed-by: Erik Schilling
2012-02-09Show status effect icons again and position adjustStefan Dombrowski1-2/+3
The icon for #betsanc is still shown too high. Reviewed-by: Ablu, Bertram
2012-02-08Reorganized Video settings so that labels have more spaceThorbjørn Lindeijer1-21/+22
I think it also looks a bit more organized overall. Reviewed-by: Erik Schilling
2012-02-07Made BrowserBox use the recommended line skip for its fontThorbjørn Lindeijer4-48/+73
SDL_ttf provides a separate function for getting the recommended line skip, or the spacing between two lines of text. When rendering multiple lines of text this should be used rather than the visual height of the font. Since the information is only available for TrueTypeFont, a dynamic_cast was used with a fallback on gcn::Font::getHeight. Also made some small tweaks but nothing that really affects performance. Reviewed-by: Yohann Ferreira
2012-02-07Fixed debug window not saving its position and sizeErik Schilling1-2/+2
Spotted-by: cody. Reviewed-by: bjorn.
2012-02-07Fixed color updates of magic barErik Schilling2-0/+18
Resolves: Mana-Mantis #457. Reviewed-by: Bertram.
2012-02-07Fixed the server type selected when modifying a custom server.Yohann Ferreira1-2/+2
Reviewed-by: Erik Schilling
2012-02-06Some cleanups in the initialization of wallpaper pathsThorbjørn Lindeijer2-2/+2
The 'paths' configuration in client-data now overrides any configuration in 'branding', so that it will apply after the updates for a certain server have been downloaded. Also, some isDirectory checks have been removed. When the configuration is wrong, it's probably better to see that there is a problem. Reviewed-by: Yohann Ferreira
2012-02-05Fixed spreading over tabs not spamming too muchErik Schilling1-16/+4
Now announcements will only get displayed on the current tab + on the local tab Reviewed-by: Thorbjørn Lindeijer
2012-02-05Fixed some layout issues with the chat windowThorbjørn Lindeijer2-31/+22
One pixel of the scroll bar wasn't visible since the mWidgetContainer is shifted by one pixel by gcn::TabbedArea::adjustSize, which wasn't being taken into account by our custom mWidgetContainer sizing code. Fixed that by just letting Guichan handle it. Another issue was that the tab scroll arrows were appearing before they were needed, since they took into account their own size when checking whether the tabs had enough space. Finally, a Layout has a default padding of 6 pixels but this is a little much for the chat window. I reduced it to 3 pixels now. Reviewed-by: Erik Schilling
2012-02-03Simplified and made generic the way the pickup is handled.Yohann Ferreira1-2/+7
I also made the range be taken from the server type as for the pickup and npc talk ranges. Last but no least, I fixed the parameters sent with PGMSG_PICKUP to send the (item) position where to pickup at as described in the manaserv protocol. The pickup is still not 100% functional due certainly to two problems: 1. The client item coordinates might not be the exact same as in the server. 2. The client seems to try to pick up the item a bit too soon, probably for the reason given in 1. I'll investigate this in another patch. Reviewed-by: Thorbjørn Lindeijer, Erik Schilling.
2012-02-03Changed the setup button at login stage to use the icon.Yohann Ferreira2-4/+6
I also made the button not readjust its size when deleted to avoid a crash. Reviewed-by: Erik Schilling
2012-02-02Fix to the hair colors and styles handling.Yohann Ferreira2-34/+55
- I made the charCreatedialog handle a possible max permitted color Id and a minimum hair style id for tA. - Added a foundation to later load the styles and colors from the same file, to handle the Mana-issue #224 for manaserv. - Support for non-contiguous hair color and style ids has also been added. - I also replaced the < and > arrow signs with images. Reviewed-by: Ben Longbons, Thorbjørn Lindeijer
2012-01-31Fixed saving the selected server at server connection level.Yohann Ferreira1-1/+3
I also change the serverInfo to use a deque to permit the use of the push_front function. Spotted and reviewed-by: Erik Schilling
2012-01-31Added missing copyright notices.Yohann Ferreira13-1/+15
Reviewed-by: Erik Schilling
2012-01-30Keep a single blank line between NPC textsThorbjørn Lindeijer1-0/+1
Makes it easier to see what was added during a conversation. Reviewed-by: Yohann Ferreira
2012-01-28Moved mTrading into the TradeHandlerThorbjørn Lindeijer1-1/+0
Really only the trade handler is concerned about whether the player is currently in a trade or not. Reviewed-by: Erik Schilling
2012-01-26Remove "> Next" from NPC dialogsAndrei Karas1-2/+0
Reviewed-by: Thorbjørn Lindeijer
2012-01-26Updated copyrights to 2012Thorbjørn Lindeijer194-194/+194
2012-01-26Removed 'inline' keyword where it's not of any valueThorbjørn Lindeijer4-14/+14
Members that are implemented inline are already inline, there is no need to mark them as such. Made two inline members of OpenGLGraphics private since because they are marked as inline, they can't be used from other classes. Reviewed-by: Erik Schilling
2012-01-22Allow resizing of the game in windowed modeThorbjørn Lindeijer6-59/+76
Window positions are semi-smartly corrected as a result of the resize. Not supported when using OpenGL on Windows for now. Reviewed-by: Yohann Ferreira
2012-01-20Made the update window bigger and resizableThorbjørn Lindeijer1-6/+7
Also made it remember its size and position. Reviewed-by: Erik Schilling
2012-01-20Made the ignore record parameter usefulErik Schilling1-1/+1
Reviewed-by: Bjorn.
2012-01-18ColorDB -> HairDB.Yohann Ferreira2-6/+6
This will ease the reading of the next patch about hair handling at character creation time in tAthena. As requested by bjorn. Reviewed-by: bjorn
2012-01-17Fix update error if file line is empty, like in aethyra updatesAndrei Karas1-1/+2
Reviewed-by: Thorbjørn Lindeijer Reviewed-by: Yohann Ferreira
2012-01-16Renamed some file names for consistency with the class namesThorbjørn Lindeijer31-24/+24
This was already done by ManaPlus. It's a good idea anyway and it makes comparing the code a little easier. Reviewed-by: Yohann Ferreira
2012-01-15Remove dead beings from the minimapStefan Dombrowski1-0/+4
Reviewed-by: Bertram
2012-01-15Show item quantity in the shop listThorbjørn Lindeijer1-23/+40
Rather useful when selling items to quickly see what you have in abundance, rather than only seeing the quantity of the selected item. Reviewed-by: Yohann Ferreira
2012-01-15Center the CustomServerDialog on its parent windowThorbjørn Lindeijer6-7/+8
Also shortened the title of the Custom Server dialog to "Custom Server" since it is also used for editing an existing custom server and not just for adding a new one. And used Window::center() in a bunch of places just to reduce code size. Reviewed-by: Yohann Ferreira
2012-01-13Improved the layout of the custom server dialogThorbjørn Lindeijer1-10/+10
Reviewed-by: Yohann Ferreira
2012-01-10Added a separate label for the download description in the server dialog.Yohann Ferreira2-10/+14
+ Fixe requested by Ablu. Reviewed-by: Ablu
2012-01-10Added a modify button to the server dialog.Yohann Ferreira4-17/+68
This was righteously requested by Ablu as missing when dealing with one's own entries. Reviewed-by: Ablu
2012-01-10Made addition of custom servers be done in a separate window.Yohann Ferreira4-150/+347
Now the first window the user can see is a list of servers which can double-clicked, making it all less cluttered. This commit also makes custom servers able to now have their own titles and their own description, just as the official ones. I also fixed the add entry button being registered twice to the action listener, and the fact that the description wasn't updated properly at windows loading and when adding/removing an entry. Resolves: Mana-Mantis #237. Reviewed-by: Ablu
2012-01-10player_node -> local_playerYohann Ferreira12-45/+45
Reviewed-by: Ablu
2012-01-09Added a close button to the npc dialog window.Yohann Ferreira2-24/+32
The close button will only display when the window is waiting for the server, so that crashed windows can be closed without restarting the client. Pushing the QUIT key (Escape by default) will also close the crashed windows in that case. I also fixed a memleak with the "next" button. Resolves: Mana-Mantis #72, 93, 389. Reviewed-by: Ablu.
2012-01-09Gave a bit more space to the equip/unequip button.Yohann Ferreira1-2/+6
The correct solution will be to make the buttons aware of each others and it seems the placer can't do that atm. But let's add that after the release.
2012-01-09Fixed the setup overall width to fix the tab behaviour withYohann Ferreira1-1/+1
default locale. Spotted by Ali-G. Reviewed-by: Ablu.
2012-01-09Fix wrong logic in the enable joystick setup option.Yohann Ferreira2-11/+11
I also renamed the badly named members to clarify it all. Part of Mana-Mantis #420. Reviewed-by: Ablu.
2012-01-09Changed INT and DELETE enum names to fix C::B compilation.Yohann Ferreira4-4/+4
This was introduced since Crush updated his mana lib pack. I simply changed the names to avoid a collision. Reviewed-by: Ablu.
2012-01-09Made the chat text much more readable in every opacity case.Yohann Ferreira4-4/+94
I added text shadow and outline support to the browserbox, and made it adapt the text for the chattabs depending on the GUI opacity. Reviewed-by: Ablu.
2012-01-07Made the first choice item be selected at the beginningBen Longbons2-0/+11
Resolves Mana-Mantis: #432. Reviewed-by: Bertram, Ablu.
2012-01-07Fixed minimap showing the right colors for npcs and monstersErik Schilling1-2/+2
Actually Bertram explained the fix in the bugtracker and I only did what he said there. Resolves: Mana-mantis #444. Reviewed-by: Bertram.