v6

Author: Troplo

src/config/generalconf.cpp

@@ -53,6 +53,7 @@ GeneralConf::GeneralConf(QWidget* parent)
     initUseJpgForClipboard();
     initCopyOnDoubleClick();
     initServerTPU();
+    initCustomEnv();
     initWindowOffsets();
     initSaveAfterCopy();
     initCopyPathAfterSave();
@@ -369,9 +370,9 @@ void GeneralConf::initCheckForUpdates()
 void GeneralConf::initAllowMultipleGuiInstances()
 {
     m_allowMultipleGuiInstances = new QCheckBox(
-      tr("Allow multiple flameshot GUI instances simultaneously"), this);
+      tr("Allow multiple Flowshot GUI instances simultaneously"), this);
     m_allowMultipleGuiInstances->setToolTip(tr(
-      "This allows you to take screenshots of Flameshot itself for example"));
+      "This allows you to take screenshots of Flowshot itself for example"));
     m_scrollAreaLayout->addWidget(m_allowMultipleGuiInstances);
     connect(m_allowMultipleGuiInstances,
             &QCheckBox::clicked,
@@ -396,7 +397,7 @@ void GeneralConf::initAutostart()
 {
     m_autostart = new QCheckBox(tr("Launch in background at startup"), this);
     m_autostart->setToolTip(tr(
-      "Launch Flameshot daemon (background process) when computer is booted"));
+      "Launch Flowshot daemon (background process) when computer is booted"));
     m_scrollAreaLayout->addWidget(m_autostart);
 
     connect(
@@ -612,6 +613,37 @@ void GeneralConf::initServerTPU()
     hboxLayoutKey->addWidget(labelAPIKey);
 }
 
+void GeneralConf::initCustomEnv() {
+    auto* box = new QGroupBox(tr("Force Qt Platform"));
+    box->setFlat(true);
+    m_scrollAreaLayout->addWidget(box);
+
+    auto* vboxLayout = new QVBoxLayout();
+    box->setLayout(vboxLayout);
+
+    auto* platformLayout = new QHBoxLayout();
+    m_selectPlatform = new QComboBox(this);
+    m_selectPlatform->addItem(tr("System (default)"), "default");
+    m_selectPlatform->addItem(tr("Wayland"), "wayland");
+    m_selectPlatform->addItem(tr("X11 (XCB, Xwayland)"), "xcb");
+    m_selectPlatform->setCurrentIndex(m_selectPlatform->findData(ConfigHandler().platform()));
+    platformLayout->addWidget(m_selectPlatform);
+    auto* platformWarning =
+      new QLabel(tr("This setting requires a restart of "
+                        "Flowshot to take effect.\n\nYou may opt to force X11/XCB mode if you have issues with multiple displays or the upload notification window under Wayland.\n\nSetting it to \"default\" will use the default environment variable QT_QPA_PLATFORM."),
+                 this);
+    platformWarning->setWordWrap(true);
+    connect(m_selectPlatform,
+            QOverload<int>::of(&QComboBox::currentIndexChanged),
+            this,
+            [this](int index) {
+                QString platform = m_selectPlatform->itemData(index).toString();
+                ConfigHandler().setPlatform(platform);
+            });
+    vboxLayout->addLayout(platformLayout);
+    vboxLayout->addWidget(platformWarning);
+}
+
 void GeneralConf::initWindowOffsets()
 {
     auto* box = new QGroupBox(tr("Upload Notification Settings"));
@@ -628,7 +660,7 @@ void GeneralConf::initWindowOffsets()
     auto* uploadWindowEnabledWarning =
       new QLabel(tr("WAYLAND USERS: This upload notification window does not "
                     "currently function correctly under Wayland. Please "
-                    "disable if you experience problems and use Wayland."),
+                    "disable or force X11 (XCB) mode in Force Qt Platform."),
                  this);
     uploadWindowEnabledWarning->setWordWrap(true);
 

src/config/generalconf.h

@@ -61,7 +61,6 @@ private slots:
     void setGeometryLocation(int index);
     void setSelGeoHideTime(int v);
     void setJpegQuality(int v);
-
 private:
     const QString chooseFolder(const QString& currentPath = "");
 
@@ -153,6 +152,7 @@ private slots:
     QSpinBox* m_xywhTimeout;
     QSpinBox* m_jpegQuality;
     QComboBox* m_selectDisplay;
+    QComboBox* m_selectPlatform;
     void uploadWindowOffsetYEdited();
     void uploadWindowOffsetXEdited();
     void initWindowOffsets();
@@ -165,4 +165,5 @@ private slots:
     void uploadWindowDisplayEdited();
     void uploadWindowImageEnabledEdited(bool checked);
     void uploadWindowButtonsEnabledEdited(bool checked);
+    void initCustomEnv();
 };

src/main.cpp

@@ -137,6 +137,19 @@ int main(int argc, char* argv[])
     wayland_hacks();
 #endif
 
+    // We need to init QSettings but the Qt application is not yet created
+    // so we need to do it manually
+    QSettings settings = QSettings(QSettings::IniFormat,
+                                   QSettings::UserScope,
+                                   QStringLiteral("flameshot"),
+                                   QStringLiteral("flameshot"));
+    // get the "platform" key from the settings
+    const QString platform = settings.value(QStringLiteral("platform"), QStringLiteral("default")).toString();
+    if(platform != "default" && !platform.isEmpty()) {
+        AbstractLogger::info() << "Setting QT_QPA_PLATFORM to " + platform;
+        qputenv("QT_QPA_PLATFORM", platform.toUtf8());
+    }
+
     // required for the button serialization
     // TODO: change to QVector in v1.0
     qRegisterMetaTypeStreamOperators<QList<int>>("QList<int>");

src/utils/confighandler.cpp

@@ -139,7 +139,8 @@ static QMap<class QString, QSharedPointer<ValueHandler>>
     OPTION("uploadWindowPreviewWidth"    ,LowerBoundedInt(0, 125)),
     OPTION("showSelectionGeometry"  , BoundedInt               (0,5,4)),
     OPTION("showSelectionGeometryHideTime", LowerBoundedInt       (0, 3000)),
-    OPTION("jpegQuality", BoundedInt     (0,100,75))
+    OPTION("jpegQuality", BoundedInt     (0,100,75)),
+    OPTION("platform", String            ( "default"            )),
 };
 
 static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {

src/utils/confighandler.h

@@ -153,6 +153,7 @@ class ConfigHandler : public QObject
     CONFIG_GETTER_SETTER(showSelectionGeometryHideTime,
                          showSelectionGeometryHideTime,
                          int)
+    CONFIG_GETTER_SETTER(platform, setPlatform, QString)
 
     // SPECIAL CASES
     bool startupLaunch();

src/utils/globalvalues.cpp

@@ -12,8 +12,8 @@ int GlobalValues::buttonBaseSize()
 
 QString GlobalValues::versionInfo()
 {
-    return QStringLiteral("Flameshot " APP_VERSION " (" FLAMESHOT_GIT_HASH ")"
-                          "\n(Flowinity fork v5)"
+    return QStringLiteral("Flowinity Flowshot " APP_VERSION " (" FLAMESHOT_GIT_HASH ")"
+                          "\n(Fork of Flameshot v6)"
                           "\nCompiled with Qt " QT_VERSION_STR);
 }