smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Remove Wayland experimental pop

Browse source
This commit is contained in:
Nick Bolton 2024-10-16 10:18:08 +01:00
parent 8424ffa438
commit 9a5c1a3212
5 changed files with 0 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lib/gui/core/WaylandWarnings.cpp
View file

@ -31,10 +31,6 @@ void WaylandWarnings::Deps::showWaylandLibraryError(QWidget *parent) {
messages::showWaylandLibraryError(parent); messages::showWaylandLibraryError(parent);
} }
void WaylandWarnings::Deps::showWaylandExperimental(QWidget *parent) {
messages::showWaylandExperimental(parent);
}
// //
// WaylandWarnings // WaylandWarnings
// //
@ -55,11 +51,6 @@ void WaylandWarnings::showOnce(
} }
return; return;
} }
if (!m_warningShown) {
m_warningShown = true;
m_pDeps->showWaylandExperimental(parent);
}
} }
} // namespace deskflow::gui::core } // namespace deskflow::gui::core

2
src/lib/gui/core/WaylandWarnings.h
View file

@ -29,7 +29,6 @@ class WaylandWarnings {
public: public:
struct Deps { struct Deps {
virtual ~Deps() = default; virtual ~Deps() = default;
virtual void showWaylandExperimental(QWidget *parent);
virtual void showWaylandLibraryError(QWidget *parent); virtual void showWaylandLibraryError(QWidget *parent);
}; };
@ -44,7 +43,6 @@ public:
private: private:
bool m_errorShown{false}; bool m_errorShown{false};
bool m_warningShown{false};
std::shared_ptr<Deps> m_pDeps; std::shared_ptr<Deps> m_pDeps;
}; };

11
src/lib/gui/messages.cpp
View file

@ -285,17 +285,6 @@ void showReadOnlySettings(QWidget *parent, const QString &systemSettingsPath) {
.arg(nativePath)); .arg(nativePath));
} }
void showWaylandExperimental(QWidget *parent) {
QMessageBox::information(
parent, "Wayland support (experimental)",
QString(
"<p>Heads up!</p>"
"<p>Wayland support is experimental and contains bugs.</p>"
R"(<p>Please <a href="%1" style="color: %2">report bugs</a> to us if you find any.</p>)"
"<p>Happy testing!</p>")
.arg(kAppName, kUrlHelp, kColorSecondary));
}
void showWaylandLibraryError(QWidget *parent) { void showWaylandLibraryError(QWidget *parent) {
QMessageBox::critical( QMessageBox::critical(
parent, "Library problem", parent, "Library problem",

2
src/lib/gui/messages.h
View file

@ -52,8 +52,6 @@ bool showClearSettings(QWidget *parent);
void showReadOnlySettings(QWidget *parent, const QString &systemSettingsPath); void showReadOnlySettings(QWidget *parent, const QString &systemSettingsPath);
void showWaylandExperimental(QWidget *parent);
void showWaylandLibraryError(QWidget *parent); void showWaylandLibraryError(QWidget *parent);
bool showUpdateCheckOption(QWidget *parent); bool showUpdateCheckOption(QWidget *parent);

42
src/test/unittests/gui/core/WaylandWarningsTests.cpp
View file

@ -27,7 +27,6 @@ using namespace deskflow::gui::core;
namespace { namespace {
struct MockDeps : public WaylandWarnings::Deps { struct MockDeps : public WaylandWarnings::Deps {
MOCK_METHOD(void, showWaylandExperimental, (QWidget *), (override));
MOCK_METHOD(void, showWaylandLibraryError, (QWidget *), (override)); MOCK_METHOD(void, showWaylandLibraryError, (QWidget *), (override));
}; };
@ -72,32 +71,6 @@ TEST(WaylandWarningsTests, showOnce_serverNoPortalIc_showLibraryError) {
nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC); nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC);
} }
TEST(WaylandWarningTests, showOnce_clientNoPortalIc_showExperimental) {
const auto deps = std::make_shared<MockDeps>();
const bool hasEi = true;
const bool hasPortal = true;
const bool hasPortalIC = false;
WaylandWarnings waylandWarnings(deps);
EXPECT_CALL(*deps, showWaylandExperimental(nullptr)).Times(1);
waylandWarnings.showOnce(
nullptr, CoreProcess::Mode::Client, hasEi, hasPortal, hasPortalIC);
}
TEST(WaylandWarningsTests, showOnce_serverHasPortalIc_showExperimentalOnly) {
const auto deps = std::make_shared<MockDeps>();
const bool hasEi = true;
const bool hasPortal = true;
const bool hasPortalIC = true;
WaylandWarnings waylandWarnings(deps);
EXPECT_CALL(*deps, showWaylandExperimental(nullptr)).Times(1);
waylandWarnings.showOnce(
nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC);
}
TEST(WaylandWarningsTests, showOnce_failureCalledTwice_messageOnlyShownOnce) { TEST(WaylandWarningsTests, showOnce_failureCalledTwice_messageOnlyShownOnce) {
const auto deps = std::make_shared<MockDeps>(); const auto deps = std::make_shared<MockDeps>();
const bool hasEi = false; const bool hasEi = false;
@ -112,18 +85,3 @@ TEST(WaylandWarningsTests, showOnce_failureCalledTwice_messageOnlyShownOnce) {
waylandWarnings.showOnce( waylandWarnings.showOnce(
nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC); nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC);
} }
TEST(WaylandWarningsTests, showOnce_successCalledTwice_messageOnlyShownOnce) {
const auto deps = std::make_shared<MockDeps>();
const bool hasEi = true;
const bool hasPortal = true;
const bool hasPortalIC = true;
WaylandWarnings waylandWarnings(deps);
EXPECT_CALL(*deps, showWaylandExperimental(nullptr)).Times(1);
waylandWarnings.showOnce(
nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC);
waylandWarnings.showOnce(
nullptr, CoreProcess::Mode::Server, hasEi, hasPortal, hasPortalIC);
}