~ubuntu-branches/ubuntu/trusty/manaplus/trusty

« back to all changes in this revision

Viewing changes to src/gui/widgets/window.cpp

Committer: Package Import Robot
Author(s): Patrick Matthäi
Date: 2013-10-07 10:26:14 UTC
mfrom: (1.1.11)
Revision ID: package-import@ubuntu.com-20131007102614-tg2zjdz8vmtl6n7i

Tags: 1.3.9.29-1

New upstream release.

files added:
Android.mk

src/mapheights.cpp

src/mapheights.h

src/utils/files.cpp

src/utils/files.h

src/utils/physfscheckutils.cpp

src/utils/physfscheckutils.h

files modified:
ChangeLog

Makefile.am

Makefile.in

PKGBUILD

README

compile

config.guess

config.sub

configure

configure.ac

data/evol/evol.desktop

data/tmw/tmw.desktop

debian/changelog

depcomp

install-sh

manaplus.spec

missing

po/POTFILES.in

po/ar.po

po/bg.po

po/ca.po

po/cs.gmo

po/cs.po

po/da.po

po/de.gmo

po/de.po

po/el.po

po/en_GB.po

po/eo.po

po/es.gmo

po/es.po

po/et.po

po/fa.po

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/he.po

po/hr.po

po/hu.po

po/id.gmo

po/id.po

po/it.gmo

po/it.po

po/ja.gmo

po/ja.po

po/ka.po

po/manaplus.pot

po/nb.po

po/nl.po

po/nl_BE.gmo

po/nl_BE.po

po/pl.gmo

po/pl.po

po/pt.gmo

po/pt.po

po/pt_BR.gmo

po/pt_BR.po

po/ru.gmo

po/ru.po

po/sk.po

po/sq.po

po/sv.po

po/sv_SE.po

po/te.po

po/th.po

po/tr.gmo

po/tr.po

po/vls.po

po/zh_CN.gmo

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/CMakeLists.txt

src/Makefile.am

src/Makefile.in

src/actionmanager.cpp

src/actorspritemanager.cpp

src/actorspritemanager.h

src/animatedsprite.h

src/auctionmanager.cpp

src/avatar.cpp

src/being/actor.h

src/being/actorsprite.cpp

src/being/actorsprite.h

src/being/being.cpp

src/being/being.h

src/being/compoundsprite.h

src/being/localplayer.cpp

src/being/localplayer.h

src/being/playerrelations.cpp

src/being/playerrelations.h

src/beingequipbackend.h

src/chatlogger.cpp

src/client.cpp

src/client.h

src/commandhandler.cpp

src/commandhandler.h

src/commands.cpp

src/commands.h

src/configuration.h

src/debug.h

src/defaults.cpp

src/depricatedlistener.h

src/dragdrop.h

src/equipment.h

src/flooritem.h

src/game.cpp

src/graphicsmanager.cpp

src/graphicsmanager.h

src/gui/botcheckerwindow.cpp

src/gui/buydialog.cpp

src/gui/buyselldialog.cpp

src/gui/buyselldialog.h

src/gui/charselectdialog.cpp

src/gui/chatwindow.cpp

src/gui/chatwindow.h

src/gui/debugwindow.cpp

src/gui/debugwindow.h

src/gui/equipmentwindow.cpp

src/gui/focushandler.cpp

src/gui/focushandler.h

src/gui/gui.cpp

src/gui/gui.h

src/gui/inventorywindow.cpp

src/gui/inventorywindow.h

src/gui/itemamountwindow.cpp

src/gui/killstats.cpp

src/gui/killstats.h

src/gui/logindialog.cpp

src/gui/ministatuswindow.cpp

src/gui/ministatuswindow.h

src/gui/questswindow.cpp

src/gui/sdlfont.cpp

src/gui/sdlfont.h

src/gui/sdlinput.cpp

src/gui/selldialog.cpp

src/gui/selldialog.h

src/gui/serverdialog.cpp

src/gui/serverdialog.h

src/gui/setup_audio.cpp

src/gui/setup_chat.cpp

src/gui/setup_colors.cpp

src/gui/setup_colors.h

src/gui/setup_input.cpp

src/gui/setup_other.cpp

src/gui/setup_perfomance.cpp

src/gui/setup_relations.cpp

src/gui/setup_relations.h

src/gui/setup_theme.cpp

src/gui/setup_touch.cpp

src/gui/setup_video.cpp

src/gui/shopwindow.cpp

src/gui/skilldialog.cpp

src/gui/socialwindow.cpp

src/gui/statuspopup.cpp

