From fb8d6d48818dbe2443dff3369f4e12b853c908cf Mon Sep 17 00:00:00 2001 From: Robert Adam Date: Thu, 15 Apr 2021 19:41:59 +0200 Subject: [PATCH] REFAC(client): Move channel sep. setting to own category This setting will be needed for other purposes as well and therefore putting this into the TalkingUI group of settings in no longer applicable. --- src/mumble/LookConfig.cpp | 7 +- src/mumble/LookConfig.ui | 499 +++++++++++++++++++------------------- src/mumble/Settings.cpp | 12 +- src/mumble/Settings.h | 3 +- src/mumble/TalkingUI.cpp | 4 +- 5 files changed, 271 insertions(+), 254 deletions(-) diff --git a/src/mumble/LookConfig.cpp b/src/mumble/LookConfig.cpp index 1683f0e4f..66fd4dcd7 100644 --- a/src/mumble/LookConfig.cpp +++ b/src/mumble/LookConfig.cpp @@ -199,8 +199,9 @@ void LookConfig::load(const Settings &r) { qsbMaxNameLength->setValue(r.iTalkingUI_MaxChannelNameLength); qsbPrefixCharCount->setValue(r.iTalkingUI_PrefixCharCount); qsbPostfixCharCount->setValue(r.iTalkingUI_PostfixCharCount); - qleChannelSeparator->setText(r.qsTalkingUI_ChannelSeparator); qleAbbreviationReplacement->setText(r.qsTalkingUI_AbbreviationReplacement); + + qleChannelSeparator->setText(r.qsHierarchyChannelSeparator); } void LookConfig::save() const { @@ -266,8 +267,9 @@ void LookConfig::save() const { s.iTalkingUI_MaxChannelNameLength = qsbMaxNameLength->value(); s.iTalkingUI_PrefixCharCount = qsbPrefixCharCount->value(); s.iTalkingUI_PostfixCharCount = qsbPostfixCharCount->value(); - s.qsTalkingUI_ChannelSeparator = qleChannelSeparator->text(); s.qsTalkingUI_AbbreviationReplacement = qleAbbreviationReplacement->text(); + + s.qsHierarchyChannelSeparator = qleChannelSeparator->text(); } void LookConfig::accept() const { @@ -294,6 +296,5 @@ void LookConfig::on_qcbAbbreviateChannelNames_stateChanged(int state) { qsbMaxNameLength->setEnabled(abbreviateNames); qsbPrefixCharCount->setEnabled(abbreviateNames); qsbPostfixCharCount->setEnabled(abbreviateNames); - qleChannelSeparator->setEnabled(abbreviateNames); qleAbbreviationReplacement->setEnabled(abbreviateNames); } diff --git a/src/mumble/LookConfig.ui b/src/mumble/LookConfig.ui index bd804382d..a09faa025 100644 --- a/src/mumble/LookConfig.ui +++ b/src/mumble/LookConfig.ui @@ -7,243 +7,13 @@ 0 0 728 - 1148 + 1273 Form - - - - - 0 - 0 - - - - Talking UI - - - false - - - false - - - - 6 - - - - - The names of how many parent channels should be included in the channel's name when displaying it in the TalkingUI? - - - Channel hierarchy depth - - - - - - - The names of how many parent channels should be included in the channel's name when displaying it in the TalkingUI? - - - - - - - - 0 - 0 - - - - String that gets used instead of the cut-out part of an abbreviated name. - - - - - - - String to separate a channel name from its parent's. - - - Channel separator - - - - - - - Relative font size to use in the Talking UI in percent. - - - 1 - - - 500 - - - - - - - If this is checked, the local user (yourself) will always be visible in the TalkingUI (regardless of talking state). - - - Always keep local user visible - - - - - - - The preferred maximum length of a channel (hierarchy) name in the Talking UI. Note that this is not a hard limit though. - - - - - - - How many characters from the original name to display at the beginning of an abbreviated name. - - - Abbreviated prefix characters - - - - - - - - 0 - 0 - - - - A user that is silent for the given amount of seconds will be removed from the Talkin UI. - - - - - - - How many characters from the original name to display at the end of an abbreviated name. - - - - - - - The preferred maximum length of a channel (hierarchy) name in the Talking UI. Note that this is not a hard limit though. - - - Max. channel name length - - - - - - - Whether to also allow abbreviating the current channel of a user (instead of only its parent channels). - - - Abbreviate current channel name - - - - - - - - 0 - 0 - - - - A user that is silent for the given amount of seconds will be removed from the Talkin UI. - - - Remove silent user after - - - - - - - Whether the channel (hierarchy) name should be abbreviated, if it exceeds the specified maximum length. - - - Abbreviate channel names - - - - - - - How many characters from the original name to display at the end of an abbreviated name. - - - Abbreviated postfix characters - - - - - - - String that gets used instead of the cut-out part of an abbreviated name. - - - Abbreviation replacement - - - - - - - How many characters from the original name to display at the beginning of an abbreviated name. - - - - - - - - 0 - 0 - - - - String to separate a channel name from its parent's. - - - - - - - Relative font size to use in the Talking UI in percent. - - - Rel. font size (%) - - - - - - - Whether to show all of the local user's listeners (ears) in the TalkingUI (and thereby also the channels they are in). - - - Show local user's listeners (ears) - - - - - - @@ -662,19 +432,6 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -792,7 +549,214 @@ - + + + + + 0 + 0 + + + + Talking UI + + + false + + + false + + + + 6 + + + + + How many characters from the original name to display at the end of an abbreviated name. + + + Abbreviated postfix characters + + + + + + + The preferred maximum length of a channel (hierarchy) name in the Talking UI. Note that this is not a hard limit though. + + + + + + + + 0 + 0 + + + + String that gets used instead of the cut-out part of an abbreviated name. + + + + + + + How many characters from the original name to display at the end of an abbreviated name. + + + + + + + Relative font size to use in the Talking UI in percent. + + + 1 + + + 500 + + + + + + + The preferred maximum length of a channel (hierarchy) name in the Talking UI. Note that this is not a hard limit though. + + + Max. channel name length + + + + + + + + 0 + 0 + + + + A user that is silent for the given amount of seconds will be removed from the Talkin UI. + + + + + + + Whether to also allow abbreviating the current channel of a user (instead of only its parent channels). + + + Abbreviate current channel name + + + + + + + + 0 + 0 + + + + A user that is silent for the given amount of seconds will be removed from the Talkin UI. + + + Remove silent user after + + + + + + + Whether the channel (hierarchy) name should be abbreviated, if it exceeds the specified maximum length. + + + Abbreviate channel names + + + + + + + The names of how many parent channels should be included in the channel's name when displaying it in the TalkingUI? + + + + + + + Whether to show all of the local user's listeners (ears) in the TalkingUI (and thereby also the channels they are in). + + + Show local user's listeners (ears) + + + + + + + String that gets used instead of the cut-out part of an abbreviated name. + + + Abbreviation replacement + + + + + + + How many characters from the original name to display at the beginning of an abbreviated name. + + + Abbreviated prefix characters + + + + + + + If this is checked, the local user (yourself) will always be visible in the TalkingUI (regardless of talking state). + + + Always keep local user visible + + + + + + + How many characters from the original name to display at the beginning of an abbreviated name. + + + + + + + Relative font size to use in the Talking UI in percent. + + + Rel. font size (%) + + + + + + + The names of how many parent channels should be included in the channel's name when displaying it in the TalkingUI? + + + Channel hierarchy depth + + + + + + + Qt::Vertical @@ -805,6 +769,51 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Channel Hierarchy String + + + + + + String to separate a channel name from its parent's. + + + Channel separator + + + + + + + + 0 + 0 + + + + String to separate a channel name from its parent's. + + + + + + diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index ae9b41c75..d38ca70bc 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -505,9 +505,10 @@ Settings::Settings() { iTalkingUI_MaxChannelNameLength = 20; iTalkingUI_PrefixCharCount = 3; iTalkingUI_PostfixCharCount = 2; - qsTalkingUI_ChannelSeparator = QLatin1String("/"); qsTalkingUI_AbbreviationReplacement = QLatin1String("..."); + qsHierarchyChannelSeparator = QLatin1String("/"); + manualPlugin_silentUserDisplaytime = 1; bShortcutEnable = true; @@ -934,9 +935,12 @@ void Settings::load(QSettings *settings_ptr) { LOAD(iTalkingUI_MaxChannelNameLength, "ui/talkingUI_MaxChannelNameLength"); LOAD(iTalkingUI_PrefixCharCount, "ui/talkingUI_PrefixCharCount"); LOAD(iTalkingUI_PostfixCharCount, "ui/talkingUI_PostfixCharCount"); - LOAD(qsTalkingUI_ChannelSeparator, "ui/talkingUI_ChannelSeparator"); LOAD(qsTalkingUI_AbbreviationReplacement, "ui/talkingUI_AbbreviationReplacement"); + // Load the old setting first in case it is set and then load the actual setting + LOAD(qsHierarchyChannelSeparator, "ui/talkingUI_ChannelSeparator"); + LOAD(qsHierarchyChannelSeparator, "ui/hierarchy_channelSeparator"); + LOAD(manualPlugin_silentUserDisplaytime, "ui/manualPlugin_silentUserDisplaytime"); // PTT Button window @@ -1329,9 +1333,11 @@ void Settings::save() { SAVE(iTalkingUI_MaxChannelNameLength, "ui/talkingUI_MaxChannelNameLength"); SAVE(iTalkingUI_PrefixCharCount, "ui/talkingUI_PrefixCharCount"); SAVE(iTalkingUI_PostfixCharCount, "ui/talkingUI_PostfixCharCount"); - SAVE(qsTalkingUI_ChannelSeparator, "ui/talkingUI_ChannelSeparator"); SAVE(qsTalkingUI_AbbreviationReplacement, "ui/talkingUI_AbbreviationReplacement"); + DEPRECATED("ui/talkingUI_ChannelSeparator"); + SAVE(qsHierarchyChannelSeparator, "ui/hierarchy_channelSeparator"); + SAVE(manualPlugin_silentUserDisplaytime, "ui/manualPlugin_silentUserDisplaytime"); // PTT Button window diff --git a/src/mumble/Settings.h b/src/mumble/Settings.h index 062c9a02d..165f8b7c9 100644 --- a/src/mumble/Settings.h +++ b/src/mumble/Settings.h @@ -315,9 +315,10 @@ struct Settings { int iTalkingUI_MaxChannelNameLength; int iTalkingUI_PrefixCharCount; int iTalkingUI_PostfixCharCount; - QString qsTalkingUI_ChannelSeparator; QString qsTalkingUI_AbbreviationReplacement; + QString qsHierarchyChannelSeparator; + int manualPlugin_silentUserDisplaytime; QMap< int, QString > qmMessageSounds; diff --git a/src/mumble/TalkingUI.cpp b/src/mumble/TalkingUI.cpp index 92a0a6e58..eb394f42d 100644 --- a/src/mumble/TalkingUI.cpp +++ b/src/mumble/TalkingUI.cpp @@ -332,7 +332,7 @@ void TalkingUI::addChannel(const Channel *channel) { const QString channelName = createChannelName( channel, Global::get().s.bTalkingUI_AbbreviateChannelNames, Global::get().s.iTalkingUI_PrefixCharCount, Global::get().s.iTalkingUI_PostfixCharCount, Global::get().s.iTalkingUI_MaxChannelNameLength, - Global::get().s.iTalkingUI_ChannelHierarchyDepth, Global::get().s.qsTalkingUI_ChannelSeparator, + Global::get().s.iTalkingUI_ChannelHierarchyDepth, Global::get().s.qsHierarchyChannelSeparator, Global::get().s.qsTalkingUI_AbbreviationReplacement, Global::get().s.bTalkingUI_AbbreviateCurrentChannel); std::unique_ptr< TalkingUIChannel > channelContainer = @@ -729,7 +729,7 @@ void TalkingUI::on_settingsChanged() { channelContainer->setName(createChannelName( channel, Global::get().s.bTalkingUI_AbbreviateChannelNames, Global::get().s.iTalkingUI_PrefixCharCount, Global::get().s.iTalkingUI_PostfixCharCount, Global::get().s.iTalkingUI_MaxChannelNameLength, - Global::get().s.iTalkingUI_ChannelHierarchyDepth, Global::get().s.qsTalkingUI_ChannelSeparator, + Global::get().s.iTalkingUI_ChannelHierarchyDepth, Global::get().s.qsHierarchyChannelSeparator, Global::get().s.qsTalkingUI_AbbreviationReplacement, Global::get().s.bTalkingUI_AbbreviateCurrentChannel)); } else {