From c99fb7c6a059eebc1d2279cf4a53edb1079baaa8 Mon Sep 17 00:00:00 2001
From: diamante0018 <iw4x-sp@proton.me>
Date: Wed, 4 Jun 2025 11:07:53 +0200
Subject: [PATCH] chore: remove WinToast
---
.gitmodules | 3 -
deps/WinToast | 1 -
src/client/component/bots.cpp | 2 +
src/common/utils/toast.cpp | 109 ----------------------------------
src/common/utils/toast.hpp | 19 ------
5 files changed, 2 insertions(+), 132 deletions(-)
delete mode 160000 deps/WinToast
delete mode 100644 src/common/utils/toast.cpp
delete mode 100644 src/common/utils/toast.hpp
diff --git a/.gitmodules b/.gitmodules
index adeb262..95b2d8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,9 +29,6 @@
[submodule "deps/udis86"]
path = deps/udis86
url = https://github.com/vmt/udis86.git
-[submodule "deps/WinToast"]
- path = deps/WinToast
- url = https://github.com/mohabouje/WinToast.git
[submodule "deps/zlib"]
path = deps/zlib
url = https://github.com/madler/zlib.git
diff --git a/deps/WinToast b/deps/WinToast
deleted file mode 160000
index a78ce46..0000000
--- a/deps/WinToast
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a78ce469b456c06103b3b30d4bd37e7bb80da30c
diff --git a/src/client/component/bots.cpp b/src/client/component/bots.cpp
index c69be34..7ae6c39 100644
--- a/src/client/component/bots.cpp
+++ b/src/client/component/bots.cpp
@@ -13,6 +13,8 @@
#include <utils/hook.hpp>
#include <utils/string.hpp>
+#define ALLOW_CUSTOM_BOT_NAMES
+
namespace bots
{
namespace
diff --git a/src/common/utils/toast.cpp b/src/common/utils/toast.cpp
deleted file mode 100644
index 9ffd44d..0000000
--- a/src/common/utils/toast.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "toast.hpp"
-#include "string.hpp"
-
-#pragma warning(push)
-#pragma warning(disable: 6387)
-#include <wintoastlib.h>
-#pragma warning(pop)
-
-namespace utils
-{
- namespace
- {
- bool initialize()
- {
- static bool initialized = false;
- static bool success = false;
- if (initialized)
- {
- return success;
- }
-
- initialized = true;
- auto* instance = WinToastLib::WinToast::instance();
- if (!instance)
- {
- success = false;
- return success;
- }
-
- instance->setAppName(L"s1-mod");
- instance->setAppUserModelId(
- WinToastLib::WinToast::configureAUMI(L"AlterWare", L"s1-mod", L"", L"20201212"));
-
- WinToastLib::WinToast::WinToastError error;
- success = instance->initialize(&error);
-
- return success;
- }
-
- class toast_handler : public WinToastLib::IWinToastHandler
- {
- public:
- void toastActivated() const override
- {
- }
-
- void toastActivated(const int /*actionIndex*/) const override
- {
- }
-
- void toastFailed() const override
- {
- }
-
- void toastDismissed(WinToastDismissalReason /*state*/) const override
- {
- }
- };
- }
-
- toast::toast(const int64_t id)
- : id_(id)
- {
- }
-
- toast::operator bool() const
- {
- return this->id_ >= 0;
- }
-
- void toast::hide() const
- {
- if (this->operator bool())
- {
- WinToastLib::WinToast::instance()->hideToast(this->id_);
- }
- }
-
- toast toast::show(const std::string& title, const std::string& text)
- {
- if (!initialize())
- {
- return toast{-1};
- }
-
- WinToastLib::WinToastTemplate toast_template(WinToastLib::WinToastTemplate::Text02);
- toast_template.setTextField(string::convert(title), WinToastLib::WinToastTemplate::FirstLine);
- toast_template.setTextField(string::convert(text), WinToastLib::WinToastTemplate::SecondLine);
- toast_template.setDuration(WinToastLib::WinToastTemplate::Long);
-
- return toast{WinToastLib::WinToast::instance()->showToast(toast_template, new toast_handler())};
- }
-
- toast toast::show(const std::string& title, const std::string& text, const std::string& image)
- {
- if (!initialize())
- {
- return {-1};
- }
-
- WinToastLib::WinToastTemplate toast_template(WinToastLib::WinToastTemplate::ImageAndText02);
- toast_template.setTextField(string::convert(title), WinToastLib::WinToastTemplate::FirstLine);
- toast_template.setTextField(string::convert(text), WinToastLib::WinToastTemplate::SecondLine);
- toast_template.setDuration(WinToastLib::WinToastTemplate::Long);
- toast_template.setImagePath(string::convert(image));
-
- return {WinToastLib::WinToast::instance()->showToast(toast_template, new toast_handler())};
- }
-}
diff --git a/src/common/utils/toast.hpp b/src/common/utils/toast.hpp
deleted file mode 100644
index 739c5c8..0000000
--- a/src/common/utils/toast.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include <string>
-
-namespace utils
-{
- class toast
- {
- public:
- static toast show(const std::string& title, const std::string& text);
- static toast show(const std::string& title, const std::string& text, const std::string& image);
-
- operator bool() const;
- void hide() const;
-
- private:
- toast(int64_t id);
- int64_t id_;
- };
-}