src/gui/statuspopup.h

src/gui/statuswindow.cpp

src/gui/statuswindow.h

src/gui/textcommandeditor.cpp

src/gui/theme.cpp

src/gui/tradewindow.cpp

src/gui/tradewindow.h

src/gui/updaterwindow.cpp

src/gui/userpalette.cpp

src/gui/whoisonline.cpp

src/gui/widgets/battletab.cpp

src/gui/widgets/battletab.h

src/gui/widgets/button.h

src/gui/widgets/characterdisplay.cpp

src/gui/widgets/characterdisplay.h

src/gui/widgets/characterviewbase.h

src/gui/widgets/chattab.cpp

src/gui/widgets/chattab.h

src/gui/widgets/colormodel.cpp

src/gui/widgets/colormodel.h

src/gui/widgets/colorpage.cpp

src/gui/widgets/container.h

src/gui/widgets/dropshortcutcontainer.h

src/gui/widgets/emoteshortcutcontainer.h

src/gui/widgets/gmtab.cpp

src/gui/widgets/gmtab.h

src/gui/widgets/guildchattab.cpp

src/gui/widgets/guildchattab.h

src/gui/widgets/guitable.cpp

src/gui/widgets/guitable.h

src/gui/widgets/horizontcontainer.cpp

src/gui/widgets/horizontcontainer.h

src/gui/widgets/itemcontainer.h

src/gui/widgets/itemlinkhandler.cpp

src/gui/widgets/itemshortcutcontainer.h

src/gui/widgets/label.cpp

src/gui/widgets/langtab.cpp

src/gui/widgets/langtab.h

src/gui/widgets/layout.h

src/gui/widgets/listbox.cpp

src/gui/widgets/listbox.h

src/gui/widgets/popup.h

src/gui/widgets/popuplist.cpp

src/gui/widgets/popuplist.h

src/gui/widgets/radiogroup.cpp

src/gui/widgets/radiogroup.h

src/gui/widgets/scrollarea.cpp

src/gui/widgets/setupitem.cpp

src/gui/widgets/setupitem.h

src/gui/widgets/setuptab.h

src/gui/widgets/setuptabscroll.h

src/gui/widgets/setuptouchitem.cpp

src/gui/widgets/setuptouchitem.h

src/gui/widgets/shortcutcontainer.h

src/gui/widgets/skillinfo.cpp

src/gui/widgets/spellshortcutcontainer.h

src/gui/widgets/tab.h

src/gui/widgets/tabbedarea.cpp

src/gui/widgets/tabbedarea.h

src/gui/widgets/tablemodel.h

src/gui/widgets/tabstrip.cpp

src/gui/widgets/tabstrip.h

src/gui/widgets/textbox.cpp

src/gui/widgets/textfield.h

src/gui/widgets/tradetab.cpp

src/gui/widgets/tradetab.h

src/gui/widgets/vertcontainer.h

src/gui/widgets/whispertab.cpp

src/gui/widgets/whispertab.h

src/gui/widgets/widget2.h

src/gui/widgets/widgetgroup.h

src/gui/widgets/window.cpp

src/gui/widgets/window.h

src/gui/worldselectdialog.cpp

src/guild.h

src/imagesprite.h

src/input/inputmanager.cpp

src/input/keyboarddata.h

src/input/keyevent.h

src/inventory.cpp

src/localconsts.h

src/logger.cpp

src/main.cpp

src/main.h

src/map.cpp

src/map.h

src/maplayer.h

src/net/adminhandler.h

src/net/charserverhandler.h

src/net/download.cpp

src/net/download.h

src/net/ea/adminhandler.cpp

src/net/ea/adminhandler.h

src/net/ea/beinghandler.cpp

src/net/ea/beinghandler.h

src/net/ea/buysellhandler.cpp

src/net/ea/buysellhandler.h

src/net/ea/charserverhandler.cpp

src/net/ea/charserverhandler.h

src/net/ea/chathandler.cpp

src/net/ea/chathandler.h

src/net/ea/gamehandler.h

src/net/ea/gui/guildtab.cpp

src/net/ea/gui/guildtab.h

src/net/ea/gui/partytab.cpp

src/net/ea/gui/partytab.h

src/net/ea/guildhandler.h

src/net/ea/inventoryhandler.h

src/net/ea/itemhandler.cpp

src/net/ea/itemhandler.h

src/net/ea/loginhandler.cpp

src/net/ea/loginhandler.h

src/net/ea/network.cpp

src/net/ea/network.h

src/net/ea/npchandler.h

src/net/ea/partyhandler.cpp

