Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert <krzmbrzl@gmail.com>2020-09-11 19:29:33 +0300
committerRobert <krzmbrzl@gmail.com>2020-09-11 19:29:33 +0300
commitaf7dac72f4063dd8d4dac71973ea51c25896089a (patch)
tree35558695aea94d48fd9e77d164d63fd8b7c76e90 /src/mumble/OverlayConfig.cpp
parent40b28b03c150b453e00c6bc4f8d6957caea59c51 (diff)
FORMAT: Run clang-format 10 on all C/CXX source-files
Diffstat (limited to 'src/mumble/OverlayConfig.cpp')
-rw-r--r--src/mumble/OverlayConfig.cpp171
1 files changed, 82 insertions, 89 deletions
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp
index 580a10b31..d73e3740c 100644
--- a/src/mumble/OverlayConfig.cpp
+++ b/src/mumble/OverlayConfig.cpp
@@ -5,25 +5,25 @@
#include "OverlayConfig.h"
-#include "Overlay.h"
-#include "OverlayUserGroup.h"
-#include "OverlayPositionableItem.h"
-#include "OverlayText.h"
-#include "User.h"
#include "Channel.h"
-#include "Message.h"
#include "Database.h"
-#include "NetworkConfig.h"
-#include "ServerHandler.h"
#include "MainWindow.h"
-#include "GlobalShortcut.h"
+#include "Message.h"
+#include "NetworkConfig.h"
+#include "Overlay.h"
+#include "OverlayPositionableItem.h"
+#include "OverlayText.h"
+#include "OverlayUserGroup.h"
#include "PathListWidget.h"
#include "Screen.h"
+#include "ServerHandler.h"
+#include "User.h"
+#include "GlobalShortcut.h"
#ifdef Q_OS_WIN
-#include "../../overlay/overlay_launchers.h"
-#include "../../overlay/overlay_whitelist.h"
-#include "../../overlay/overlay_blacklist.h"
+# include "../../overlay/overlay_blacklist.h"
+# include "../../overlay/overlay_launchers.h"
+# include "../../overlay/overlay_whitelist.h"
#endif
#include <QtGui/QScreen>
@@ -33,12 +33,13 @@
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QFontDialog>
-// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name
+// (like protobuf 3.7 does). As such, for now, we have to make this our last include.
#include "Global.h"
const QString OverlayConfig::name = QLatin1String("OverlayConfig");
-static const int OVERLAYCONFIG_PATH_ROLE = Qt::UserRole;
+static const int OVERLAYCONFIG_PATH_ROLE = Qt::UserRole;
static const int OVERLAYCONFIG_BUILTIN_ROLE = Qt::UserRole + 1;
// Hide overlay config for Mac OS X universal builds
@@ -86,11 +87,10 @@ void OverlayConfig::initDisplay() {
initDisplayClock();
qgtiInstructions = new QGraphicsTextItem();
- qgtiInstructions->setHtml(QString::fromLatin1("<ul><li>%1</li><li>%2</li><li>%3</li></ul>").arg(
- tr("To move the users, drag the little red dot."),
- tr("To resize the users, mouse wheel over a user."),
- tr("For more options, right click a user.")
- ));
+ qgtiInstructions->setHtml(QString::fromLatin1("<ul><li>%1</li><li>%2</li><li>%3</li></ul>")
+ .arg(tr("To move the users, drag the little red dot."),
+ tr("To resize the users, mouse wheel over a user."),
+ tr("For more options, right click a user.")));
qgtiInstructions->setOpacity(1.0f);
qgtiInstructions->setZValue(-5.0f);
qgtiInstructions->setDefaultTextColor(Qt::white);
@@ -108,7 +108,7 @@ void OverlayConfig::initDisplay() {
qgs.addItem(qgpiTimeLive);
qgpiTimeLive->show();
- oug = new OverlayUserGroup(&s.os);
+ oug = new OverlayUserGroup(&s.os);
oug->bShowExamples = true;
qgs.addItem(oug);
oug->show();
@@ -139,7 +139,8 @@ void OverlayConfig::refreshFpsLive() {
void OverlayConfig::refreshTimeLive() {
if (s.os.bTime) {
- bpTimeDemo = OverlayTextLine(QString::fromLatin1("%1").arg(QTime::currentTime().toString()), s.os.qfFps).createPixmap(s.os.qcFps);
+ bpTimeDemo = OverlayTextLine(QString::fromLatin1("%1").arg(QTime::currentTime().toString()), s.os.qfFps)
+ .createPixmap(s.os.qcFps);
qgpiTimeLive->setPixmap(bpTimeDemo.scaled(bpTimeDemo.size() * fViewScale));
qgpiTimeLive->setOffset((-bpTimeDemo.qpBasePoint + QPoint(0, bpTimeDemo.iAscent)) * fViewScale);
} else {
@@ -148,23 +149,18 @@ void OverlayConfig::refreshTimeLive() {
qgpiTimeLive->setItemVisible(s.os.bTime);
}
-OverlayConfig::OverlayConfig(Settings &st) :
- ConfigWidget(st),
- qgpiScreen(nullptr),
- qgs(),
- qgsFpsPreview(),
- qgpiFpsDemo(nullptr),
- oug(nullptr),
- qgtiInstructions(nullptr),
- fViewScale(1.0f) {
+OverlayConfig::OverlayConfig(Settings &st)
+ : ConfigWidget(st), qgpiScreen(nullptr), qgs(), qgsFpsPreview(), qgpiFpsDemo(nullptr), oug(nullptr),
+ qgtiInstructions(nullptr), fViewScale(1.0f) {
setupUi(this);
qlwPaths->setPathType(PathListWidget::FOLDER);
- qcbOverlayExclusionMode->insertItem(static_cast<int>(OverlaySettings::LauncherFilterExclusionMode), tr("Launcher Filter"));
- qcbOverlayExclusionMode->insertItem(static_cast<int>(OverlaySettings::WhitelistExclusionMode), tr("Whitelist"));
- qcbOverlayExclusionMode->insertItem(static_cast<int>(OverlaySettings::BlacklistExclusionMode), tr("Blacklist"));
- qcbOverlayExclusionMode->setCurrentIndex(static_cast<int>(OverlaySettings::LauncherFilterExclusionMode));
+ qcbOverlayExclusionMode->insertItem(static_cast< int >(OverlaySettings::LauncherFilterExclusionMode),
+ tr("Launcher Filter"));
+ qcbOverlayExclusionMode->insertItem(static_cast< int >(OverlaySettings::WhitelistExclusionMode), tr("Whitelist"));
+ qcbOverlayExclusionMode->insertItem(static_cast< int >(OverlaySettings::BlacklistExclusionMode), tr("Blacklist"));
+ qcbOverlayExclusionMode->setCurrentIndex(static_cast< int >(OverlaySettings::LauncherFilterExclusionMode));
if (!isInstalled()) {
qswOverlayPage->setCurrentWidget(qwOverlayInstall);
@@ -194,7 +190,7 @@ OverlayConfig::OverlayConfig(Settings &st) :
if (screen) {
const QRect desktopSize = screen->geometry();
- qpScreen = QPixmap(desktopSize.width(), desktopSize.height());
+ qpScreen = QPixmap(desktopSize.width(), desktopSize.height());
} else {
qpScreen = QPixmap(1280, 720);
}
@@ -211,7 +207,8 @@ OverlayConfig::OverlayConfig(Settings &st) :
}
void OverlayConfig::updateOverlayExclusionModeState() {
- OverlaySettings::OverlayExclusionMode exclusionMode = static_cast<OverlaySettings::OverlayExclusionMode>(qcbOverlayExclusionMode->currentIndex());
+ OverlaySettings::OverlayExclusionMode exclusionMode =
+ static_cast< OverlaySettings::OverlayExclusionMode >(qcbOverlayExclusionMode->currentIndex());
switch (exclusionMode) {
case OverlaySettings::LauncherFilterExclusionMode:
@@ -238,7 +235,7 @@ void OverlayConfig::updateOverlayExclusionModeState() {
// They are only considered in launcher filter mode.
for (int i = 0; i < qlwWhitelist->count(); i++) {
QListWidgetItem *item = qlwWhitelist->item(i);
- bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
+ bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
if (isBuiltin) {
item->setHidden(true);
} else {
@@ -264,7 +261,7 @@ void OverlayConfig::load(const Settings &r) {
qcbShowTime->setChecked(s.os.bTime);
qgpFps->setEnabled(s.os.bEnable);
- qcbOverlayExclusionMode->setCurrentIndex(static_cast<int>(s.os.oemOverlayExcludeMode));
+ qcbOverlayExclusionMode->setCurrentIndex(static_cast< int >(s.os.oemOverlayExcludeMode));
// Launchers
{
@@ -280,7 +277,7 @@ void OverlayConfig::load(const Settings &r) {
}
#endif
foreach (QString str, builtinLaunchers) {
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwLaunchers);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(true));
@@ -299,11 +296,11 @@ void OverlayConfig::load(const Settings &r) {
}
}
- foreach(QString str, s.os.qslLaunchers) {
+ foreach (QString str, s.os.qslLaunchers) {
if (builtinLaunchers.contains(str)) {
continue;
}
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwLaunchers);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(false));
@@ -324,7 +321,7 @@ void OverlayConfig::load(const Settings &r) {
}
#endif
foreach (QString str, builtinWhitelist) {
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwWhitelist);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(true));
@@ -343,11 +340,11 @@ void OverlayConfig::load(const Settings &r) {
}
}
- foreach(QString str, s.os.qslWhitelist) {
+ foreach (QString str, s.os.qslWhitelist) {
if (builtinWhitelist.contains(str)) {
continue;
}
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwWhitelist);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(false));
@@ -358,7 +355,7 @@ void OverlayConfig::load(const Settings &r) {
{
qlwPaths->clear();
- foreach(QString str, s.os.qslPaths) {
+ foreach (QString str, s.os.qslPaths) {
QListWidgetItem *qlwiApplication = new QListWidgetItem(QIcon(), str, qlwPaths);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(false));
@@ -379,7 +376,7 @@ void OverlayConfig::load(const Settings &r) {
}
#endif
foreach (QString str, builtinBlacklist) {
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwBlacklist);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(true));
@@ -398,11 +395,11 @@ void OverlayConfig::load(const Settings &r) {
}
}
- foreach(QString str, s.os.qslBlacklist) {
+ foreach (QString str, s.os.qslBlacklist) {
if (builtinBlacklist.contains(str)) {
continue;
}
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(str);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwBlacklist);
qlwiApplication->setData(OVERLAYCONFIG_PATH_ROLE, QVariant(str));
qlwiApplication->setData(OVERLAYCONFIG_BUILTIN_ROLE, QVariant(false));
@@ -428,12 +425,13 @@ QIcon OverlayConfig::icon() const {
void OverlayConfig::save() const {
s.os.bEnable = qcbEnable->isChecked();
- s.os.bFps = qcbShowFps->isChecked();
- s.os.bTime = qcbShowTime->isChecked();
+ s.os.bFps = qcbShowFps->isChecked();
+ s.os.bTime = qcbShowTime->isChecked();
// Directly save overlay config
- s.os.oemOverlayExcludeMode = static_cast<OverlaySettings::OverlayExclusionMode>(qcbOverlayExclusionMode->currentIndex());
+ s.os.oemOverlayExcludeMode =
+ static_cast< OverlaySettings::OverlayExclusionMode >(qcbOverlayExclusionMode->currentIndex());
// Launchers
{
@@ -567,7 +565,7 @@ void OverlayConfig::resizeScene(bool force) {
qgpiScreen->setPixmap(qpScreen.scaled(sz, Qt::KeepAspectRatio, Qt::SmoothTransformation));
qgs.setSceneRect(QRectF(0, 0, qgpiScreen->pixmap().width(), qgpiScreen->pixmap().height()));
- fViewScale = static_cast<float>(qgpiScreen->pixmap().height()) / static_cast<float>(qpScreen.height());
+ fViewScale = static_cast< float >(qgpiScreen->pixmap().height()) / static_cast< float >(qpScreen.height());
refreshFpsLive();
refreshTimeLive();
@@ -587,14 +585,14 @@ void OverlayConfig::resizeScene(bool force) {
}
void OverlayConfig::on_qlwLaunchers_itemSelectionChanged() {
- QList<QListWidgetItem *> items = qlwLaunchers->selectedItems();
+ QList< QListWidgetItem * > items = qlwLaunchers->selectedItems();
if (items.isEmpty()) {
qpbLaunchersRemove->setEnabled(false);
return;
}
QListWidgetItem *item = items.at(0);
- bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
+ bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
if (isBuiltin) {
qpbLaunchersRemove->setEnabled(false);
@@ -616,13 +614,13 @@ void OverlayConfig::on_qpbLaunchersAdd_clicked() {
QString file = QString();
#endif
- if (! file.isEmpty()) {
+ if (!file.isEmpty()) {
QString qsAppIdentifier = OverlayAppInfo::applicationIdentifierForPath(file);
QStringList qslIdentifiers;
for (int i = 0; i < qlwLaunchers->count(); i++)
qslIdentifiers << qlwLaunchers->item(i)->data(Qt::UserRole).toString();
- if (! qslIdentifiers.contains(qsAppIdentifier)) {
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(qsAppIdentifier);
+ if (!qslIdentifiers.contains(qsAppIdentifier)) {
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(qsAppIdentifier);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, qlwLaunchers);
qlwiApplication->setData(Qt::UserRole, QVariant(qsAppIdentifier));
qlwLaunchers->setCurrentItem(qlwiApplication);
@@ -637,14 +635,14 @@ void OverlayConfig::on_qpbLaunchersRemove_clicked() {
}
void OverlayConfig::on_qlwWhitelist_itemSelectionChanged() {
- QList<QListWidgetItem *> items = qlwWhitelist->selectedItems();
+ QList< QListWidgetItem * > items = qlwWhitelist->selectedItems();
if (items.isEmpty()) {
qpbWhitelistRemove->setEnabled(false);
return;
}
QListWidgetItem *item = items.at(0);
- bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
+ bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
if (isBuiltin) {
qpbWhitelistRemove->setEnabled(false);
@@ -655,12 +653,12 @@ void OverlayConfig::on_qlwWhitelist_itemSelectionChanged() {
void OverlayConfig::addWhitelistPath(const QString &path) {
QString qsAppIdentifier = OverlayAppInfo::applicationIdentifierForPath(path);
- QListWidget *sel = qlwWhitelist;
+ QListWidget *sel = qlwWhitelist;
QStringList qslIdentifiers;
for (int i = 0; i < sel->count(); i++)
qslIdentifiers << sel->item(i)->data(Qt::UserRole).toString();
- if (! qslIdentifiers.contains(qsAppIdentifier)) {
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(qsAppIdentifier);
+ if (!qslIdentifiers.contains(qsAppIdentifier)) {
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(qsAppIdentifier);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, sel);
qlwiApplication->setData(Qt::UserRole, QVariant(qsAppIdentifier));
sel->setCurrentItem(qlwiApplication);
@@ -676,27 +674,27 @@ void OverlayConfig::on_qpbWhitelistAdd_clicked() {
QString file = QString();
#endif
- if (! file.isEmpty()) {
+ if (!file.isEmpty()) {
addWhitelistPath(file);
}
}
void OverlayConfig::on_qpbWhitelistRemove_clicked() {
QListWidget *sel = qlwWhitelist;
- int row = sel->currentRow();
+ int row = sel->currentRow();
if (row != -1)
delete sel->takeItem(row);
}
void OverlayConfig::on_qlwPaths_itemSelectionChanged() {
- QList<QListWidgetItem *> items = qlwPaths->selectedItems();
+ QList< QListWidgetItem * > items = qlwPaths->selectedItems();
if (items.isEmpty()) {
qpbPathsRemove->setEnabled(false);
return;
}
QListWidgetItem *item = items.at(0);
- bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
+ bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
if (isBuiltin) {
qpbPathsRemove->setEnabled(false);
@@ -707,13 +705,13 @@ void OverlayConfig::on_qlwPaths_itemSelectionChanged() {
void OverlayConfig::on_qpbPathsAdd_clicked() {
QString existingPath = QFileDialog::getExistingDirectory(this, tr("Choose path"));
- QString dir = QDir::toNativeSeparators(existingPath);
+ QString dir = QDir::toNativeSeparators(existingPath);
QListWidget *sel = qlwPaths;
QStringList qslIdentifiers;
for (int i = 0; i < sel->count(); i++)
qslIdentifiers << sel->item(i)->data(Qt::UserRole).toString();
- if (! dir.isEmpty() && ! qslIdentifiers.contains(dir)) {
+ if (!dir.isEmpty() && !qslIdentifiers.contains(dir)) {
QListWidgetItem *qlwiPath = new QListWidgetItem(QIcon(), dir, sel);
qlwiPath->setData(Qt::UserRole, QVariant(dir));
sel->setCurrentItem(qlwiPath);
@@ -727,14 +725,14 @@ void OverlayConfig::on_qpbPathsRemove_clicked() {
}
void OverlayConfig::on_qlwBlacklist_itemSelectionChanged() {
- QList<QListWidgetItem *> items = qlwBlacklist->selectedItems();
+ QList< QListWidgetItem * > items = qlwBlacklist->selectedItems();
if (items.isEmpty()) {
qpbBlacklistRemove->setEnabled(false);
return;
}
QListWidgetItem *item = items.at(0);
- bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
+ bool isBuiltin = item->data(OVERLAYCONFIG_BUILTIN_ROLE).toBool();
if (isBuiltin) {
qpbBlacklistRemove->setEnabled(false);
@@ -752,14 +750,14 @@ void OverlayConfig::on_qpbBlacklistAdd_clicked() {
QString file = QString();
#endif
- if (! file.isEmpty()) {
+ if (!file.isEmpty()) {
QString qsAppIdentifier = OverlayAppInfo::applicationIdentifierForPath(file);
- QListWidget *sel = qlwBlacklist;
+ QListWidget *sel = qlwBlacklist;
QStringList qslIdentifiers;
for (int i = 0; i < sel->count(); i++)
qslIdentifiers << sel->item(i)->data(Qt::UserRole).toString();
- if (! qslIdentifiers.contains(qsAppIdentifier)) {
- OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(qsAppIdentifier);
+ if (!qslIdentifiers.contains(qsAppIdentifier)) {
+ OverlayAppInfo oai = OverlayAppInfo::applicationInfoForId(qsAppIdentifier);
QListWidgetItem *qlwiApplication = new QListWidgetItem(oai.qiIcon, oai.qsDisplayName, sel);
qlwiApplication->setData(Qt::UserRole, QVariant(qsAppIdentifier));
sel->setCurrentItem(qlwiApplication);
@@ -769,7 +767,7 @@ void OverlayConfig::on_qpbBlacklistAdd_clicked() {
void OverlayConfig::on_qpbBlacklistRemove_clicked() {
QListWidget *sel = qlwBlacklist;
- int row = sel->currentRow();
+ int row = sel->currentRow();
if (row != -1)
delete sel->takeItem(row);
}
@@ -789,7 +787,6 @@ void OverlayConfig::on_qpbInstall_clicked() {
}
void OverlayConfig::on_qpbUninstall_clicked() {
-
qpbUninstall->setEnabled(false);
if (uninstallFiles()) {
@@ -837,10 +834,8 @@ void OverlayConfig::on_qpbFpsColor_clicked() {
}
void OverlayConfig::on_qpbLoadPreset_clicked() {
- QString fn = QFileDialog::getOpenFileName(this,
- tr("Load Overlay Presets"),
- QDir::homePath(),
- tr("Mumble overlay presets (*.mumblelay)"));
+ QString fn = QFileDialog::getOpenFileName(this, tr("Load Overlay Presets"), QDir::homePath(),
+ tr("Mumble overlay presets (*.mumblelay)"));
if (fn.isEmpty()) {
return;
@@ -854,29 +849,27 @@ void OverlayConfig::on_qpbLoadPreset_clicked() {
qs.endGroup();
#ifdef Q_OS_WIN
- load_preset.qslLaunchers = s.os.qslLaunchers;
+ load_preset.qslLaunchers = s.os.qslLaunchers;
load_preset.qslLaunchersExclude = s.os.qslLaunchersExclude;
- load_preset.qslWhitelist = s.os.qslWhitelist;
+ load_preset.qslWhitelist = s.os.qslWhitelist;
load_preset.qslWhitelistExclude = s.os.qslWhitelistExclude;
- load_preset.qslPaths = s.os.qslPaths;
+ load_preset.qslPaths = s.os.qslPaths;
load_preset.qslPathsExclude = s.os.qslPathsExclude;
- load_preset.qslBlacklist = s.os.qslBlacklist;
+ load_preset.qslBlacklist = s.os.qslBlacklist;
load_preset.qslBlacklistExclude = s.os.qslBlacklistExclude;
#endif
load_preset.bEnable = s.os.bEnable;
- s.os = load_preset;
+ s.os = load_preset;
load(s);
}
void OverlayConfig::on_qpbSavePreset_clicked() {
- QString fn = QFileDialog::getSaveFileName(this,
- tr("Save Overlay Presets"),
- QDir::homePath(),
- tr("Mumble overlay presets (*.mumblelay)"));
+ QString fn = QFileDialog::getSaveFileName(this, tr("Save Overlay Presets"), QDir::homePath(),
+ tr("Mumble overlay presets (*.mumblelay)"));
if (fn.isEmpty()) {
return;