Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/qtkeychain/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ else()

ExternalProject_Add(qtkeychain_repo
GIT_REPOSITORY "https://github.com/nschimme/qtkeychain.git"
GIT_TAG "wasm"
GIT_TAG "708d09927d52743c801c1a974d432f19266f2fb1"

SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtkeychain-src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtkeychain-build"
Expand Down
4 changes: 1 addition & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ set(mmapper_SRCS
client/Hotkey.h
client/HotkeyManager.cpp
client/HotkeyManager.h
client/UserActionManager.cpp
client/UserActionManager.h
client/PasswordDialog.cpp
client/PasswordDialog.h
client/PreviewWidget.cpp
Expand Down Expand Up @@ -460,13 +458,13 @@ set(mmapper_SRCS
opengl/legacy/WeatherMeshes.h
parser/Abbrev.cpp
parser/Abbrev.h
parser/ScriptEngine.cpp
parser/AbstractParser-Actions.cpp
parser/AbstractParser-Commands.cpp
parser/AbstractParser-Commands.h
parser/AbstractParser-Config.cpp
parser/AbstractParser-Group.cpp
parser/AbstractParser-Hotkey.cpp
parser/AbstractParser-UserActions.cpp
parser/AbstractParser-Mark.cpp
parser/AbstractParser-Room.cpp
parser/AbstractParser-Timer.cpp
Expand Down
228 changes: 0 additions & 228 deletions src/client/UserActionManager.cpp

This file was deleted.

64 changes: 0 additions & 64 deletions src/client/UserActionManager.h

This file was deleted.

8 changes: 8 additions & 0 deletions src/configuration/configuration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ ConstString GRP_GENERAL = "General";
ConstString GRP_GROUP_MANAGER = "Group Manager";
ConstString GRP_HOTKEYS = "Hotkeys";
ConstString GRP_ACTIONS = "Actions";
ConstString GRP_VARIABLES = "Variables";
ConstString GRP_ALIASES = "Aliases";
ConstString GRP_INFOMARKS_DIALOG = "InfoMarks Dialog";
ConstString GRP_INTEGRATED_MUD_CLIENT = "Integrated Mud Client";
ConstString GRP_MUME_CLIENT_PROTOCOL = "Mume client protocol";
Expand All @@ -210,6 +212,8 @@ ConstString GRP_ROOMEDIT_DIALOG = "RoomEdit Dialog";
Configuration::Configuration()
: hotkeys(GRP_HOTKEYS)
, actions(GRP_ACTIONS)
, variables(GRP_VARIABLES)
, aliases(GRP_ALIASES)
{
read(); // read the settings or set them to the default values
}
Expand Down Expand Up @@ -500,6 +504,8 @@ NODISCARD static uint16_t sanitizeUint16(const int input, const uint16_t default
GROUP_CALLBACK(callback, GRP_FINDROOMS_DIALOG, findRoomsDialog); \
GROUP_CALLBACK(callback, GRP_HOTKEYS, hotkeys); \
GROUP_CALLBACK(callback, GRP_ACTIONS, actions); \
GROUP_CALLBACK(callback, GRP_VARIABLES, variables); \
GROUP_CALLBACK(callback, GRP_ALIASES, aliases); \
} while (false)

void Configuration::read()
Expand Down Expand Up @@ -532,6 +538,8 @@ void Configuration::readFrom(QSettings &conf)

hotkeys.resetToDefault();
actions.resetToDefault();
variables.resetToDefault();
aliases.resetToDefault();
}

assert(canvas.backgroundColor == colorSettings.BACKGROUND);
Expand Down
2 changes: 2 additions & 0 deletions src/configuration/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,8 @@ class NODISCARD Configuration final

GroupConfig hotkeys;
GroupConfig actions;
GroupConfig variables;
GroupConfig aliases;

public:
DELETE_CTORS_AND_ASSIGN_OPS(Configuration);
Expand Down
2 changes: 2 additions & 0 deletions src/mainwindow/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "../media/AudioManager.h"
#include "../media/DescriptionWidget.h"
#include "../media/MediaLibrary.h"
#include "../parser/ScriptEngine.h"
#include "../pathmachine/mmapper2pathmachine.h"
#include "../preferences/configdialog.h"
#include "../proxy/connectionlistener.h"
Expand Down Expand Up @@ -212,6 +213,7 @@ MainWindow::MainWindow()
m_dockDialogDescription = new QDockWidget(tr("Description Panel"), this);

m_hotkeyManager = std::make_unique<HotkeyManager>();
m_scriptEngine = std::make_unique<ScriptEngine>(this);
m_dockDialogDescription->setObjectName("DockWidgetDescription");
m_dockDialogDescription->setAllowedAreas(Qt::AllDockWidgetAreas);
m_dockDialogDescription->setFeatures(QDockWidget::DockWidgetMovable
Expand Down
Loading
Loading