Skip to content

Commit

Permalink
Use PathListWidget for Overlay exception lists
Browse files Browse the repository at this point in the history
Allows dropping executable files for launchers, whitelist and blacklist,
and folders for the paths list.
  • Loading branch information
Kissaki committed Apr 20, 2017
1 parent bb87e2e commit 53326fe
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/mumble/Overlay.ui
Expand Up @@ -357,7 +357,7 @@
</widget>
</item>
<item>
<widget class="QListWidget" name="qlwLaunchers"/>
<widget class="PathListWidget" name="qlwLaunchers"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
Expand Down Expand Up @@ -394,7 +394,7 @@
</widget>
</item>
<item>
<widget class="QListWidget" name="qlwWhitelist"/>
<widget class="PathListWidget" name="qlwWhitelist"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
Expand Down Expand Up @@ -431,7 +431,7 @@
</widget>
</item>
<item>
<widget class="QListWidget" name="qlwPaths"/>
<widget class="PathListWidget" name="qlwPaths"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
Expand Down Expand Up @@ -468,7 +468,7 @@
</widget>
</item>
<item>
<widget class="QListWidget" name="qlwBlacklist"/>
<widget class="PathListWidget" name="qlwBlacklist"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
Expand Down
3 changes: 3 additions & 0 deletions src/mumble/OverlayConfig.cpp
Expand Up @@ -20,6 +20,7 @@
#include "ServerHandler.h"
#include "MainWindow.h"
#include "GlobalShortcut.h"
#include "PathListWidget.h"

#ifdef Q_OS_WIN
#include "../../overlay/overlay_launchers.h"
Expand Down Expand Up @@ -148,6 +149,8 @@ OverlayConfig::OverlayConfig(Settings &st) :
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"));
Expand Down

0 comments on commit 53326fe

Please sign in to comment.