src/net/ea/partyhandler.h

src/net/ea/playerhandler.cpp

src/net/ea/playerhandler.h

src/net/ea/skillhandler.cpp

src/net/ea/skillhandler.h

src/net/ea/tradehandler.cpp

src/net/ea/tradehandler.h

src/net/eathena/adminhandler.cpp

src/net/eathena/adminhandler.h

src/net/eathena/beinghandler.cpp

src/net/eathena/beinghandler.h

src/net/eathena/buysellhandler.cpp

src/net/eathena/buysellhandler.h

src/net/eathena/charserverhandler.cpp

src/net/eathena/charserverhandler.h

src/net/eathena/chathandler.cpp

src/net/eathena/chathandler.h

src/net/eathena/gamehandler.cpp

src/net/eathena/gamehandler.h

src/net/eathena/generalhandler.cpp

src/net/eathena/generalhandler.h

src/net/eathena/gui/guildtab.cpp

src/net/eathena/gui/partytab.cpp

src/net/eathena/guildhandler.cpp

src/net/eathena/guildhandler.h

src/net/eathena/inventoryhandler.cpp

src/net/eathena/inventoryhandler.h

src/net/eathena/itemhandler.h

src/net/eathena/loginhandler.cpp

src/net/eathena/loginhandler.h

src/net/eathena/messagehandler.cpp

src/net/eathena/messagehandler.h

src/net/eathena/messagein.cpp

src/net/eathena/messagein.h

src/net/eathena/messageout.cpp

src/net/eathena/messageout.h

src/net/eathena/network.cpp

src/net/eathena/network.h

src/net/eathena/npchandler.cpp

src/net/eathena/npchandler.h

src/net/eathena/partyhandler.cpp

src/net/eathena/partyhandler.h

src/net/eathena/playerhandler.cpp

src/net/eathena/playerhandler.h

src/net/eathena/skillhandler.cpp

src/net/eathena/skillhandler.h

src/net/eathena/tradehandler.cpp

src/net/eathena/tradehandler.h

src/net/loginhandler.h

src/net/messagehandler.h

src/net/messagein.cpp

src/net/messagein.h

src/net/messageout.cpp

src/net/messageout.h

src/net/net.cpp

src/net/packetcounters.cpp

src/net/packetcounters.h

src/net/partyhandler.h

src/net/sdltcpnet.cpp

src/net/sdltcpnet.h

src/net/serverinfo.h

src/net/tmwa/adminhandler.cpp

src/net/tmwa/adminhandler.h

src/net/tmwa/beinghandler.cpp

src/net/tmwa/beinghandler.h

src/net/tmwa/buysellhandler.cpp

src/net/tmwa/buysellhandler.h

src/net/tmwa/charserverhandler.cpp

src/net/tmwa/charserverhandler.h

src/net/tmwa/chathandler.cpp

src/net/tmwa/chathandler.h

src/net/tmwa/gamehandler.cpp

src/net/tmwa/gamehandler.h

src/net/tmwa/generalhandler.cpp

src/net/tmwa/generalhandler.h

src/net/tmwa/gui/guildtab.cpp

src/net/tmwa/gui/partytab.cpp

src/net/tmwa/gui/partytab.h

src/net/tmwa/guildhandler.cpp

src/net/tmwa/guildhandler.h

src/net/tmwa/inventoryhandler.cpp

src/net/tmwa/inventoryhandler.h

src/net/tmwa/itemhandler.h

src/net/tmwa/loginhandler.cpp

src/net/tmwa/loginhandler.h

src/net/tmwa/messagehandler.cpp

src/net/tmwa/messagehandler.h

src/net/tmwa/messagein.cpp

src/net/tmwa/messagein.h

src/net/tmwa/messageout.cpp

src/net/tmwa/messageout.h

src/net/tmwa/network.cpp

src/net/tmwa/network.h

src/net/tmwa/npchandler.cpp

src/net/tmwa/npchandler.h

src/net/tmwa/partyhandler.cpp

src/net/tmwa/partyhandler.h

src/net/tmwa/playerhandler.cpp

src/net/tmwa/playerhandler.h

src/net/tmwa/questhandler.cpp

src/net/tmwa/questhandler.h

src/net/tmwa/skillhandler.cpp

src/net/tmwa/skillhandler.h

src/net/tmwa/tradehandler.cpp

src/net/tmwa/tradehandler.h

src/particle/animationparticle.cpp

src/particle/animationparticle.h

src/particle/imageparticle.cpp

src/particle/imageparticle.h

src/particle/particle.cpp

src/particle/particle.h

