mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

FEAT(settings): Allow disabling of the public server list

Browse Source 
This commit makes it possible to hide the public server list from the connect dialog.
The setting's group was left to be "ui" for backwards compatibility (even though the
actual setting is part of the network settings in the UI).

Implements #4070
This commit is contained in:
Tim-Marek Thomas 2020-06-18 16:41:56 +02:00 committed by Robert Adam
parent ee1eb75cf5
commit 0ada48fb2b
5 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mumble/ConnectDialog.cpp
View File

@ -110,7 +110,7 @@ ServerView::ServerView(QWidget *p) : QTreeWidget(p) {
siLAN = nullptr;
#endif
if (!g.s.disablePublicList) {
if (!g.s.bDisablePublicList) {
siPublic = new ServerItem(tr("Public Internet"), ServerItem::PublicType);
siPublic->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
addTopLevelItem(siPublic);
@ -936,7 +936,7 @@ ConnectDialog::ConnectDialog(QWidget *p, bool autoconnect) : QDialog(p), bAutoCo
qtwServers->setItemDelegate(new ServerViewDelegate());
if (!g.s.disablePublicList) {
if (!g.s.bDisablePublicList) {
const QIcon qiFlag = ServerItem::loadIcon(QLatin1String("skin:categories/applications-internet.svg"));
// Add continents and 'Unknown' to the location combobox
qcbSearchLocation->addItem(qiFlag, tr("All"), QLatin1String("all"));
@ -1279,7 +1279,7 @@ void ConnectDialog::on_qtwServers_itemExpanded(QTreeWidgetItem *item) {
QMessageBox::Yes|QMessageBox::No);
g.s.bPingServersDialogViewed = true;
if (result == QMessageBox::No) {
g.s.disablePublicList = true;
g.s.bDisablePublicList = true;
item->setExpanded(false);
item->setHidden(true);
return;
@ -1519,8 +1519,10 @@ void ConnectDialog::timeTick() {
}
void ConnectDialog::filterPublicServerList() const {
foreach(ServerItem * const si, qtwServers->siPublic->qlChildren) {
filterServer(si);
if (!g.s.bDisablePublicList) {
foreach(ServerItem * const si, qtwServers->siPublic->qlChildren) {
filterServer(si);
}
}
}

2
src/mumble/NetworkConfig.cpp
View File

@ -56,6 +56,7 @@ void NetworkConfig::load(const Settings &r) {
loadCheckBox(qcbQoS, s.bQoS);
loadCheckBox(qcbAutoReconnect, s.bReconnect);
loadCheckBox(qcbAutoConnect, s.bAutoConnect);
loadCheckBox(qcbDisablePublicList, s.bDisablePublicList);
loadCheckBox(qcbSuppressIdentity, s.bSuppressIdentity);
loadComboBox(qcbType, s.ptProxyType);
@ -84,6 +85,7 @@ void NetworkConfig::save() const {
s.bQoS = qcbQoS->isChecked();
s.bReconnect = qcbAutoReconnect->isChecked();
s.bAutoConnect = qcbAutoConnect->isChecked();
s.bDisablePublicList = qcbDisablePublicList->isChecked();
s.bSuppressIdentity = qcbSuppressIdentity->isChecked();
s.bHideOS = qcbHideOS->isChecked();

15
src/mumble/NetworkConfig.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>576</width>
<height>567</height>
<height>572</height>
</rect>
</property>
<property name="windowTitle">
@ -340,6 +340,19 @@ Prevents the client from sending potentially identifying information about the o
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="qcbDisablePublicList">
<property name="enabled">
<bool>true</bool>
</property>
<property name="toolTip">
<string>When toggled this hides the public server list from the connect dialog</string>
</property>
<property name="text">
<string>Hide public server list</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

6
src/mumble/Settings.cpp
View File

@ -415,6 +415,7 @@ Settings::Settings() {
bQoS = true;
bReconnect = true;
bAutoConnect = false;
bDisablePublicList = false;
ptProxyType = NoProxy;
usProxyPort = 0;
iMaxInFlightTCPPings = 4;
@ -440,7 +441,6 @@ Settings::Settings() {
// Special configuration options not exposed to UI
bDisableCELT = false;
disablePublicList = false;
disableConnectDialogEditing = false;
bPingServersDialogViewed = false;
@ -828,6 +828,7 @@ void Settings::load(QSettings* settings_ptr) {
SAVELOAD(iMaxLogBlocks, "ui/MaxLogBlocks");
SAVELOAD(bLog24HourClock, "ui/24HourClock");
SAVELOAD(iChatMessageMargins, "ui/ChatMessageMargins");
SAVELOAD(bDisablePublicList, "ui/disablepubliclist");
// TalkingUI
SAVELOAD(bShowTalkingUI, "ui/showTalkingUI");
@ -855,7 +856,6 @@ void Settings::load(QSettings* settings_ptr) {
// Special configuration options not exposed to UI
SAVELOAD(bDisableCELT, "audio/disablecelt");
SAVELOAD(disablePublicList, "ui/disablepubliclist");
SAVELOAD(disableConnectDialogEditing, "ui/disableconnectdialogediting");
SAVELOAD(bPingServersDialogViewed, "consent/pingserversdialogviewed");
@ -1180,6 +1180,7 @@ void Settings::save() {
SAVELOAD(iMaxLogBlocks, "ui/MaxLogBlocks");
SAVELOAD(bLog24HourClock, "ui/24HourClock");
SAVELOAD(iChatMessageMargins, "ui/ChatMessageMargins");
SAVELOAD(bDisablePublicList, "ui/disablepubliclist");
// TalkingUI
SAVELOAD(bShowTalkingUI, "ui/showTalkingUI");
@ -1207,7 +1208,6 @@ void Settings::save() {
// Special configuration options not exposed to UI
SAVELOAD(bDisableCELT, "audio/disablecelt");
SAVELOAD(disablePublicList, "ui/disablepubliclist");
SAVELOAD(disableConnectDialogEditing, "ui/disableconnectdialogediting");
SAVELOAD(bPingServersDialogViewed, "consent/pingserversdialogviewed");

5
src/mumble/Settings.h
View File

@ -345,6 +345,8 @@ struct Settings {
bool bReconnect;
bool bAutoConnect;
bool bQoS;
/// Disables the "Public Internet" section in the connect dialog if set.
bool bDisablePublicList;
ProxyType ptProxyType;
QString qsProxyHost, qsProxyUsername, qsProxyPassword;
unsigned short usProxyPort;
@ -417,9 +419,6 @@ struct Settings {
/// Codec kill-switch
bool bDisableCELT;
/// Disables the "Public Internet" section in the connect dialog if set.
bool disablePublicList;
/// Removes the add and edit options in the connect dialog if set.
bool disableConnectDialogEditing;