From cfc7b2ffc43fc0f8f98eac261723509c3c868949 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Tue, 2 Sep 2025 14:02:43 +0300 Subject: [PATCH] [win] fix xp build --- win-linux/defaults.pri | 11 +++++++---- win-linux/src/cascapplicationmanagerwrapper.cpp | 6 +++++- win-linux/src/platform_win/association.cpp | 11 ++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri index b193a9f12..6516d2b57 100644 --- a/win-linux/defaults.pri +++ b/win-linux/defaults.pri @@ -88,7 +88,6 @@ HEADERS += \ $$PWD/src/components/cprintprogress.h \ $$PWD/src/components/ctabbar.h \ $$PWD/src/components/cmessage.h \ - $$PWD/src/components/cnotification.h \ $$PWD/src/components/canimatedicon.h \ $$PWD/src/components/ctabpanel.h \ $$PWD/src/components/csvgpushbutton.h \ @@ -132,7 +131,6 @@ SOURCES += \ $$PWD/src/components/cprintprogress.cpp \ $$PWD/src/components/ctabbar.cpp \ $$PWD/src/components/cmessage.cpp \ - $$PWD/src/components/cnotification.cpp \ $$PWD/src/components/canimatedicon.cpp \ $$PWD/src/components/ctabpanel.cpp \ $$PWD/src/components/csvgpushbutton.cpp \ @@ -210,6 +208,7 @@ core_linux { HEADERS += $$PWD/src/windows/platform_linux/cx11decoration.h \ #$$PWD/src/windows/platform_linux/gtk_addon.h \ $$PWD/src/windows/platform_linux/cwindowplatform.h \ + $$PWD/src/components/cnotification.h \ $$PWD/src/platform_linux/cdialogopenssl.h \ $$PWD/src/platform_linux/cdialogcertificateinfo.h \ $$PWD/src/platform_linux/singleapplication.h \ @@ -222,6 +221,7 @@ core_linux { SOURCES += $$PWD/src/windows/platform_linux/cx11decoration.cpp \ $$PWD/src/windows/platform_linux/cwindowplatform.cpp \ + $$PWD/src/components/cnotification.cpp \ $$PWD/src/platform_linux/cdialogopenssl.cpp \ $$PWD/src/platform_linux/cdialogcertificateinfo.cpp \ $$PWD/src/platform_linux/singleapplication.cpp \ @@ -258,7 +258,6 @@ core_windows { HEADERS += $$PWD/src/windows/platform_win/cwindowplatform.h \ $$PWD/src/windows/platform_win/caption.h \ $$PWD/src/platform_win/singleapplication.h \ - $$PWD/src/platform_win/wintoastlib.h \ $$PWD/src/platform_win/association.h \ $$PWD/src/platform_win/filechooser.h \ $$PWD/src/platform_win/printdialog.h \ @@ -266,7 +265,6 @@ core_windows { SOURCES += $$PWD/src/windows/platform_win/cwindowplatform.cpp \ $$PWD/src/platform_win/singleapplication.cpp \ - $$PWD/src/platform_win/wintoastlib.cpp \ $$PWD/src/platform_win/association.cpp \ $$PWD/src/platform_win/filechooser.cpp \ $$PWD/src/platform_win/printdialog.cpp @@ -311,6 +309,11 @@ core_windows { build_xp { DEFINES += __OS_WIN_XP + } else { + HEADERS += $$PWD/src/platform_win/wintoastlib.h \ + $$PWD/src/components/cnotification.h + SOURCES += $$PWD/src/platform_win/wintoastlib.cpp \ + $$PWD/src/components/cnotification.cpp } } diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp index 7fcb10974..0e5723685 100644 --- a/win-linux/src/cascapplicationmanagerwrapper.cpp +++ b/win-linux/src/cascapplicationmanagerwrapper.cpp @@ -24,11 +24,13 @@ #include "ctabundockevent.h" #include "clangater.h" #include "components/cmessage.h" -#include "components/cnotification.h" #include "ceditortools.h" #include "cfilechecker.h" #include "OfficeFileFormats.h" #include "cproviders.h" +#ifndef __OS_WIN_XP +# include "components/cnotification.h" +#endif #ifdef _WIN32 # include @@ -1102,11 +1104,13 @@ void CAscApplicationManagerWrapper::handleDeeplinkActions(const std::vectorm_notificationSupported = CNotification::instance().init(); } +#endif #ifdef _UPDMODULE if (!m_pUpdateManager) { diff --git a/win-linux/src/platform_win/association.cpp b/win-linux/src/platform_win/association.cpp index 504af9b4f..c690e0b4e 100644 --- a/win-linux/src/platform_win/association.cpp +++ b/win-linux/src/platform_win/association.cpp @@ -33,13 +33,18 @@ #include "association.h" #include "utils.h" #include "defines.h" -#include "components/cnotification.h" + #include "cascapplicationmanagerwrapper.h" #include #include #include #include #include +#ifdef __OS_WIN_XP +# include "components/cmessage.h" +#else +# include "components/cnotification.h" +#endif #define DLG_RESULT_NONE -2 #define DAY_TO_SEC 24*3600 @@ -230,7 +235,7 @@ void Association::AssociationPrivate::showAssociationMessage(QWidget *parent, co .arg(QString(WINDOW_NAME), QString::fromStdWString(unassocFileExts[0])) : QObject::tr("Do you want to make %1 your default application for all supported extensions?") .arg(QString(WINDOW_NAME)); - +#ifndef __OS_WIN_XP if (!forceModal && AscAppManager::notificationSupported()) { if (CNotification::instance().show(QObject::tr("Set Default App"), msg, MsgBtns::mbYesDefNo, [=](int res) { @@ -240,7 +245,7 @@ void Association::AssociationPrivate::showAssociationMessage(QWidget *parent, co return; } } - +#endif CMessageOpts opts; opts.checkBoxState = &m_ignoreAssocMsg; opts.chekBoxText = QObject::tr("Do not show this message again");