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(serverbrowser): Update serverbrowser UI

Browse Source 
The location subtree for the public servers is now gone.
All public servers are now child elements of "Public Internet" regardless
of location. A flag Icon has been added to each public server to
indicate its location.

A search bar for the public servers is added.  It is only visible when the
public servers are expanded.  Searching for a server name and filtering
by location is possible. The "server status filters"
(Show Reachable etc...) have been moved from the context menu of the
server browser to the search dialog.

This also adds a window that is shown once the user expands the public
server list for the first time. The user is asked for consent to
transmit the IP address to each of the public servers.
If the user does not consent, the public server list is disabled.

Implements #3532
This commit is contained in:
Popkornium18 2020-06-18 01:12:25 +02:00
parent a20d16777e
commit 0ba080f638
5 changed files with 264 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

284
src/mumble/ConnectDialog.cpp
View File

@ -116,16 +116,6 @@ ServerView::ServerView(QWidget *p) : QTreeWidget(p) {
addTopLevelItem(siPublic);
siPublic->setExpanded(false);
// The continent code is empty when the server's IP address is not in the GeoIP database
qmContinentNames.insert(QLatin1String(""), tr("Unknown"));
qmContinentNames.insert(QLatin1String("af"), tr("Africa"));
qmContinentNames.insert(QLatin1String("as"), tr("Asia"));
qmContinentNames.insert(QLatin1String("na"), tr("North America"));
qmContinentNames.insert(QLatin1String("sa"), tr("South America"));
qmContinentNames.insert(QLatin1String("eu"), tr("Europe"));
qmContinentNames.insert(QLatin1String("oc"), tr("Oceania"));
} else {
qWarning()<< "Public list disabled";
@ -207,48 +197,6 @@ bool ServerView::dropMimeData(QTreeWidgetItem *, int, const QMimeData *mime, Qt:
return true;
}
ServerItem *ServerView::getParent(const QString &continentcode, const QString &countrycode, const QString &countryname, const QString &usercontinent, const QString &usercountry) {
ServerItem *continent = qmContinent.value(continentcode);
if (!continent) {
QString name = qmContinentNames.value(continentcode);
if (name.isEmpty())
name = continentcode;
continent = new ServerItem(name, ServerItem::PublicType, continentcode);
qmContinent.insert(continentcode, continent);
siPublic->addServerItem(continent);
if (!continentcode.isEmpty()) {
if (continentcode == usercontinent) {
continent->setExpanded(true);
scrollToItem(continent, QAbstractItemView::PositionAtTop);
}
} else {
continent->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
}
}
// If the continent code is empty, we put the server directly into the "Unknown" continent
if (continentcode.isEmpty()) {
return continent;
}
ServerItem *country = qmCountry.value(countrycode);
if (!country) {
country = new ServerItem(countryname, ServerItem::PublicType, continentcode, countrycode);
qmCountry.insert(countrycode, country);
country->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
continent->addServerItem(country);
if (!countrycode.isEmpty() && countrycode == usercountry) {
country->setExpanded(true);
scrollToItem(country, QAbstractItemView::PositionAtTop);
}
}
return country;
}
void ServerItem::init() {
// Without this, columncount is wrong.
setData(0, Qt::DisplayRole, QVariant());
@ -338,15 +286,11 @@ ServerItem::ServerItem(const BonjourRecord &br) : QTreeWidgetItem(QTreeWidgetIte
}
#endif
ServerItem::ServerItem(const QString &name, ItemType itype, const QString &continent, const QString &country) {
ServerItem::ServerItem(const QString &name, ItemType itype) {
siParent = NULL;
bParent = true;
qsName = name;
itType = itype;
if (itType == PublicType) {
qsCountryCode = country;
qsContinentCode = continent;
}
setFlags(flags() & ~Qt::ItemIsDragEnabled);
bCA = false;
@ -494,18 +438,23 @@ QVariant ServerItem::data(int column, int role) const {
return loadIcon(QLatin1String("skin:emblems/emblem-favorite.svg"));
else if (itType == LANType)
return loadIcon(QLatin1String("skin:places/network-workgroup.svg"));
else if (! qsCountryCode.isEmpty()) {
QString flag = QString::fromLatin1(":/flags/%1.svg").arg(qsCountryCode);
if (!QFileInfo(flag).exists()) {
flag = QLatin1String("skin:categories/applications-internet.svg");
}
return loadIcon(flag);
}
else
return loadIcon(QLatin1String("skin:categories/applications-internet.svg"));
}
}
} else {
if (role == Qt::DecorationRole && column == 0) {
QString flag;
if (! qsCountryCode.isEmpty()) {
flag = QString::fromLatin1(":/flags/%1.svg").arg(qsCountryCode);
if (!QFileInfo(flag).exists()) {
flag = QLatin1String("skin:categories/applications-internet.svg");
}
} else {
flag = QLatin1String("skin:categories/applications-internet.svg");
}
return loadIcon(flag);
}
if (role == Qt::DisplayRole) {
switch (column) {
case 0:
@ -574,28 +523,15 @@ void ServerItem::addServerItem(ServerItem *childitem) {
childitem->siParent = this;
qlChildren.append(childitem);
childitem->hideCheck();
if (bParent && (itType != PublicType) && isHidden())
setHidden(false);
}
// If all child items are hidden, there is no child indicator, regardless of policy, so we have to add/remove instead.
void ServerItem::hideCheck() {
bool hide = false;
bool ishidden = (parent() == NULL);
if (! bParent && (itType == PublicType)) {
if (g.s.ssFilter == Settings::ShowReachable)
hide = (dPing == 0.0);
else if (g.s.ssFilter == Settings::ShowPopulated)
hide = (uiUsers == 0);
addChild(childitem);
// Public servers must initially be hidden for the search to work properly
// They will be set to visible later on
if (childitem->itType == PublicType) {
childitem->setHidden(true);
}
if (hide != ishidden) {
if (hide)
siParent->removeChild(this);
else
siParent->addChild(this);
if (bParent && (itType != PublicType) && isHidden()) {
setHidden(false);
}
}
@ -637,7 +573,7 @@ FavoriteServer ServerItem::toFavoriteServer() const {
fs.qsHostname = QLatin1Char('@') + qsBonjourHost;
else
fs.qsHostname = qsHostname;
#else
#else
fs.qsHostname = qsHostname;
#endif
fs.usPort = usPort;
@ -988,19 +924,34 @@ ConnectDialog::ConnectDialog(QWidget *p, bool autoconnect) : QDialog(p), bAutoCo
connect(qpbAdd, SIGNAL(clicked()), qaFavoriteAddNew, SIGNAL(triggered()));
qdbbButtonBox->addButton(qpbAdd, QDialogButtonBox::ActionRole);
qpbEdit = new QPushButton(tr("&Edit..."), this);
qpbEdit->setEnabled(false);
qpbEdit->setDefault(false);
qpbEdit->setAutoDefault(false);
connect(qpbEdit, SIGNAL(clicked()), qaFavoriteEdit, SIGNAL(triggered()));
qdbbButtonBox->addButton(qpbEdit, QDialogButtonBox::ActionRole);
qpbAdd->setHidden(g.s.disableConnectDialogEditing);
qpbEdit->setHidden(g.s.disableConnectDialogEditing);
qtwServers->setItemDelegate(new ServerViewDelegate());
if (!g.s.disablePublicList) {
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"));
qcbSearchLocation->addItem(qiFlag, tr("Africa"), QLatin1String("af"));
qcbSearchLocation->addItem(qiFlag, tr("Asia"), QLatin1String("as"));
qcbSearchLocation->addItem(qiFlag, tr("Europe"), QLatin1String("eu"));
qcbSearchLocation->addItem(qiFlag, tr("North America"), QLatin1String("na"));
qcbSearchLocation->addItem(qiFlag, tr("Oceania"), QLatin1String("oc"));
qcbSearchLocation->addItem(qiFlag, tr("South America"), QLatin1String("sa"));
qcbSearchLocation->addItem(qiFlag, tr("Unknown"), QLatin1String(""));
addCountriesToSearchLocation();
}
qgbSearch->setVisible(false);
// Hide ping and user count if we are not allowed to ping.
if (!bAllowPing) {
qtwServers->setColumnCount(1);
@ -1018,42 +969,23 @@ ConnectDialog::ConnectDialog(QWidget *p, bool autoconnect) : QDialog(p), bAutoCo
connect(qtwServers->header(), SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(OnSortChanged(int, Qt::SortOrder)));
qaShowAll->setChecked(false);
qaShowReachable->setChecked(false);
qaShowPopulated->setChecked(false);
if (bAllowFilters) {
switch (g.s.ssFilter) {
case Settings::ShowPopulated:
qaShowPopulated->setChecked(true);
qcbFilter->setCurrentText(tr("Show Populated"));
break;
case Settings::ShowReachable:
qaShowReachable->setChecked(true);
case Settings::ShowAll:
qcbFilter->setCurrentText(tr("Show All"));
break;
default:
qaShowAll->setChecked(true);
qcbFilter->setCurrentText(tr("Show Reachable"));
break;
}
} else {
qaShowAll->setChecked(true);
qcbFilter->setEnabled(false);
}
qagFilters = new QActionGroup(this);
qagFilters->addAction(qaShowAll);
qagFilters->addAction(qaShowReachable);
qagFilters->addAction(qaShowPopulated);
connect(qagFilters, SIGNAL(triggered(QAction *)), this, SLOT(onFiltersTriggered(QAction *)));
qmPopup = new QMenu(this);
qmFilters = new QMenu(tr("&Filters"), this);
qmFilters->addAction(qaShowAll);
qmFilters->addAction(qaShowReachable);
qmFilters->addAction(qaShowPopulated);
if (!bAllowFilters) {
qmFilters->setEnabled(false);
}
QList<QTreeWidgetItem *> ql;
QList<FavoriteServer> favorites = g.db->getFavorites();
@ -1284,18 +1216,6 @@ void ConnectDialog::on_qaUrl_triggered() {
QDesktopServices::openUrl(QUrl(si->qsUrl));
}
void ConnectDialog::onFiltersTriggered(QAction *act) {
if (act == qaShowAll)
g.s.ssFilter = Settings::ShowAll;
else if (act == qaShowReachable)
g.s.ssFilter = Settings::ShowReachable;
else if (act == qaShowPopulated)
g.s.ssFilter = Settings::ShowPopulated;
foreach(ServerItem *si, qlItems)
si->hideCheck();
}
void ConnectDialog::on_qtwServers_customContextMenuRequested(const QPoint &mpos) {
ServerItem *si = static_cast<ServerItem *>(qtwServers->itemAt(mpos));
qmPopup->clear();
@ -1319,12 +1239,6 @@ void ConnectDialog::on_qtwServers_customContextMenuRequested(const QPoint &mpos)
qmPopup->addAction(qaUrl);
}
}
if (! qmPopup->isEmpty()) {
qmPopup->addSeparator();
}
qmPopup->addMenu(qmFilters);
qmPopup->popup(qtwServers->viewport()->mapToGlobal(mpos), NULL);
}
@ -1354,14 +1268,41 @@ void ConnectDialog::on_qtwServers_currentItemChanged(QTreeWidgetItem *item, QTre
void ConnectDialog::on_qtwServers_itemExpanded(QTreeWidgetItem *item) {
if (qtwServers->siPublic != NULL && item == qtwServers->siPublic) {
if (!g.s.bPingServersDialogViewed) {
// Ask the user for consent to ping the servers. If the user does
// not give consent, disable the public server list and return.
int result = QMessageBox::question(this,
tr("Consent to the transmission of private data"),
tr("<p>To measure the latency (ping) of public servers and determine the number of active users, "
"your IP address must be transmitted to each public server.</p>"
"<p>Do you consent to the transmission of your IP address? If you answer no, the public server "
"list will be deactivated. However, you can reactivate it at any time in the network settings.</p>"),
QMessageBox::Yes|QMessageBox::No);
g.s.bPingServersDialogViewed = true;
if (result == QMessageBox::No) {
g.s.disablePublicList = true;
item->setExpanded(false);
item->setHidden(true);
return;
}
}
qgbSearch->setVisible(true);
initList();
fillList();
}
ServerItem *p = static_cast<ServerItem *>(item);
foreach(ServerItem *si, p->qlChildren)
foreach(ServerItem *si, p->qlChildren) {
startDns(si);
}
}
void ConnectDialog::on_qtwServers_itemCollapsed(QTreeWidgetItem *item)
{
if (qtwServers->siPublic != NULL && item == qtwServers->siPublic) {
qgbSearch->setVisible(false);
}
}
void ConnectDialog::initList() {
@ -1476,11 +1417,9 @@ void ConnectDialog::fillList() {
foreach(QTreeWidgetItem *qtwi, qlNew) {
ServerItem *si = static_cast<ServerItem *>(qtwi);
ServerItem *p = qtwServers->getParent(si->qsContinentCode, si->qsCountryCode, si->qsCountry, qsUserContinentCode, qsUserCountryCode);
p->addServerItem(si);
if (p->isExpanded() && p->parent()->isExpanded())
startDns(si);
qtwServers->siPublic->addServerItem(si);
filterServer(si);
startDns(si);
}
}
@ -1580,6 +1519,50 @@ void ConnectDialog::timeTick() {
}
}
void ConnectDialog::filterPublicServerList() const {
foreach(ServerItem * const si, qtwServers->siPublic->qlChildren) {
filterServer(si);
}
}
void ConnectDialog::filterServer(ServerItem * const si) const {
if (!si->qsName.contains(qsSearchServername, Qt::CaseInsensitive)) {
si->setHidden(true);
return;
}
if (qsSearchLocation != QLatin1String("all")) {
if (qsSearchLocation != si->qsCountry && qsSearchLocation != si->qsContinentCode) {
si->setHidden(true);
return;
}
}
if (g.s.ssFilter == Settings::ShowReachable && si->dPing == 0.0) {
si->setHidden(true);
return;
} else if (g.s.ssFilter == Settings::ShowPopulated && si->uiUsers == 0) {
si->setHidden(true);
return;
}
si->setHidden(false);
}
void ConnectDialog::addCountriesToSearchLocation() const
{
QMap <QString, QString> qmCountries;
foreach(const PublicInfo &pi, qlPublicServers) {
if (pi.qsCountry != tr("Unknown") && !qmCountries.contains(pi.qsCountry)) {
qmCountries.insert(pi.qsCountry, pi.qsCountryCode);
}
}
foreach (auto location, qmCountries.keys()) {
// Set Icon, Text and Data
qcbSearchLocation->addItem(ServerItem::loadIcon(QString::fromLatin1(":/flags/%1.svg").arg(qmCountries.value(location))),
location,
location);
}
}
void ConnectDialog::startDns(ServerItem *si) {
if (!bAllowHostLookup) {
@ -1776,7 +1759,9 @@ void ConnectDialog::udpReply() {
si->uiPingSort = qmPingCache.value(UnresolvedServerAddress(si->qsHostname, si->usPort));
si->setDatas(static_cast<double>(elapsed), users, maxusers);
si->hideCheck();
if (si->itType == ServerItem::PublicType) {
filterServer(si);
}
}
}
}
@ -1818,8 +1803,31 @@ void ConnectDialog::fetched(QByteArray xmlData, QUrl, QMap<QString, QString> hea
}
n = n.nextSibling();
}
addCountriesToSearchLocation();
tPublicServers.restart();
fillList();
}
void ConnectDialog::on_qleSearchServername_textChanged(const QString &searchServername) {
qsSearchServername = searchServername;
filterPublicServerList();
}
void ConnectDialog::on_qcbSearchLocation_currentIndexChanged(int searchLocationIndex) {
qsSearchLocation = qcbSearchLocation->itemData(searchLocationIndex).toString();
filterPublicServerList();
}
void ConnectDialog::on_qcbFilter_currentIndexChanged(int filterIndex) {
const QString filter = qcbFilter->itemText(filterIndex);
if (filter == tr("Show All")) {
g.s.ssFilter = Settings::ShowAll;
} else if (filter == tr("Show Reachable")) {
g.s.ssFilter = Settings::ShowReachable;
} else if (filter == tr("Show Populated")) {
g.s.ssFilter = Settings::ShowPopulated;
}
filterPublicServerList();
}

53
src/mumble/ConnectDialog.h
View File

@ -88,16 +88,11 @@ class ServerView : public QTreeWidget {
Q_DISABLE_COPY(ServerView)
public:
ServerItem *siFavorite, *siLAN, *siPublic;
QMap<QString, QString> qmContinentNames;
QMap<QString, ServerItem *> qmCountry;
QMap<QString, ServerItem *> qmContinent;
ServerView(QWidget *);
~ServerView() Q_DECL_OVERRIDE;
void fixupName(ServerItem *si);
ServerItem *getParent(const QString &continent, const QString &countrycode, const QString &countryname, const QString &usercontinentcode, const QString &usercountrycode);
protected:
QMimeData *mimeData(const QList<QTreeWidgetItem *>) const Q_DECL_OVERRIDE;
QStringList mimeTypes() const Q_DECL_OVERRIDE;
@ -151,7 +146,7 @@ class ServerItem : public QTreeWidgetItem, public PingStats {
#ifdef USE_BONJOUR
ServerItem(const BonjourRecord &br);
#endif
ServerItem(const QString &name, ItemType itype, const QString &continent = QString(), const QString &country = QString());
ServerItem(const QString &name, ItemType itype);
ServerItem(const ServerItem *si);
~ServerItem();
@ -186,8 +181,6 @@ class ServerItem : public QTreeWidgetItem, public PingStats {
bool operator< (const QTreeWidgetItem &) const Q_DECL_OVERRIDE;
QVariant data(int column, int role) const Q_DECL_OVERRIDE;
void hideCheck();
};
class ConnectDialogEdit : public QDialog, protected Ui::ConnectDialogEdit {
@ -237,8 +230,7 @@ class ConnectDialog : public QDialog, public Ui::ConnectDialog {
static QString qsUserCountry, qsUserCountryCode, qsUserContinentCode;
static Timer tPublicServers;
QMenu *qmPopup, *qmFilters;
QActionGroup *qagFilters;
QMenu *qmPopup;
QPushButton *qpbEdit;
bool bPublicInit;
@ -263,6 +255,9 @@ class ConnectDialog : public QDialog, public Ui::ConnectDialog {
QMap<UnresolvedServerAddress, unsigned int> qmPingCache;
QString qsSearchServername;
QString qsSearchLocation;
bool bIPv4;
bool bIPv6;
int iPingIndex;
@ -285,7 +280,6 @@ class ConnectDialog : public QDialog, public Ui::ConnectDialog {
/// be chosen.
bool bAllowFilters;
QMap<QString, QIcon> qmIcons;
void sendPing(const QHostAddress &, unsigned short port);
@ -294,6 +288,25 @@ class ConnectDialog : public QDialog, public Ui::ConnectDialog {
void startDns(ServerItem *);
void stopDns(ServerItem *);
/// Calls ConnectDialog::filterServer for each server in
/// the public server list
void filterPublicServerList() const;
/// Hides the given ServerItem according to the current
/// filter settings. It is checked that the name of the
/// given server matches ConnectDialog#qsSearchServername
/// and the location is equal to ConnectDialog#qsSearchLocation.
/// Lastly it is checked that the server is reachable or
/// populated, should the respective filters be set.
///
/// \param si ServerItem that should be filtered
void filterServer(ServerItem * const si) const;
/// Enumerates all countries in ConnectDialog#qlPublicServers
/// and adds an entry to the location filter Combobox with
/// with the country name as text, the countrycode as
/// data and the flag of the country as the icon.
void addCountriesToSearchLocation() const;
public slots:
void accept();
void fetched(QByteArray xmlData, QUrl, QMap<QString, QString>);
@ -309,11 +322,21 @@ class ConnectDialog : public QDialog, public Ui::ConnectDialog {
void on_qaFavoriteCopy_triggered();
void on_qaFavoritePaste_triggered();
void on_qaUrl_triggered();
void onFiltersTriggered(QAction *);
void on_qtwServers_currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *);
void on_qtwServers_itemDoubleClicked(QTreeWidgetItem *, int);
void on_qtwServers_customContextMenuRequested(const QPoint &);
void on_qtwServers_itemExpanded(QTreeWidgetItem *);
/// If the expanded item is the public server list
/// the user is asked (only once) for consent to transmit
/// the IP to all public servers. If the user does not
/// consent the public server list is disabled. If
/// the user does consent the public server list is
/// filled and the search dialog is shown.
/// Finally name resolution is triggered for all child
/// items of the expanded item.
void on_qtwServers_itemExpanded(QTreeWidgetItem *item);
/// Hides the search dialog if the collapsed item is
/// the public server list
void on_qtwServers_itemCollapsed(QTreeWidgetItem *item);
void OnSortChanged(int, Qt::SortOrder);
public:
QString qsServer, qsUsername, qsPassword;
@ -331,6 +354,10 @@ class ConnectDialog : public QDialog, public Ui::ConnectDialog {
void onResolved(BonjourRecord, QString, int);
void onLanResolveError(BonjourRecord, DNSServiceErrorType);
#endif
private slots:
void on_qleSearchServername_textChanged(const QString &searchServername);
void on_qcbSearchLocation_currentIndexChanged(int searchLocationIndex);
void on_qcbFilter_currentIndexChanged(int filterIndex);
};
#endif

116
src/mumble/ConnectDialog.ui
View File

@ -13,8 +13,15 @@
<property name="windowTitle">
<string>Mumble Server Connect</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0" colspan="3">
<widget class="QDialogButtonBox" name="qdbbButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="ServerView" name="qtwServers">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
@ -60,11 +67,69 @@
</column>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="qdbbButtonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="qgbSearch">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Search</string>
</property>
<layout class="QGridLayout">
<item row="1" column="0">
<widget class="QLabel" name="qlSearchServername">
<property name="text">
<string>Servername</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="qleSearchServername">
<property name="placeholderText">
<string>Servername</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="qlSearchLocation">
<property name="text">
<string>Location</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="qcbSearchLocation"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="qlFilter">
<property name="text">
<string>Filter</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="qcbFilter">
<property name="enabled">
<bool>true</bool>
</property>
<item>
<property name="text">
<string>Show All</string>
</property>
</item>
<item>
<property name="text">
<string>Show Populated</string>
</property>
</item>
<item>
<property name="text">
<string>Show Reachable</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
@ -96,45 +161,6 @@
<string>Open &amp;Webpage</string>
</property>
</action>
<action name="qaShowReachable">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Show &amp;Reachable</string>
</property>
<property name="toolTip">
<string>Show all servers that respond to ping</string>
</property>
</action>
<action name="qaShowPopulated">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="text">
<string>Show &amp;Populated</string>
</property>
<property name="toolTip">
<string>Show all servers with users</string>
</property>
</action>
<action name="qaShowAll">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Show &amp;All</string>
</property>
<property name="toolTip">
<string>Show all servers</string>
</property>
</action>
<action name="qaFavoriteCopy">
<property name="text">
<string>&amp;Copy</string>

5
src/mumble/Settings.cpp
View File

@ -439,7 +439,8 @@ Settings::Settings() {
bDisableCELT = false;
disablePublicList = false;
disableConnectDialogEditing = false;
bPingServersDialogViewed = false;
// Config updates
uiUpdateCounter = 0;
@ -853,6 +854,7 @@ void Settings::load(QSettings* settings_ptr) {
SAVELOAD(bDisableCELT, "audio/disablecelt");
SAVELOAD(disablePublicList, "ui/disablepubliclist");
SAVELOAD(disableConnectDialogEditing, "ui/disableconnectdialogediting");
SAVELOAD(bPingServersDialogViewed, "consent/pingserversdialogviewed");
// OverlayPrivateWin
SAVELOAD(iOverlayWinHelperRestartCooldownMsec, "overlay_win/helper/restart_cooldown_msec");
@ -1204,6 +1206,7 @@ void Settings::save() {
SAVELOAD(bDisableCELT, "audio/disablecelt");
SAVELOAD(disablePublicList, "ui/disablepubliclist");
SAVELOAD(disableConnectDialogEditing, "ui/disableconnectdialogediting");
SAVELOAD(bPingServersDialogViewed, "consent/pingserversdialogviewed");
// OverlayPrivateWin
SAVELOAD(iOverlayWinHelperRestartCooldownMsec, "overlay_win/helper/restart_cooldown_msec");

3
src/mumble/Settings.h
View File

@ -422,6 +422,9 @@ struct Settings {
/// Removes the add and edit options in the connect dialog if set.
bool disableConnectDialogEditing;
/// Asks the user for consent to ping servers in the public server list if not set.
bool bPingServersDialogViewed;
// Config updates
unsigned int uiUpdateCounter;