summaryrefslogtreecommitdiff
path: root/src/gui/setup_audio.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-5/+5
Conflicts: A lot of files.
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-0/+1
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-14Made a label class derived from the guichan label class which utilizesIra Rice1-5/+5
the palette colors. While technically, this can be accomplished through other means, it's rather clumsy overall, and is prone to introducing in programmer errors. This commit finally catches every case where text is used, and applies the text color from the color dialog to each of them appropriately. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-1/+1
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-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Added two more options for displaying speech overhead (don't show it atIra Rice1-1/+1
all and show speech bubbles without names). Since a checkbox won't work any more for all of these modes, it's now a slider. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-08Mostly fixed a few field values to behave better in Windows, as well asIra Rice1-2/+2
removed the need for sending graphics to the setSpeech function (since it isn't needed) and started actually using the time variable which it's passed (could be set to show the speech longer if the dialog is longer, for example). 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-19Reverse the order of slider and label againBjørn Lindeijer1-4/+4
In order to stay consistent with the video setup page.
2009-01-18Reflowed Audio setup tab using layout code.Ira Rice1-10/+16
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Merged Tab and TabbedArea from mainlineBjørn Lindeijer1-0/+1
Changes mostly done by David Athay. Currently these widgets are only used in the setup window, where they replace the previously used TabbedContainer.
2009-01-06Added support for internationalizationIra Rice1-3/+5
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-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-07-18Import of client treeLloyd Bryant1-1/+1
2008-05-09Changed the tabbedarea to be transparant as before. Changed setup David Athay1-0/+1
window and skills dialog to use the new tabbed area. Removed tabbed container as it is no longer used. Fixed a crash with the chat window.
2008-04-11Ported trunk over to Guichan 0.8.0. Based on merge from 0.0 branch, but becauseBjørn Lindeijer1-2/+2
of quite a bit of GUI differences there were additional changes and probably additional issues. You have been warned. ;) Merged revisions 4045-4049,4051-4059 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4045 | b_lindeijer | 2008-04-07 17:23:07 +0200 (Mon, 07 Apr 2008) | 3 lines Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except for gcn::TabbedArea usage) ........ r4059 | b_lindeijer | 2008-04-09 16:25:42 +0200 (Wed, 09 Apr 2008) | 2 lines Fixed problem with row height in shop list box. ........
2008-04-07Upgraded to Guichan 0.8.0 (merge from guichan-0.8 branch, except forBjørn Lindeijer1-2/+2
gcn::TabbedArea usage)
2007-08-07Marked most of the GUI as translatable.Guillaume Melquiond1-3/+5
2007-01-14Merged 0.0 changes from revision 2988 to 3035 to trunk.Bjørn Lindeijer1-5/+5
2007-01-14Upgraded to Guichan 0.6.0 (merge from guichan-0.6.0 branch).Bjørn Lindeijer1-5/+5
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-07-30Updated TMW to be compatible with Guichan 0.5.0 (merged from guichan-0.5.0Bjørn Lindeijer1-1/+1
branch).
2006-03-19Removed some duplicate initializations.Björn Steinbrink1-5/+4
2006-03-19Splitted setup window into manageable pieces according to their tabs in the ↵Björn Steinbrink1-0/+124
window. Fixed some memory leaks along the way. Also fixed two settings not being stored on "apply".