From aae7a5ec7b6d962edd6620f1aedd468a6bc98e1a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Jul 2015 14:33:37 +0300 Subject: Add ability to show badges under nick. Add option for select how show badges. --- src/gui/widgets/tabs/setup_players.cpp | 28 +++++++++++++++++++++------- src/gui/widgets/tabs/setup_players.h | 5 +++++ 2 files changed, 26 insertions(+), 7 deletions(-) (limited to 'src/gui/widgets/tabs') diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp index 82f8b0115..cd28c8d69 100644 --- a/src/gui/widgets/tabs/setup_players.cpp +++ b/src/gui/widgets/tabs/setup_players.cpp @@ -22,6 +22,8 @@ #include "gui/widgets/tabs/setup_players.h" +#include "gui/models/namesmodel.h" + #include "gui/widgets/containerplacer.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" @@ -31,8 +33,23 @@ #include "debug.h" +static const int badgesListSize = 4; + +static const char *const badgesList[] = +{ + // TRANSLATORS: screen badges type + N_("hide"), + // TRANSLATORS: screen badges type + N_("show at top"), + // TRANSLATORS: screen badges type + N_("show at right"), + // TRANSLATORS: screen badges type + N_("show at bottom"), +}; + Setup_Players::Setup_Players(const Widget2 *const widget) : - SetupTabScroll(widget) + SetupTabScroll(widget), + mBadgesList(new NamesModel) { // TRANSLATORS: settings tab name setName(_("Players")); @@ -69,13 +86,10 @@ Setup_Players::Setup_Players(const Widget2 *const widget) : new SetupItemCheckBox(_("Auto move names"), "", "moveNames", this, "moveNamesEvent"); + mBadgesList->fillFromArray(&badgesList[0], badgesListSize); // TRANSLATORS: settings option - new SetupItemCheckBox(_("Show badges"), "", - "showBadges", this, "showBadgesEvent"); - - // TRANSLATORS: settings option - new SetupItemCheckBox(_("Show badges at top"), "", - "showBadgesTop", this, "showBadgesTopEvent"); + new SetupItemDropDown(_("Badges"), "", + "showBadges", this, "showBadgesEvent", mBadgesList, 150); // TRANSLATORS: settings option new SetupItemCheckBox(_("Secure trades"), "", diff --git a/src/gui/widgets/tabs/setup_players.h b/src/gui/widgets/tabs/setup_players.h index 7561e770c..801839649 100644 --- a/src/gui/widgets/tabs/setup_players.h +++ b/src/gui/widgets/tabs/setup_players.h @@ -25,12 +25,17 @@ #include "gui/widgets/tabs/setuptabscroll.h" +class NamesModel; + class Setup_Players final : public SetupTabScroll { public: explicit Setup_Players(const Widget2 *const widget); A_DELETE_COPY(Setup_Players) + + private: + NamesModel *mBadgesList; }; #endif // GUI_WIDGETS_TABS_SETUP_PLAYERS_H -- cgit v1.2.3-70-g09d2