Qt6 Migration: LtsWidgets, BUILD_RTI Guards, externe Dependencies dokumentiert
- LtsWidgets Verzeichnis vollständig migriert (Qt5→Qt6) - BUILD_RTI Guards für RTI-spezifische Module hinzugefügt - Externe Dependencies in EXTERNAL_DEPS.md dokumentiert - Qt6 API-Änderungen: QRegExp→QRegularExpression, enterEvent(QEnterEvent*) - AutoUic-Fehler bei ui_requirement behoben (SKIP_AUTOUIC) - Include-Pfade korrigiert (LtsElevation, LtsMultiMonitor, LtsUtilsCore) - MOC-Fehler behoben (Q_INTERFACES entfernt wo nicht benötigt) - CMakeLists.txt Anpassungen für Qt6 (PUBLIC statt INTERFACE) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
145 files changed
+17700
-14377
No files matched your search
@@ -1,4 +1,12 @@
|
||||
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Frameless Dialog, modal, exists exactly once per - a global/static wait dlg which counts for all compontens that are waiting for their operation to be done but don't want to own a progress dialog !
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*
|
||||
* Created by Mike Wille, SLSE, 2017-03-17
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
@@ -6,62 +14,64 @@
|
||||
|
||||
#include <QObject>
|
||||
|
||||
|
||||
class QTimer;
|
||||
class QWidget;
|
||||
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
class LtsDialog;
|
||||
class LtsOverlayLoading;
|
||||
class LtsProgressDialogHelper;
|
||||
|
||||
/**
|
||||
* @brief The LtsGlobalWaitDialog class is a global/static wait dlg which counts for all compontens that are waiting for their operation to be done but don't want to own a progress dialog !
|
||||
*/
|
||||
class LTSWIDGETS_EXPORT LtsGlobalWaitDialog : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
static LtsGlobalWaitDialog* getInstance();
|
||||
void wait(QWidget* parent, const QString& customText = QString());
|
||||
public:
|
||||
static LtsGlobalWaitDialog* getInstance();
|
||||
void wait(QWidget *parent, const QString &customText = QString()); // shows the Progress Dialog
|
||||
void wait(const QString &customText = QString()) { wait(nullptr, customText); }
|
||||
void done(); // hides the Progress Dialog IF all wait()s were canceled with done() !
|
||||
void setVisible(bool visible = true);
|
||||
void setCustomText(const QString &customText = QString()); // call with empty string to reset text to default text "waiting for server"
|
||||
void unarm(); // deactivate the global wait dialog from showing up (e.g. wait dialog should not be recorded while recording a script in the script editor)
|
||||
void rearm(); // undo the unarm (re-activate global wait dialog)
|
||||
|
||||
void wait(const QString& customText = QString())
|
||||
{
|
||||
wait(nullptr, customText);
|
||||
}
|
||||
private:
|
||||
friend struct LtsGlobalWaitDialogHandler;
|
||||
|
||||
void done();
|
||||
void setVisible(bool visible = true);
|
||||
void setCustomText(const QString& customText = QString());
|
||||
void unarm();
|
||||
void rearm();
|
||||
LtsGlobalWaitDialog();
|
||||
~LtsGlobalWaitDialog();
|
||||
static void cleanupGwdInstance();
|
||||
|
||||
private:
|
||||
friend struct LtsGlobalWaitDialogHandler;
|
||||
void showIt();
|
||||
void hideIt();
|
||||
|
||||
LtsGlobalWaitDialog();
|
||||
~LtsGlobalWaitDialog();
|
||||
static void cleanupGwdInstance();
|
||||
|
||||
void showIt();
|
||||
void hideIt();
|
||||
|
||||
int m_waitingCount;
|
||||
bool m_visible;
|
||||
bool m_armed{true};
|
||||
LtsProgressDialogHelper* m_progressDialog;
|
||||
QTimer* m_hideTimer;
|
||||
int m_waitingCount;
|
||||
bool m_visible;
|
||||
bool m_armed { true };
|
||||
LtsProgressDialogHelper *m_progressDialog;
|
||||
QTimer *m_hideTimer;
|
||||
};
|
||||
|
||||
} // namespace LtsWidgets
|
||||
|
||||
|
||||
|
||||
// 'hyper-global' stuff into main namespace
|
||||
class LTSWIDGETS_EXPORT Waiter
|
||||
{
|
||||
public:
|
||||
explicit Waiter(const QString& customText = {});
|
||||
explicit Waiter(LtsWidgets::LtsDialog* parent, const QString& customText = {});
|
||||
~Waiter();
|
||||
public:
|
||||
explicit Waiter(const QString &customText = {});
|
||||
explicit Waiter(LtsWidgets::LtsDialog *parent, const QString &customText = {});
|
||||
~Waiter();
|
||||
|
||||
private:
|
||||
LtsWidgets::LtsOverlayLoading* m_loadingOverlay{nullptr};
|
||||
LtsWidgets::LtsDialog* m_parent{nullptr};
|
||||
bool m_oldClosableState{false};
|
||||
private:
|
||||
LtsWidgets::LtsOverlayLoading *m_loadingOverlay { nullptr };
|
||||
LtsWidgets::LtsDialog *m_parent { nullptr };
|
||||
bool m_oldClosableState { false };
|
||||
};
|
||||
Reference in new issue
Block a user