diff options
| -rw-r--r-- | src/gui/widgets/setupitem.h | 50 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_audio.cpp | 66 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_chat.cpp | 111 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_misc.cpp | 230 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_mods.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_perfomance.cpp | 81 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_players.cpp | 66 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_touch.cpp | 27 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_visual.cpp | 66 |
9 files changed, 458 insertions, 242 deletions
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index eec63a4bc..e8bcc0c8c 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -158,7 +158,7 @@ class SetupItemCheckBox final : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); SetupItemCheckBox(const std::string &restrict text, const std::string &restrict description, @@ -166,7 +166,7 @@ class SetupItemCheckBox final : public SetupItem SetupTabScroll *restrict const parent, const std::string &restrict eventName, const std::string &restrict def, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); A_DELETE_COPY(SetupItemCheckBox) @@ -190,8 +190,8 @@ class SetupItemTextField final : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const MainConfig mainConfig = MainConfig_true, - const UseBase64 useBase64 = UseBase64_false); + const MainConfig mainConfig, + const UseBase64 useBase64); SetupItemTextField(const std::string &restrict text, const std::string &restrict description, @@ -199,8 +199,8 @@ class SetupItemTextField final : public SetupItem SetupTabScroll *restrict const parent, const std::string &restrict eventName, const std::string &restrict def, - const MainConfig mainConfig = MainConfig_true, - const UseBase64 useBase64 = UseBase64_false); + const MainConfig mainConfig, + const UseBase64 useBase64); A_DELETE_COPY(SetupItemTextField) @@ -246,7 +246,7 @@ class SetupItemIntTextField final : public SetupItem SetupTabScroll *restrict const parent, const std::string &restrict eventName, const int min, const int max, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); SetupItemIntTextField(const std::string &restrict text, const std::string &restrict description, @@ -255,7 +255,7 @@ class SetupItemIntTextField final : public SetupItem const std::string &restrict eventName, const int min, const int max, const std::string &restrict def, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); A_DELETE_COPY(SetupItemIntTextField) @@ -287,7 +287,7 @@ class SetupItemLabel final : public SetupItem SetupItemLabel(const std::string &restrict text, const std::string &restrict description, SetupTabScroll *restrict const parent, - const Separator separator = Separator_true); + const Separator separator); A_DELETE_COPY(SetupItemLabel) @@ -318,7 +318,7 @@ class SetupItemDropDown final : public SetupItem const std::string &restrict eventName, ListModel *restrict const model, const int width, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); SetupItemDropDown(const std::string &restrict text, const std::string &restrict description, @@ -328,7 +328,7 @@ class SetupItemDropDown final : public SetupItem ListModel *restrict const model, const int width, const std::string &restrict def, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); A_DELETE_COPY(SetupItemDropDown) @@ -360,7 +360,7 @@ class SetupItemDropDownStr final : public SetupItem const std::string &restrict eventName, ListModel *restrict const model, const int width, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); SetupItemDropDownStr(const std::string &restrict text, const std::string &restrict description, @@ -370,7 +370,7 @@ class SetupItemDropDownStr final : public SetupItem ListModel *restrict const model, const int width, const std::string &restrict def, - const MainConfig mainConfig = MainConfig_true); + const MainConfig mainConfig); A_DELETE_COPY(SetupItemDropDownStr) @@ -538,9 +538,9 @@ class SetupItemSliderList notfinal : public SetupItem SetupTabScroll *restrict const parent, const std::string &restrict eventName, ListModel *restrict const model, - const int width = 150, - const OnTheFly onTheFly = OnTheFly_false, - const MainConfig mainConfig = MainConfig_true); + const int width, + const OnTheFly onTheFly, + const MainConfig mainConfig); SetupItemSliderList(const std::string &restrict text, const std::string &restrict description, @@ -549,9 +549,9 @@ class SetupItemSliderList notfinal : public SetupItem const std::string &restrict eventName, ListModel *restrict const model, const std::string &restrict def, - const int width = 150, - const OnTheFly onTheFly = OnTheFly_false, - const MainConfig mainConfig = MainConfig_true); + const int width, + const OnTheFly onTheFly, + const MainConfig mainConfig); HorizontContainer *mHorizont; Label *mLabel; @@ -570,9 +570,9 @@ class SetupItemSound final : public SetupItemSliderList SetupTabScroll *restrict const parent, const std::string &restrict eventName, ListModel *restrict const model, - const int width = 150, - const OnTheFly onTheFly = OnTheFly_false, - const MainConfig mainConfig = MainConfig_true); + const int width, + const OnTheFly onTheFly, + const MainConfig mainConfig); A_DELETE_COPY(SetupItemSound) @@ -594,9 +594,9 @@ class SetupItemSliderInt final : public SetupItemSliderList const std::string &restrict eventName, ListModel *restrict const model, const int min, - const int width = 150, - const OnTheFly onTheFly = OnTheFly_false, - const MainConfig mainConfig = MainConfig_true); + const int width, + const OnTheFly onTheFly, + const MainConfig mainConfig); A_DELETE_COPY(SetupItemSliderInt) diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index 6275ff59a..db18af609 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -53,22 +53,27 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : place(0, 0, mScroll, 10, 10); // TRANSLATORS: settings option - new SetupItemLabel(_("Basic settings"), "", this); + new SetupItemLabel(_("Basic settings"), "", this, + Separator_true); // TRANSLATORS: settings option - new SetupItemCheckBox(_("Enable Audio"), "", "sound", this, "soundEvent"); + new SetupItemCheckBox(_("Enable Audio"), "", "sound", this, "soundEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable music"), "", - "playMusic", this, "playMusicEvent"); + "playMusic", this, "playMusicEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable game sfx"), "", - "playBattleSound", this, "playBattleSoundEvent"); + "playBattleSound", this, "playBattleSoundEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable gui sfx"), "", - "playGuiSound", this, "playGuiSoundEvent"); + "playGuiSound", this, "playGuiSoundEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemSlider(_("Sfx volume"), "", "sfxVolume", @@ -86,11 +91,13 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable music fade out"), "", - "fadeoutmusic", this, "fadeoutmusicEvent"); + "fadeoutmusic", this, "fadeoutmusicEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Audio frequency"), "", - "audioFrequency", this, "audioFrequencyEvent", 14000, 192000); + "audioFrequency", this, "audioFrequencyEvent", 14000, 192000, + MainConfig_true); // TRANSLATORS: audio type mChannelsList->push_back(_("mono")); @@ -109,64 +116,79 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemIntTextField(_("Parallel number of sounds"), "", - "parallelAudioChannels", this, "parallelAudioChannelsEvent", 1, 1000); + "parallelAudioChannels", this, "parallelAudioChannelsEvent", 1, 1000, + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Sound effects"), "", this); + new SetupItemLabel(_("Sound effects"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemSound(_("Information dialog sound"), "", - "soundinfo", this, "soundinfoEvent", mSoundModel); + "soundinfo", this, "soundinfoEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Request dialog sound"), "", - "soundrequest", this, "soundrequestEvent", mSoundModel); + "soundrequest", this, "soundrequestEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Whisper message sound"), "", - "soundwhisper", this, "soundwhisperEvent", mSoundModel); + "soundwhisper", this, "soundwhisperEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Guild / Party message sound"), "", - "soundguild", this, "soundguildEvent", mSoundModel); + "soundguild", this, "soundguildEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Highlight message sound"), "", - "soundhighlight", this, "soundhighlightEvent", mSoundModel); + "soundhighlight", this, "soundhighlightEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Global message sound"), "", - "soundglobal", this, "soundglobalEvent", mSoundModel); + "soundglobal", this, "soundglobalEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Error message sound"), "", - "sounderror", this, "sounderrorEvent", mSoundModel); + "sounderror", this, "sounderrorEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Trade request sound"), "", - "soundtrade", this, "soundtradeEvent", mSoundModel); + "soundtrade", this, "soundtradeEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Show window sound"), "", - "soundshowwindow", this, "soundshowwindowEvent", mSoundModel); + "soundshowwindow", this, "soundshowwindowEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option new SetupItemSound(_("Hide window sound"), "", - "soundhidewindow", this, "soundhidewindowEvent", mSoundModel); + "soundhidewindow", this, "soundhidewindowEvent", mSoundModel, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Other"), "", this); + new SetupItemLabel(_("Other"), "", this, + Separator_true); #ifdef USE_MUMBLE // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable mumble voice chat"), "", - "enableMumble", this, "enableMumbleEvent"); + "enableMumble", this, "enableMumbleEvent", + MainConfig_true); #endif // USE_MUMBLE // TRANSLATORS: settings option new SetupItemCheckBox(_("Download music"), "", - "download-music", this, "download-musicEvent"); + "download-music", this, "download-musicEvent", + MainConfig_true); setDimension(Rect(0, 0, 550, 350)); } diff --git a/src/gui/widgets/tabs/setup_chat.cpp b/src/gui/widgets/tabs/setup_chat.cpp index b27e1ec53..a125ec699 100644 --- a/src/gui/widgets/tabs/setup_chat.cpp +++ b/src/gui/widgets/tabs/setup_chat.cpp @@ -45,14 +45,16 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : place(0, 0, mScroll, 10, 10); // TRANSLATORS: settings group - new SetupItemLabel(_("Window"), "", this); + new SetupItemLabel(_("Window"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Auto hide chat window"), // TRANSLATORS: settings description _("Chat window will be automatically hidden when not in use.\n\n" "Hit Enter or hover mouse to show chat again."), - "autohideChat", this, "autohideChatEvent"); + "autohideChat", this, "autohideChatEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Protect chat focus"), @@ -60,18 +62,21 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("Enables aggressive protection of input focus in chat window.\n\n" "Note: no other text inputs will be allowed to receive text input " "when you typing in chat window."), - "protectChatFocus", this, "protectChatFocusEvent"); + "protectChatFocus", this, "protectChatFocusEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Colors"), "", this); + new SetupItemLabel(_("Colors"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Remove colors from received chat messages"), // TRANSLATORS: settings description _("Enable this setting to strip colors from incoming chat messages. " "All messages will use default chat text color if this enabled."), - "removeColors", this, "removeColorsEvent"); + "removeColors", this, "removeColorsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show chat colors list"), @@ -80,22 +85,26 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "window. Chat window will display color selection drop-down.\n\n" "It allows one to select default color of outgoing chat messages " "easily, but also occupies some space in chat window."), - "showChatColorsList", this, "showChatColorsListEvent"); + "showChatColorsList", this, "showChatColorsListEvent", + MainConfig_true); // TRANSLATORS: settings option - new SetupItemLabel(_("Commands"), "", this); + new SetupItemLabel(_("Commands"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Allow magic and GM commands in all chat tabs"), // TRANSLATORS: settings description _("Enable this setting to be able to type spells and GM commands in " "any tab."), - "allowCommandsInChatTabs", this, "allowCommandsInChatTabsEvent"); + "allowCommandsInChatTabs", this, "allowCommandsInChatTabsEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Limits"), "", this); + new SetupItemLabel(_("Limits"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Limit max chars in chat line"), @@ -104,7 +113,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "of text displayed in chat.\n\n" "Note: long lines can make client slower. Lines longer than this " "limit will be truncated."), - "chatMaxCharLimit", this, "chatMaxCharLimitEvent", 0, 500); + "chatMaxCharLimit", this, "chatMaxCharLimitEvent", 0, 500, + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Limit max lines in chat"), @@ -113,31 +123,36 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "keeps specified number of last lines of text. Oldest lines exceeding " "this limit are discarded from scrollback buffer.\n\n" "Note: keeping too many lines in scroll buffer can slow client down."), - "chatMaxLinesLimit", this, "chatMaxLinesLimitEvent", 0, 500); + "chatMaxLinesLimit", this, "chatMaxLinesLimitEvent", 0, 500, + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Logs"), "", this); + new SetupItemLabel(_("Logs"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable chat Log"), // TRANSLATORS: settings description _("If you enable this setting, chat logs will be written to disk.\n\n" "Note: chat logs can take noticeable amount of disk space over time."), - "enableChatLog", this, "enableChatLogEvent"); + "enableChatLog", this, "enableChatLogEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable debug chat Log"), // TRANSLATORS: settings description _("If you enable this, debug chat tab also will be logged to disk."), - "enableDebugLog", this, "enableDebugLogEvent"); + "enableDebugLog", this, "enableDebugLogEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show chat history"), // TRANSLATORS: settings description _("If this setting enabled, client will load old chat tabs content " "from logs on startup instead of starting with empty chat tabs."), - "showChatHistory", this, "showChatHistoryEvent"); + "showChatHistory", this, "showChatHistoryEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show party online messages"), @@ -145,7 +160,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("If this setting is enabled, online status changes of party members" " will be shown in party tab of chat.\n\nThis adds some extra noise " "to chat, but allows one to see when your buddies are coming online."), - "showPartyOnline", this, "showPartyOnlineEvent"); + "showPartyOnline", this, "showPartyOnlineEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show guild online messages"), @@ -153,11 +169,13 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("If this setting is enabled, online status changes of guild members" " will be shown in guild tab of chat.\n\nThis adds some extra noise " "to chat, but allows one to see when your buddies are coming online."), - "showGuildOnline", this, "showGuildOnlineEvent"); + "showGuildOnline", this, "showGuildOnlineEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Messages"), "", this); + new SetupItemLabel(_("Messages"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Hide shop messages"), @@ -168,7 +186,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "implemented as usual private messages with special content. If you " "disable this setting, you will be able to see these messages and get " "idea when other players are looking at your shop."), - "hideShopMessages", this, "hideShopMessagesEvent"); + "hideShopMessages", this, "hideShopMessagesEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show MVP messages"), @@ -176,11 +195,13 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("Enable this setting to see MVP messages from server.\n\n" "Note: MVP messages are not used on TMW/Evol/etc servers, so this " "feature usually makes little difference."), - "showMVP", this, "showMVPEvent"); + "showMVP", this, "showMVPEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Tabs"), "", this); + new SetupItemLabel(_("Tabs"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Put all whispers in tabs"), @@ -190,7 +211,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "setting disabled, all whispers will appear in General tab.\n\n" "Note: putting all whispers to single General tab is known to be " "confusing. Think twice before disabling this feature."), - "whispertab", this, "whispertabEvent"); + "whispertab", this, "whispertabEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Log magic messages in debug tab"), @@ -198,7 +220,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("If this setting is enabled, spell invocation will be shown in " "Debug tab. If disabled, it will be shown in General tab instead.\n\n" "Note: it does not affects server replies related to spells."), - "showMagicInDebug", this, "showMagicInDebugEvent"); + "showMagicInDebug", this, "showMagicInDebugEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show server messages in debug tab"), @@ -208,7 +231,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "General chat instead.\n\nNote: according to 4144, disabling this " "could also make you to lose some debug messages from client in " "Debug tab since these are fake server messages."), - "serverMsgInDebug", this, "serverMsgInDebugEvent"); + "serverMsgInDebug", this, "serverMsgInDebugEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable trade tab"), @@ -217,7 +241,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "containing words typical for trades will go to Trade tab. This " "will make General tab less noisy. If this setting is disabled, all " "trade related players messages will stay in General tab."), - "enableTradeTab", this, "enableTradeTabEvent"); + "enableTradeTab", this, "enableTradeTabEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable gm tab"), @@ -225,7 +250,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("If enabled, GM tab will appear in chat. It displays text related " "GM activity.\n\nNote: this setting only makes difference for " "GMs (Game Masters) since this tab only appears for GMs."), - "enableGmTab", this, "enableGmTabEvent"); + "enableGmTab", this, "enableGmTabEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable language tab"), @@ -252,7 +278,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "tab will contain messages related to battles, like damage and " "experience gain, if battle messages are enabled.\n\n" "Note: client restart required to take effect."), - "enableBattleTab", this, "enableBattleTabEvent"); + "enableBattleTab", this, "enableBattleTabEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show battle events"), @@ -260,7 +287,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("If this setting enabled, messages related to battle like damage " "or experience gain will be displayed in Debug or Battle tab. If " "disabled, no battle messages will be displayed."), - "showBattleEvents", this, "showBattleEventsEvent"); + "showBattleEvents", this, "showBattleEventsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Resize chat tabs if need"), @@ -272,25 +300,30 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "otherwise usable for text.\n\n" "Note: its mostly about jumpy attitude vs " "less usable space for text."), - "hideChatInput", this, "hideChatInputEvent"); + "hideChatInput", this, "hideChatInputEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable trade spam filter"), - "", "enableTradeFilter", this, "enableTradeFilterEvent"); + "", "enableTradeFilter", this, "enableTradeFilterEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Time"), "", this); + new SetupItemLabel(_("Time"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Use local time"), // TRANSLATORS: settings description _("If this feature enabled, timestamps in chat will use local times. " "If disabled, server time will be used (often it is GMT+0)."), - "useLocalTime", this, "useLocalTimeEvent"); + "useLocalTime", this, "useLocalTimeEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Other"), "", this); + new SetupItemLabel(_("Other"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemTextField(_("Highlight words (separated by comma)"), @@ -298,7 +331,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : _("Here you can specify some extra words which will also cause " "highlighting. Use comma to separate words.\n\nNote: frequent " "highlights are annoying - use it with caution."), - "highlightWords", this, "highlightWordsEvent"); + "highlightWords", this, "highlightWordsEvent", + MainConfig_true, UseBase64_false); // TRANSLATORS: settings option new SetupItemTextField(_("Globals ignore names (separated by comma)"), @@ -307,7 +341,8 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "particular sender (NPC, GM) annoys you too much. Global will be " "moved to Debug instead.\n\nNote: careless use of this feature can " "make you to miss important announces!"), - "globalsFilter", this, "globalsFilterEvent"); + "globalsFilter", this, "globalsFilterEvent", + MainConfig_true, UseBase64_false); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show emotes button in chat"), @@ -317,14 +352,16 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) : "allows one to insert smiles and text formatting easily.\n\n" "Note: same window can also be invoked by hotkey when typing, usually " "F1 by default."), - "showEmotesButton", this, "showEmotesButtonEvent"); + "showEmotesButton", this, "showEmotesButtonEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show motd server message on start"), // TRANSLATORS: settings description _("If this setting enabled, client will display server MOTD (message" " of the day) once you connect to server. Disable it to hide MOTD."), - "showmotd", this, "showmotdEvent"); + "showmotd", this, "showmotdEvent", + MainConfig_true); setDimension(Rect(0, 0, 550, 350)); } diff --git a/src/gui/widgets/tabs/setup_misc.cpp b/src/gui/widgets/tabs/setup_misc.cpp index 07b4c5193..007e50e45 100644 --- a/src/gui/widgets/tabs/setup_misc.cpp +++ b/src/gui/widgets/tabs/setup_misc.cpp @@ -130,150 +130,185 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : place(0, 0, mScroll, 10, 10); // TRANSLATORS: settings option - new SetupItemLabel(_("Monsters"), "", this); + new SetupItemLabel(_("Monsters"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show damage inflicted to monsters"), "", - "showMonstersTakedDamage", this, "showMonstersTakedDamageEvent"); + "showMonstersTakedDamage", this, "showMonstersTakedDamageEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Auto target only reachable monsters"), "", - "targetOnlyReachable", this, "targetOnlyReachableEvent"); + "targetOnlyReachable", this, "targetOnlyReachableEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Select auto target for attack skills"), "", - "skillAutotarget", this, "skillAutotargetEvent"); + "skillAutotarget", this, "skillAutotargetEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Highlight monster attack range"), "", "highlightMonsterAttackRange", this, - "highlightMonsterAttackRangeEvent"); + "highlightMonsterAttackRangeEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show monster hp bar"), "", - "showMobHP", this, "showMobHPEvent"); + "showMobHP", this, "showMobHPEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Cycle monster targets"), "", - "cycleMonsters", this, "cycleMonstersEvent"); + "cycleMonsters", this, "cycleMonstersEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Map"), "", this); + new SetupItemLabel(_("Map"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show warps particles"), "", - "warpParticle", this, "warpParticleEvent"); + "warpParticle", this, "warpParticleEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Highlight map portals"), "", - "highlightMapPortals", this, "highlightMapPortalsEvent"); + "highlightMapPortals", this, "highlightMapPortalsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Highlight floor items"), "", - "floorItemsHighlight", this, "floorItemsHighlightEvent"); + "floorItemsHighlight", this, "floorItemsHighlightEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Highlight player attack range"), "", - "highlightAttackRange", this, "highlightAttackRangeEvent"); + "highlightAttackRange", this, "highlightAttackRangeEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show extended minimaps"), "", - "showExtMinimaps", this, "showExtMinimapsEvent"); + "showExtMinimaps", this, "showExtMinimapsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Draw path"), "", "drawPath", - this, "drawPathEvent"); + this, "drawPathEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Draw hotkeys on map"), "", "drawHotKeys", - this, "drawHotKeysEvent"); + this, "drawHotKeysEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable lazy scrolling"), "", - "enableLazyScrolling", this, "enableLazyScrollingEvent"); + "enableLazyScrolling", this, "enableLazyScrollingEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Scroll laziness"), "", "ScrollLaziness", - this, "ScrollLazinessEvent", 1, 160); + this, "ScrollLazinessEvent", 1, 160, + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Scroll radius"), "", "ScrollRadius", - this, "ScrollRadiusEvent", 0, mapTileSize); + this, "ScrollRadiusEvent", 0, mapTileSize, + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Auto resize minimaps"), "", "autoresizeminimaps", - this, "autoresizeminimapsEvent"); + this, "autoresizeminimapsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Play map animations"), "", "playMapAnimations", - this, "playMapAnimationsEvent"); + this, "playMapAnimationsEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Moving"), "", this); + new SetupItemLabel(_("Moving"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Auto fix position"), "", - "autofixPos", this, "autofixPosEvent"); + "autofixPos", this, "autofixPosEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show server side position"), "", - "showserverpos", this, "showserverposEvent"); + "showserverpos", this, "showserverposEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Attack while moving"), "", - "attackMoving", this, "attackMovingEvent"); + "attackMoving", this, "attackMovingEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Attack next target"), "", - "attackNext", this, "attackNextEvent"); + "attackNext", this, "attackNextEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Sync player move"), "", "syncPlayerMove", - this, "syncPlayerMoveEvent"); + this, "syncPlayerMoveEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Sync player move distance"), "", "syncPlayerMoveDistance", - this, "syncPlayerMoveDistanceEvent", 1, 30); + this, "syncPlayerMoveDistanceEvent", 1, 30, + MainConfig_true); // TRANSLATORS: settings option new SetupItemTextField(_("Crazy move A program"), "", - "crazyMoveProgram", this, "crazyMoveProgramEvent"); + "crazyMoveProgram", this, "crazyMoveProgramEvent", + MainConfig_true, UseBase64_false); // TRANSLATORS: settings option new SetupItemCheckBox(_("Mouse relative moves " "(good for touch interfaces)"), "", "mouseDirectionMove", - this, "mouseDirectionMoveEvent"); + this, "mouseDirectionMoveEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Player"), "", this); + new SetupItemLabel(_("Player"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show own hp bar"), "", - "showOwnHP", this, "showOwnHPEvent"); + "showOwnHP", this, "showOwnHPEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable quick stats"), "", - "quickStats", this, "quickStatsEvent"); + "quickStats", this, "quickStatsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Cycle player targets"), "", - "cyclePlayers", this, "cyclePlayersEvent"); + "cyclePlayers", this, "cyclePlayersEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show job exp messages"), "", - "showJobExp", this, "showJobExpEvent"); + "showJobExp", this, "showJobExpEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show players popups"), "", - "showBeingPopup", this, "showBeingPopupEvent"); + "showBeingPopup", this, "showBeingPopupEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemTextField(_("Afk message"), "", "afkMessage", this, "afkMessageEvent", - MainConfig_false); + MainConfig_false, UseBase64_false); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show job"), "", "showJob", @@ -282,50 +317,62 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable attack filter"), "", - "enableAttackFilter", this, "enableAttackFilterEvent"); + "enableAttackFilter", this, "enableAttackFilterEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable pickup filter"), "", - "enablePickupFilter", this, "enablePickupFilterEvent"); + "enablePickupFilter", this, "enablePickupFilterEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable advert protocol"), "", - "enableAdvert", this, "enableAdvertEvent"); + "enableAdvert", this, "enableAdvertEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enabled pets support"), - "", "usepets", this, "usepetsEvent"); + "", "usepets", this, "usepetsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable weight notifications"), "", - "weightMsg", this, "weightMsgEvent"); + "weightMsg", this, "weightMsgEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Shop"), "", this); + new SetupItemLabel(_("Shop"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Accept sell/buy requests"), "", - "autoShop", this, "autoShopEvent"); + "autoShop", this, "autoShopEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable shop mode"), "", - "tradebot", this, "tradebotEvent"); + "tradebot", this, "tradebotEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("NPC"), "", this); + new SetupItemLabel(_("NPC"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Cycle npc targets"), "", - "cycleNPC", this, "cycleNPCEvent"); + "cycleNPC", this, "cycleNPCEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Log NPC dialogue"), "", "logNpcInGui", - this, "logNpcInGuiEvent"); + this, "logNpcInGuiEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Bots support"), "", this); + new SetupItemLabel(_("Bots support"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable guild bot support and disable native " @@ -343,86 +390,105 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : // TRANSLATORS: settings group - new SetupItemLabel(_("Keyboard"), "", this); + new SetupItemLabel(_("Keyboard"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Repeat delay"), "", - "repeateDelay", this, "repeateDelayEvent", 0, 10000); + "repeateDelay", this, "repeateDelayEvent", 0, 10000, + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Repeat interval"), "", - "repeateInterval", this, "repeateIntervalEvent", 0, 10000); + "repeateInterval", this, "repeateIntervalEvent", 0, 10000, + MainConfig_true); // TRANSLATORS: settings option new SetupItemIntTextField(_("Custom repeat interval"), "", - "repeateInterval2", this, "repeateInterval2Event", 0, 10000); + "repeateInterval2", this, "repeateInterval2Event", 0, 10000, + MainConfig_true); #ifdef USE_SDL2 // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable alt-tab workaround"), "", - "blockAltTab", this, "blockAltTabEvent"); + "blockAltTab", this, "blockAltTabEvent", + MainConfig_true); #endif // USE_SDL2 // TRANSLATORS: settings group - new SetupItemLabel(_("Windows"), "", this); + new SetupItemLabel(_("Windows"), "", this, + Separator_true); mShortcutsList->fillFromArray(&shortcutsList[0], shortcutsListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Shortcut buttons"), "", "autohideButtons", this, - "autohideButtonsEvent", mShortcutsList, 200); + "autohideButtonsEvent", mShortcutsList, 200, + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Proxy server"), "", this); + new SetupItemLabel(_("Proxy server"), "", this, + Separator_true); mProxyTypeList->fillFromArray(&proxyTypeList[0], proxyTypeListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Proxy type"), "", "downloadProxyType", this, - "downloadProxyTypeEvent", mProxyTypeList, 200); + "downloadProxyTypeEvent", mProxyTypeList, 200, + MainConfig_true); // TRANSLATORS: settings option new SetupItemTextField(_("Proxy address:port"), "", - "downloadProxy", this, "downloadProxyEvent"); + "downloadProxy", this, "downloadProxyEvent", + MainConfig_true, UseBase64_false); // TRANSLATORS: settings option new SetupItemCheckBox(_("Tunnel through HTTP proxy"), "", - "downloadProxyTunnel", this, "downloadProxyTunnelEvent"); + "downloadProxyTunnel", this, "downloadProxyTunnelEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Logging"), "", this); + new SetupItemLabel(_("Logging"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable OpenGL version check " "(do not disable)"), "", "checkOpenGLVersion", this, - "checkOpenGLVersionEvent"); + "checkOpenGLVersionEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable debug log"), "", - "debugLog", this, "debugLogEvent"); + "debugLog", this, "debugLogEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemTextField(_("Ignore logging packets"), "", - "ignorelogpackets", this, "ignorelogpacketsEvent"); + "ignorelogpackets", this, "ignorelogpacketsEvent", + MainConfig_true, UseBase64_false); // TRANSLATORS: settings option new SetupItemCheckBox(_("Log unimplemented packets"), "", - "unimplimentedLog", this, "unimplimentedLogEvent"); + "unimplimentedLog", this, "unimplimentedLogEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable OpenGL log"), "", - "debugOpenGL", this, "debugOpenGLEvent"); + "debugOpenGL", this, "debugOpenGLEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable input log"), "", - "logInput", this, "logInputEvent"); + "logInput", this, "logInputEvent", + MainConfig_true); #ifdef USE_SDL2 mSdlLogList->fillFromArray(&sdlLogList[0], sdlLogListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("SDL logging level"), "", - "sdlLogLevel", this, "sdlLogLevelEvent", mSdlLogList, 100); + "sdlLogLevel", this, "sdlLogLevelEvent", mSdlLogList, 100, + MainConfig_true); #endif // USE_SDL2 // TRANSLATORS: settings option @@ -431,23 +497,28 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : // TRANSLATORS: settings group - new SetupItemLabel(_("Other"), "", this); + new SetupItemLabel(_("Other"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable server side attack"), "", - "serverAttack", this, "serverAttackEvent"); + "serverAttack", this, "serverAttackEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Hide support page link on error"), "", - "hidesupport", this, "hidesupportEvent"); + "hidesupport", this, "hidesupportEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable double clicks"), "", - "doubleClick", this, "doubleClickEvent"); + "doubleClick", this, "doubleClickEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable bot checker"), "", - "enableBotCheker", this, "enableBotChekerEvent"); + "enableBotCheker", this, "enableBotChekerEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable buggy servers protection " @@ -457,12 +528,14 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemCheckBox(_("Low traffic mode"), "", "lowTraffic", - this, "lowTrafficEvent"); + this, "lowTrafficEvent", + MainConfig_true); #ifndef ANDROID // TRANSLATORS: settings option new SetupItemCheckBox(_("Use FBO for screenshots (only for opengl)"), - "", "usefbo", this, "usefboEvent"); + "", "usefbo", this, "usefboEvent", + MainConfig_true); #endif // ANDROID #ifndef WIN32 @@ -475,16 +548,19 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemIntTextField(_("Network delay between sub servers"), - "", "networksleep", this, "networksleepEvent", 0, 10000); + "", "networksleep", this, "networksleepEvent", 0, 10000, + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show background"), "", "showBackground", - this, "showBackgroundEvent"); + this, "showBackgroundEvent", + MainConfig_true); mDensityList->fillFromArray(&densityList[0], densityListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Screen density override"), "", - "screenDensity", this, "screenDensityEvent", mDensityList, 100); + "screenDensity", this, "screenDensityEvent", mDensityList, 100, + MainConfig_true); setDimension(Rect(0, 0, 550, 350)); } diff --git a/src/gui/widgets/tabs/setup_mods.cpp b/src/gui/widgets/tabs/setup_mods.cpp index c3ca23245..1f8eb17e9 100644 --- a/src/gui/widgets/tabs/setup_mods.cpp +++ b/src/gui/widgets/tabs/setup_mods.cpp @@ -89,7 +89,8 @@ void Setup_Mods::loadMods() std::string name = info->getName(); replaceAll(name, "|", ""); SetupItem *const item = new SetupItemCheckBox( - info->getDescription(), "", "", this, name); + info->getDescription(), "", "", this, name, + MainConfig_true); if (modsList.find(name) != modsList.end()) item->setValue("1"); else diff --git a/src/gui/widgets/tabs/setup_perfomance.cpp b/src/gui/widgets/tabs/setup_perfomance.cpp index e12bd2872..e9649494e 100644 --- a/src/gui/widgets/tabs/setup_perfomance.cpp +++ b/src/gui/widgets/tabs/setup_perfomance.cpp @@ -76,126 +76,153 @@ Setup_Perfomance::Setup_Perfomance(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemLabel(_("Better performance (enable for better performance)"), - "", this); + "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Auto adjust performance"), "", - "adjustPerfomance", this, "adjustPerfomanceEvent"); + "adjustPerfomance", this, "adjustPerfomanceEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Hw acceleration"), "", - "hwaccel", this, "hwaccelEvent"); + "hwaccel", this, "hwaccelEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable opacity cache (Software, can " - "use much memory)"), "", "alphaCache", this, "alphaCacheEvent"); + "use much memory)"), "", "alphaCache", this, "alphaCacheEvent", + MainConfig_true); #ifndef USE_SDL2 // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable map reduce (Software)"), "", - "enableMapReduce", this, "enableMapReduceEvent"); + "enableMapReduce", this, "enableMapReduceEvent", + MainConfig_true); #endif // USE_SDL2 // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable compound sprite delay (Software)"), "", - "enableCompoundSpriteDelay", this, "enableCompoundSpriteDelayEvent"); + "enableCompoundSpriteDelay", this, "enableCompoundSpriteDelayEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable delayed images load (OpenGL)"), "", - "enableDelayedAnimations", this, "enableDelayedAnimationsEvent"); + "enableDelayedAnimations", this, "enableDelayedAnimationsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable texture sampler (OpenGL)"), "", - "useTextureSampler", this, "useTextureSamplerEvent"); + "useTextureSampler", this, "useTextureSamplerEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable OpenGL context creation"), - "", "openglContext", this, "openglContextEvent"); + "", "openglContext", this, "openglContextEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable OpenGL direct state access"), - "", "enableDSA", this, "enableDSAEvent"); + "", "enableDSA", this, "enableDSAEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemLabel(_("Better quality (disable for better performance)"), - "", this); + "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable alpha channel fix (Software, can " "be very slow)"), "Can slow down drawing", "enableAlphaFix", - this, "enableAlphaFixEvent"); + this, "enableAlphaFixEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show beings transparency"), "", - "beingopacity", this, "beingopacityEvent"); + "beingopacity", this, "beingopacityEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable reorder sprites (need for mods support)."), - "", "enableReorderSprites", this, "enableReorderSpritesEvent"); + "", "enableReorderSprites", this, "enableReorderSpritesEvent", + MainConfig_true); #ifndef USE_SDL2 // TRANSLATORS: settings option new SetupItemLabel(_("Small memory (enable for lower memory usage)"), - "", this); + "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Disable advanced beings caching (Software)"), "", - "disableAdvBeingCaching", this, "disableAdvBeingCachingEvent"); + "disableAdvBeingCaching", this, "disableAdvBeingCachingEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Disable beings caching (Software)"), "", - "disableBeingCaching", this, "disableBeingCachingEvent"); + "disableBeingCaching", this, "disableBeingCachingEvent", + MainConfig_true); #endif // USE_SDL2 // TRANSLATORS: settings group new SetupItemLabel(_("Different options (enable or disable can " - "improve performance)"), "", this); + "improve performance)"), "", this, + Separator_true); #ifdef USE_SDL2 mSdlDriversList->fillFromVector(sdlDriversList); new SetupItemDropDownStr( // TRANSLATORS: settings option _("Try first sdl driver (only for SDL2 default mode)"), - "", "sdlDriver", this, "sdlDriverEvent", mSdlDriversList, 100); + "", "sdlDriver", this, "sdlDriverEvent", mSdlDriversList, 100, + MainConfig_true); #endif // USE_SDL2 mTexturesList->fillFromArray(&texturesList[0], texturesListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Enable texture compression (OpenGL)"), "", - "compresstextures", this, "compresstexturesEvent", mTexturesList, 100); + "compresstextures", this, "compresstexturesEvent", mTexturesList, 100, + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable rectangular texture extension (OpenGL)"), - "", "rectangulartextures", this, "rectangulartexturesEvent"); + "", "rectangulartextures", this, "rectangulartexturesEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Use new texture internal format (OpenGL)"), - "", "newtextures", this, "newtexturesEvent"); + "", "newtextures", this, "newtexturesEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable texture atlases (OpenGL)"), "", - "useAtlases", this, "useAtlasesEvent"); + "useAtlases", this, "useAtlasesEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Cache all sprites per map (can use " "additional memory)"), "", "uselonglivesprites", this, - "uselonglivespritesEvent"); + "uselonglivespritesEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Cache all sounds (can use additional memory)"), "", "uselonglivesounds", this, - "uselonglivesoundsEvent"); + "uselonglivesoundsEvent", + MainConfig_true); // TRANSLATORS: settings group new SetupItemLabel(_("Critical options (DO NOT change if you don't " - "know what you're doing)"), "", this); + "know what you're doing)"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Disable logging in game (do not enable)"), - "", "disableLoggingInGame", this, "disableLoggingInGameEvent"); + "", "disableLoggingInGame", this, "disableLoggingInGameEvent", + MainConfig_true); setDimension(Rect(0, 0, 550, 350)); } diff --git a/src/gui/widgets/tabs/setup_players.cpp b/src/gui/widgets/tabs/setup_players.cpp index 6d964799d..fde166647 100644 --- a/src/gui/widgets/tabs/setup_players.cpp +++ b/src/gui/widgets/tabs/setup_players.cpp @@ -88,95 +88,116 @@ Setup_Players::Setup_Players(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemCheckBox(_("Show gender"), "", - "showgender", this, "showgenderEvent"); + "showgender", this, "showgenderEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show level"), "", - "showlevel", this, "showlevelEvent"); + "showlevel", this, "showlevelEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show own name"), "", - "showownname", this, "showownnameEvent"); + "showownname", this, "showownnameEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable extended mouse targeting"), "", - "extMouseTargeting", this, "extMouseTargetingEvent"); + "extMouseTargeting", this, "extMouseTargetingEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Target dead players"), "", - "targetDeadPlayers", this, "targetDeadPlayersEvent"); + "targetDeadPlayers", this, "targetDeadPlayersEvent", + MainConfig_true); mVisibleNamesList->fillFromArray(&visibleNamesList[0], visibleNamesListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Show player names"), "", "visiblenames", this, "visiblenamesEvent", - mVisibleNamesList, 150); + mVisibleNamesList, 150, + MainConfig_true); mVisibleNamesPosList->fillFromArray(&topDownList[0], topDownListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Show player names at"), "", "visiblenamespos", this, "visiblenamesposEvent", - mVisibleNamesPosList, 150); + mVisibleNamesPosList, 150, + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Auto move names"), "", - "moveNames", this, "moveNamesEvent"); + "moveNames", this, "moveNamesEvent", + MainConfig_true); mBadgesList->fillFromArray(&badgesList[0], badgesListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Badges"), "", - "showBadges", this, "showBadgesEvent", mBadgesList, 150); + "showBadges", this, "showBadgesEvent", mBadgesList, 150, + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Secure trades"), "", - "securetrades", this, "securetradesEvent"); + "securetrades", this, "securetradesEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemTextField(_("Unsecure chars in names"), "", - "unsecureChars", this, "unsecureCharsEvent"); + "unsecureChars", this, "unsecureCharsEvent", + MainConfig_true, UseBase64_false); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show statuses"), "", - "showPlayersStatus", this, "showPlayersStatusEvent"); + "showPlayersStatus", this, "showPlayersStatusEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show ip addresses on screenshots"), "", - "showip", this, "showipEvent"); + "showip", this, "showipEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Allow self heal with mouse click"), "", - "selfMouseHeal", this, "selfMouseHealEvent"); + "selfMouseHeal", this, "selfMouseHealEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Group friends in who is online window"), "", - "groupFriends", this, "groupFriendsEvent"); + "groupFriends", this, "groupFriendsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Hide erased players nicks"), "", - "hideErased", this, "hideErasedEvent"); + "hideErased", this, "hideErasedEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Collect players id and seen log"), - "", "enableIdCollecting", this, "enableIdCollectingEvent"); + "", "enableIdCollecting", this, "enableIdCollectingEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Use special diagonal speed in players moving"), - "", "useDiagonalSpeed", this, "useDiagonalSpeedEvent"); + "", "useDiagonalSpeed", this, "useDiagonalSpeedEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Log players actions (for GM)"), - "", "logPlayerActions", this, "logPlayerActionsEvent"); + "", "logPlayerActions", this, "logPlayerActionsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Create screenshots for each complete trades"), - "", "tradescreenshot", this, "tradescreenshotEvent"); + "", "tradescreenshot", this, "tradescreenshotEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Emulate right mouse button by long mouse click" " (useful for touch interfaces)"), - "", "longmouseclick", this, "longmouseclickEvent"); + "", "longmouseclick", this, "longmouseclickEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable remote commands"), @@ -186,7 +207,8 @@ Setup_Players::Setup_Players(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemCheckBox(_("Allow move character by mouse"), - "", "allowMoveByMouse", this, "allowMoveByMouseEvent"); + "", "allowMoveByMouse", this, "allowMoveByMouseEvent", + MainConfig_true); setDimension(Rect(0, 0, 550, 350)); } diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp index c8558fef9..355cf9452 100644 --- a/src/gui/widgets/tabs/setup_touch.cpp +++ b/src/gui/widgets/tabs/setup_touch.cpp @@ -75,11 +75,13 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) : mFormatList->fillFromArray(&formatList[0], formatListSize); // TRANSLATORS: settings option - new SetupItemLabel(_("Onscreen keyboard"), "", this); + new SetupItemLabel(_("Onscreen keyboard"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show onscreen keyboard icon"), "", - "showScreenKeyboard", this, "showScreenKeyboardEvent"); + "showScreenKeyboard", this, "showScreenKeyboardEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupActionDropDown(_("Keyboard icon action"), "", @@ -88,31 +90,38 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) : // TRANSLATORS: settings group - new SetupItemLabel(_("Onscreen joystick"), "", this); + new SetupItemLabel(_("Onscreen joystick"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show onscreen joystick"), "", - "showScreenJoystick", this, "showScreenJoystickEvent"); + "showScreenJoystick", this, "showScreenJoystickEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemDropDown(_("Joystick size"), "", "screenJoystickSize", this, - "screenJoystickEvent", mSizeList, 100); + "screenJoystickEvent", mSizeList, 100, + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Onscreen buttons"), "", this); + new SetupItemLabel(_("Onscreen buttons"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show onscreen buttons"), "", - "showScreenButtons", this, "showScreenButtonsEvent"); + "showScreenButtons", this, "showScreenButtonsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemDropDown(_("Buttons format"), "", "screenButtonsFormat", this, - "screenButtonsFormatEvent", mFormatList, 100); + "screenButtonsFormatEvent", mFormatList, 100, + MainConfig_true); // TRANSLATORS: settings option new SetupItemDropDown(_("Buttons size"), "", "screenButtonsSize", this, - "screenButtonsSizeEvent", mSizeList, 100); + "screenButtonsSizeEvent", mSizeList, 100, + MainConfig_true); for (unsigned int f = 0; f < 12; f ++) { diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp index de5cc8b3b..7a2af36c4 100644 --- a/src/gui/widgets/tabs/setup_visual.cpp +++ b/src/gui/widgets/tabs/setup_visual.cpp @@ -104,7 +104,8 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : mPreferredFirstItemSize = 150; // TRANSLATORS: settings option - new SetupItemLabel(_("Scale"), "", this); + new SetupItemLabel(_("Scale"), "", this, + Separator_true); for (int f = 1; f <= 7; f ++) { @@ -113,31 +114,38 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : } // TRANSLATORS: settings option new SetupItemSliderInt(_("Scale"), "", - "scale", this, "scaleEvent", mScaleList, 1); + "scale", this, "scaleEvent", mScaleList, 1, + 150, OnTheFly_false, MainConfig_true); // TRANSLATORS: settings option - new SetupItemLabel(_("Notifications"), "", this); + new SetupItemLabel(_("Notifications"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show pickup notifications in chat"), "", - "showpickupchat", this, "showpickupchatEvent"); + "showpickupchat", this, "showpickupchatEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show pickup notifications as particle effects"), - "", "showpickupparticle", this, "showpickupparticleEvent"); + "", "showpickupparticle", this, "showpickupparticleEvent", + MainConfig_true); // TRANSLATORS: settings option - new SetupItemLabel(_("Effects"), "", this); + new SetupItemLabel(_("Effects"), "", this, + Separator_true); #ifndef ANDROID // TRANSLATORS: settings option new SetupItemCheckBox(_("Grab mouse and keyboard input"), - "", "grabinput", this, "grabinputEvent"); + "", "grabinput", this, "grabinputEvent", + MainConfig_true); #endif // ANDROID // TRANSLATORS: settings option new SetupItemCheckBox(_("Blurring textures (OpenGL)"), - "", "blur", this, "blurEvent"); + "", "blur", this, "blurEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemSlider(_("Gui opacity"), "", "guialpha", @@ -147,25 +155,30 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable gui opacity"), - "", "enableGuiOpacity", this, "enableGuiOpacityEvent"); + "", "enableGuiOpacity", this, "enableGuiOpacityEvent", + MainConfig_true); mSpeachList->fillFromArray(&speachList[0], speachListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Overhead text"), "", "speech", this, - "speechEvent", mSpeachList, 200); + "speechEvent", mSpeachList, 200, + MainConfig_true); mAmbientFxList->fillFromArray(&ambientFxList[0], ambientFxListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Ambient FX"), "", "OverlayDetail", this, - "OverlayDetailEvent", mAmbientFxList, 100); + "OverlayDetailEvent", mAmbientFxList, 100, + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show particle effects"), "", - "particleeffects", this, "particleeffectsEvent"); + "particleeffects", this, "particleeffectsEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Show particle effects from maps"), "", - "mapparticleeffects", this, "mapparticleeffectsEvent"); + "mapparticleeffects", this, "mapparticleeffectsEvent", + MainConfig_true); // TRANSLATORS: particle details mParticleList->push_back(_("low")); @@ -186,15 +199,18 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : particleTypeListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Particle physics"), "", "particleFastPhysics", - this, "particleFastPhysicsEvent", mParticleTypeList, 200); + this, "particleFastPhysicsEvent", mParticleTypeList, 200, + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Gamma"), "", this); + new SetupItemLabel(_("Gamma"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable gamma control"), - "", "enableGamma", this, "enableGammaEvent"); + "", "enableGamma", this, "enableGammaEvent", + MainConfig_true); // TRANSLATORS: settings option new SetupItemSlider(_("Gamma"), "", "gamma", @@ -204,30 +220,36 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : // TRANSLATORS: settings group - new SetupItemLabel(_("Other"), "", this); + new SetupItemLabel(_("Other"), "", this, + Separator_true); mVSyncList->fillFromArray(&vSyncList[0], vSyncListSize); // TRANSLATORS: settings option new SetupItemDropDown(_("Vsync"), "", "vsync", this, - "vsyncEvent", mVSyncList, 100); + "vsyncEvent", mVSyncList, 100, + MainConfig_true); #if defined(WIN32) || defined(__APPLE__) // TRANSLATORS: settings option new SetupItemCheckBox(_("Center game window"), - "", "centerwindow", this, "centerwindowEvent"); + "", "centerwindow", this, "centerwindowEvent", + MainConfig_true); #endif // defined(WIN32) || defined(__APPLE__) // TRANSLATORS: settings option new SetupItemCheckBox(_("Allow screensaver to run"), - "", "allowscreensaver", this, "allowscreensaverEvent"); + "", "allowscreensaver", this, "allowscreensaverEvent", + MainConfig_true); // TRANSLATORS: settings group - new SetupItemLabel(_("Screenshots"), "", this); + new SetupItemLabel(_("Screenshots"), "", this, + Separator_true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Add water mark into screenshots"), - "", "addwatermark", this, "addwatermarkEvent"); + "", "addwatermark", this, "addwatermarkEvent", + MainConfig_true); setDimension(Rect(0, 0, 550, 350)); } |