diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-04 23:26:22 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-04 23:41:45 +0200 |
| commit | 6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d (patch) | |
| tree | a4ae355fe26eda518a5fd82c15347b6cfcf6b7f6 /src/Makefile.am | |
| parent | 1b06ec9f12e3fbfe6fbf6579fb64bb895464badb (diff) | |
| download | mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.gz mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.bz2 mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.xz mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.zip | |
Replaced emote window with a new emote popup
The popup is meant to be temporary, showing the emote instantly when you
click on it. It adapts nicely to show any number of emotes.
I still need to add a better way of assigning emote shortcuts, since
currently you can only change which emote is assigned to which shortcut
by actually using it.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ad4a0a26..0eedc018 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,10 +81,10 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/debugwindow.h \ gui/emotecontainer.cpp \ gui/emotecontainer.h \ + gui/emotepopup.cpp \ + gui/emotepopup.h \ gui/emoteshortcutcontainer.cpp \ gui/emoteshortcutcontainer.h \ - gui/emotewindow.cpp \ - gui/emotewindow.h \ gui/equipmentwindow.cpp \ gui/equipmentwindow.h \ gui/focushandler.cpp \ @@ -108,8 +108,6 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/linkhandler.h \ gui/login.cpp \ gui/login.h \ - gui/menuwindow.cpp \ - gui/menuwindow.h \ gui/minimap.cpp \ gui/minimap.h \ gui/ministatus.cpp \ @@ -183,6 +181,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \ gui/updatewindow.h \ gui/viewport.cpp \ gui/viewport.h \ + gui/windowmenu.cpp \ + gui/windowmenu.h \ net/adminhandler.h \ net/charhandler.h \ net/chathandler.h \ |