src/particle/particlecontainer.h

src/particle/rotationalparticle.cpp

src/particle/rotationalparticle.h

src/particle/textparticle.h

src/party.h

src/render/graphics.cpp

src/render/graphics.h

src/render/mobileopenglgraphics.cpp

src/render/mobileopenglgraphics.h

src/render/normalopenglgraphics.cpp

src/render/normalopenglgraphics.h

src/render/nullopenglgraphics.cpp

src/render/nullopenglgraphics.h

src/render/renderers.h

src/render/safeopenglgraphics.cpp

src/render/sdl2graphics.cpp

src/render/sdl2softwaregraphics.cpp

src/render/sdlgraphics.cpp

src/render/sdlgraphics.h

src/render/surfacegraphics.cpp

src/render/surfacegraphics.h

src/resources/animation.cpp

src/resources/atlasmanager.cpp

src/resources/avatardb.cpp

src/resources/beingcommon.cpp

src/resources/beingcommon.h

src/resources/beinginfo.cpp

src/resources/beinginfo.h

src/resources/chardb.cpp

src/resources/chardb.h

src/resources/colordb.cpp

src/resources/deaddb.h

src/resources/image.cpp

src/resources/image.h

src/resources/imagehelper.cpp

src/resources/imagehelper.h

src/resources/imageset.h

src/resources/imagewriter.cpp

src/resources/imagewriter.h

src/resources/itemdb.cpp

src/resources/itemdb.h

src/resources/iteminfo.cpp

src/resources/iteminfo.h

src/resources/mapdb.cpp

src/resources/mapreader.cpp

src/resources/mapreader.h

src/resources/monsterdb.cpp

src/resources/openglimagehelper.cpp

src/resources/openglimagehelper.h

src/resources/petdb.h

src/resources/resource.cpp

src/resources/resource.h

src/resources/resourcemanager.cpp

src/resources/sdl2imagehelper.h

src/resources/sdl2softwareimagehelper.h

src/resources/sdlimagehelper.cpp

src/resources/sdlimagehelper.h

src/resources/sdlmusic.cpp

src/resources/sdlmusic.h

src/resources/sounddb.cpp

src/resources/sounddb.h

src/resources/soundeffect.h

src/resources/spritedef.cpp

src/resources/spritedef.h

src/resources/subimage.cpp

src/resources/subimage.h

src/resources/surfaceimagehelper.h

src/resources/wallpaper.cpp

src/simpleanimation.cpp

src/soundmanager.cpp

src/soundmanager.h

src/spellmanager.cpp

src/sprite.h

src/test/testlauncher.cpp

src/test/testlauncher.h

src/test/testmain.cpp

src/test/testmain.h

src/text.h

src/touchactions.h

src/utils/base64.cpp

src/utils/checkutils.h

src/utils/copynpaste.cpp

src/utils/cpu.cpp

src/utils/langs.cpp

src/utils/langs.h

src/utils/mkdir.cpp

src/utils/mutex.h

src/utils/paths.cpp

src/utils/paths.h

src/utils/perfomance.h

src/utils/physfsrwops.cpp

src/utils/physfsrwops.h

src/utils/physfstools.cpp

src/utils/process.cpp

src/utils/sdl2helper.cpp

src/utils/sdl2helper.h

src/utils/sdlcheckutils.cpp

src/utils/sdlhelper.cpp

src/utils/sdlhelper.h

src/utils/stringutils.cpp

src/utils/stringutils_unittest.cc

src/utils/translation/podict.cpp

src/utils/translation/poparser.cpp

src/utils/translation/translationmanager.cpp

src/utils/translation/translationmanager.h

src/utils/xml.cpp

src/utils/xml.h

Show diffs side-by-side

added added

removed removed

src/gui/widgets/window.cpp

128

mCaptionOffsetY = getOption("captionoffsety");

129

if (!mCaptionOffsetY)

130

mCaptionOffsetY = 5;

131

mCaptionAlign = getOption("captionalign");

131

mCaptionAlign = static_cast<gcn::Graphics::Alignment>(

132

getOption("captionalign"));

132

133

if (mCaptionAlign < gcn::Graphics::LEFT

133

134

|| mCaptionAlign > gcn::Graphics::RIGHT)

134

135

{

289

290

{

290

291

g->setColorAll(mForegroundColor, mForegroundColor2);

291

292

int x;

292

switch (static_cast<gcn::Graphics::Alignment>(mCaptionAlign))

293

switch (mCaptionAlign)

293

294

{

294

295

case Graphics::LEFT:

295

296

default:

Older »