diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-04-06 01:31:12 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-04-06 01:31:12 +0300 |
commit | d4e28aa97cbce34a0053d3c02cf070ef9065439f (patch) | |
tree | 8e7300771b93caeed5faefbe709bd0720766e755 /src | |
parent | be163616712f8c360af9b3940969c7f127043dc0 (diff) | |
download | ManaVerse-d4e28aa97cbce34a0053d3c02cf070ef9065439f.tar.gz ManaVerse-d4e28aa97cbce34a0053d3c02cf070ef9065439f.tar.bz2 ManaVerse-d4e28aa97cbce34a0053d3c02cf070ef9065439f.tar.xz ManaVerse-d4e28aa97cbce34a0053d3c02cf070ef9065439f.zip |
Add quick messages with translation from current server language to default.
For use it open emotes/fonts in chat and select T tab.
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 18 | ||||
-rw-r--r-- | src/gui/windows/emotewindow.cpp | 39 | ||||
-rw-r--r-- | src/gui/windows/emotewindow.h | 7 | ||||
-rw-r--r-- | src/resources/db/textdb.cpp | 17 | ||||
-rw-r--r-- | src/resources/db/textdb.h | 6 |
5 files changed, 85 insertions, 2 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index d81775b43..6e4cb591e 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -68,12 +68,16 @@ #include "render/opengl/opengldebug.h" +#include "resources/db/textdb.h" + #include "net/chathandler.h" #include "net/serverfeatures.h" #include "utils/copynpaste.h" #include "utils/delete2.h" +#include "utils/translation/podict.h" + #include <sys/stat.h> #include <sstream> @@ -497,6 +501,20 @@ void ChatWindow::action(const ActionEvent &event) } } } + else if (eventId == "text") + { + if (emoteWindow && reverseDictionary) + { + const int idx = emoteWindow->getSelectedTextIndex(); + if (idx >= 0) + { + const std::string str = TextDb::getByIndex(idx); + const std::string enStr = reverseDictionary->getStr(str); + addInputText(enStr, false); + } + emoteWindow->clearText(); + } + } else if (eventId == ACTION_COLOR_PICKER) { if (mColorPicker) diff --git a/src/gui/windows/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 1fdd45612..796e3f342 100644 --- a/src/gui/windows/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -34,8 +34,12 @@ #include "utils/delete2.h" #include "utils/gettext.h" +#include "utils/translation/podict.h" + #include "resources/imageset.h" +#include "resources/db/textdb.h" + #include "resources/image/image.h" #include "debug.h" @@ -64,6 +68,10 @@ EmoteWindow::EmoteWindow() : mFontPage(CREATEWIDGETR(ListBox, this, mFontModel, "")), mScrollFontPage(new ScrollArea(this, mFontPage, Opaque_false, "fontpage.xml")), + mTextModel(new NamesModel), + mTextPage(CREATEWIDGETR(ListBox, this, mTextModel, "")), + mScrollTextPage(new ScrollArea(this, mTextPage, Opaque_false, + "textpage.xml")), mImageSet(Theme::getImageSetFromThemeXml("emotetabs.xml", "", 17, 16)) { setShowTitle(false); @@ -94,9 +102,13 @@ void EmoteWindow::postInit() mScrollColorPage->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mScrollFontPage->setVerticalScrollPolicy(ScrollArea::SHOW_NEVER); mScrollFontPage->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); + mScrollTextPage->setVerticalScrollPolicy(ScrollArea::SHOW_NEVER); + mScrollTextPage->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mFontModel->fillFromArray(&fontSizeList[0], fontSizeListSize); + mFontPage->setCenter(true); + mTextPage->setCenter(true); if (mImageSet && mImageSet->size() >= 3) { @@ -120,10 +132,13 @@ void EmoteWindow::postInit() // TRANSLATORS: emotes tab name mTabs->addTab(_("Fonts"), mScrollFontPage); } + // TRANSLATORS: emotes tab name + mTabs->addTab(_("T"), mScrollTextPage); mEmotePage->setActionEventId("emote"); mColorPage->setActionEventId("color"); mFontPage->setActionEventId("font"); + mTextPage->setActionEventId("text"); } EmoteWindow::~EmoteWindow() @@ -137,6 +152,9 @@ EmoteWindow::~EmoteWindow() delete2(mFontPage); delete2(mFontModel); delete2(mScrollFontPage); + delete2(mTextPage); + delete2(mTextModel); + delete2(mScrollTextPage); if (mImageSet) { mImageSet->decRef(); @@ -147,6 +165,15 @@ EmoteWindow::~EmoteWindow() void EmoteWindow::show() { setVisible(Visible_true); + if (dictionary != nullptr) + { + mTextModel->clear(); + const std::vector<std::string> &texts = TextDb::getTexts(); + FOR_EACH (StringVectCIter, it, texts) + { + mTextModel->add(dictionary->getStr(*it)); + } + } } void EmoteWindow::hide() @@ -186,6 +213,11 @@ std::string EmoteWindow::getSelectedColor() const return std::string("##").append(&chr[0]); } +int EmoteWindow::getSelectedTextIndex() const +{ + return mTextPage->getSelected(); +} + void EmoteWindow::clearColor() { mColorPage->resetAction(); @@ -210,11 +242,18 @@ void EmoteWindow::clearFont() setVisible(Visible_false); } +void EmoteWindow::clearText() +{ + mTextPage->setSelected(-1); + setVisible(Visible_false); +} + void EmoteWindow::addListeners(ActionListener *const listener) { mEmotePage->addActionListener(listener); mColorPage->addActionListener(listener); mFontPage->addActionListener(listener); + mTextPage->addActionListener(listener); } void EmoteWindow::widgetResized(const Event &event) diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h index 8ba01f9be..66fb0c83c 100644 --- a/src/gui/windows/emotewindow.h +++ b/src/gui/windows/emotewindow.h @@ -57,8 +57,12 @@ class EmoteWindow final : public Window std::string getSelectedFont() const; + int getSelectedTextIndex() const; + void clearFont(); + void clearText(); + void addListeners(ActionListener *const listener); void widgetResized(const Event &event) override final; @@ -74,6 +78,9 @@ class EmoteWindow final : public Window NamesModel *mFontModel A_NONNULLPOINTER; ListBox *mFontPage A_NONNULLPOINTER; ScrollArea *mScrollFontPage A_NONNULLPOINTER; + NamesModel *mTextModel A_NONNULLPOINTER; + ListBox *mTextPage A_NONNULLPOINTER; + ScrollArea *mScrollTextPage A_NONNULLPOINTER; ImageSet *mImageSet; }; diff --git a/src/resources/db/textdb.cpp b/src/resources/db/textdb.cpp index 28198162d..8a8771535 100644 --- a/src/resources/db/textdb.cpp +++ b/src/resources/db/textdb.cpp @@ -30,7 +30,7 @@ namespace { - std::vector<std::string> mTexts; + StringVect mTexts; } // namespace void TextDb::load() @@ -85,3 +85,18 @@ void TextDb::unload() { mTexts.clear(); } + +const StringVect &TextDb::getTexts() +{ + return mTexts; +} + +std::string TextDb::getByIndex(const int index) +{ + if (index < 0 || + static_cast<size_t>(index) >= mTexts.size()) + { + return std::string(); + } + return mTexts[index]; +} diff --git a/src/resources/db/textdb.h b/src/resources/db/textdb.h index 977b49ec6..c61bb0c7a 100644 --- a/src/resources/db/textdb.h +++ b/src/resources/db/textdb.h @@ -23,7 +23,7 @@ #include "enums/simpletypes/skiperror.h" -#include <string> +#include "utils/stringvector.h" #include "localconsts.h" @@ -34,6 +34,10 @@ namespace TextDb void loadXmlFile(const std::string &fileName, const SkipError skipError); + std::string getByIndex(const int index); + + const StringVect &getTexts(); + void unload(); } // namespace LanguageDB |