Merge branch 'development'

Author: PsychedelicShayna

.gitignore

@@ -1,7 +1,11 @@
 /*
+
 !source/
+
 !.gitignore
 !LICENSE
 !README.md
 !screenshots
-*.user
+
+!*.pro
+*.user

source/CursorLockerQt.pro cursor-locker-qt.pro

@@ -1,6 +1,6 @@
 QT += core gui widgets
 
-TARGET = CursorLocker
+TARGET = cursor-locker
 TEMPLATE = app
 
 DEFINES += QT_DEPRECATED_WARNINGS
@@ -11,15 +11,15 @@ CONFIG(debug, debug|release): DEFINES += DEBUG
 CONFIG(release, debug|release): DEFINES += RELEASE
 
 SOURCES += \
-    main.cxx \
-    main_window_dlg.cxx
+    source\main.cxx \
+    source\main_wnd.cxx
 
 HEADERS += \
-    main_window_dlg.hxx \
-    json.hxx
+    source\main_wnd.hxx \
+    source\json.hxx
 
 FORMS += \
-    main_window_dlg.ui
+    source\main_wnd.ui
 
 LIBS += \
     -lUser32

source/main.cxx

@@ -1,6 +1,6 @@
 #include <QApplication>
 
-#include "main_window_dlg.hxx"
+#include "main_wnd.hxx"
 
 int main(int argc, char* argv[]) {
     QApplication application(argc, argv);

source/main_window_dlg.cxx source/main_wnd.cxx

@@ -1,5 +1,5 @@
-#include "main_window_dlg.hxx"
-#include "ui_main_window_dlg.h"
+#include "main_wnd.hxx"
+#include "ui_main_wnd.h"
 
 enum struct MONITOR_FOR {
     NOTHING         =   0b00000000,
@@ -300,6 +300,7 @@ void MainWindow::closeEvent(QCloseEvent*) {
 
 bool MainWindow::LoadStylesheetFile(const std::string& file_path) {
     std::ifstream input_stream(file_path, std::ios::binary);
+
     if(input_stream.good()) {
         std::string style_sheet((std::istreambuf_iterator<char>(input_stream)), (std::istreambuf_iterator<char>()));
         input_stream.close();
@@ -370,6 +371,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
 
         logToConsole("Default values from defaults.json have been parsed.");
 
+        uint8_t default_cbx_activation_method_index = 0;
+
         for(const auto& pair : default_values.items()) {
             if(pair.key() == "vkid") {
                 std::stringstream conversion_stream;
@@ -401,16 +404,29 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
                 monitoringWorkerTitle.store(heap_copy);
 
                 logToConsole({"Loaded window title(", QString::fromStdString(pair.value()),") from defaults.json"});
+            } else if(pair.key() == "method") {
+                if(pair.value() == "vkid") {
+                    default_cbx_activation_method_index = 1;
+                } else if(pair.value() == "image") {
+                    default_cbx_activation_method_index = 2;
+                } else if(pair.value() == "title") {
+                    default_cbx_activation_method_index = 3;
+                }
+
+                logToConsole({"Loaded activation method(", QString::fromStdString(pair.value()),") from defaults.json"});
             }
         }
+
+        ui->cbx_activation_method->setCurrentIndex(default_cbx_activation_method_index);
     } else {
         std::ofstream output_stream("./defaults.json", std::ios::binary);
 
         if(output_stream.good()) {
             Json json_template = {
                 {"vkid", ""},
                 {"image", ""},
-                {"title", ""}
+                {"title", ""},
+                {"method", ""}
             };
 
             const std::string& dumped_json = json_template.dump(4);

source/main_window_dlg.hxx source/main_wnd.hxx

@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>CursorLocker Redux</string>
+   <string>Cursor Locker</string>
   </property>
   <property name="iconSize">
    <size>