Compare commits
63 Commits
ubuntu/cos
...
ubuntu/plu
| Author | SHA1 | Date |
|---|---|---|
 Simon Quigley
|
6b968b5cee | 2 months ago |
|
Simon Quigley
|
1b4ef60b8d | 3 months ago |
|
Simon Quigley
|
0d3a31a808 | 3 months ago |
|
Simon Quigley
|
0fd133690e | 3 months ago |
|
Simon Quigley
|
fcdbab103e | 3 months ago |
Rik Mills
|
7b5dfa60ab | 3 months ago |
|
Rik Mills
|
bf74959c45 | 5 months ago |
|
Rik Mills
|
aa428f7ffd | 5 months ago |
Aaron Rainbolt
|
278444a5f0 | 5 months ago |
|
Aaron Rainbolt
|
12890bf1f0 | 7 months ago |
|
Aaron Rainbolt
|
de9625e60d | 7 months ago |
|
Aaron Rainbolt
|
737f99deb0 | 7 months ago |
|
Aaron Rainbolt
|
cfdf6ed881 | 7 months ago |
|
Simon Quigley
|
3b9befd408 | 1 year ago |
 Aaron Rainbolt
|
0c61812bb4 | 1 year ago |
|
Aaron Rainbolt
|
8a6670ca43 | 1 year ago |
|
Aaron Rainbolt
|
e342a6962b | 1 year ago |
|
Simon Quigley
|
85a8038ce8 | 1 year ago |
|
Simon Quigley
|
ea87922cb1 | 2 years ago |
|
Simon Quigley
|
2572e5413b | 2 years ago |
|
Aaron Rainbolt
|
965d5321b7 | 2 years ago |
|
Aaron Rainbolt
|
0473392ff9 | 2 years ago |
|
Aaron Rainbolt
|
30153f3d11 | 2 years ago |
|
Aaron Rainbolt
|
4aad9fef00 | 2 years ago |
|
Simon Quigley
|
562b1e99a2 | 2 years ago |
|
Simon Quigley
|
9c6648ba8e | 2 years ago |
|
Simon Quigley
|
646e169aa5 | 2 years ago |
|
Simon Quigley
|
a8b1a9c57f | 2 years ago |
|
Simon Quigley
|
66bb55b6d1 | 2 years ago |
|
Simon Quigley
|
0ec1b20fa3 | 2 years ago |
|
Simon Quigley
|
000f25d930 | 3 years ago |
|
Simon Quigley
|
7b6035a6d9 | 3 years ago |
|
Simon Quigley
|
fd17dd83b1 | 3 years ago |
|
Simon Quigley
|
235b3346f9 | 3 years ago |
Dmitry Shachnev
|
d41f1e972e | 3 years ago |
|
Dmitry Shachnev
|
c7cb7fe6ab | 3 years ago |
 Dan Simmons
|
d96ce79e57 | 3 years ago |
apt-ghetto
|
c03db10395 | 3 years ago |
Raman Sarda
|
5b051dec1a | 4 years ago |
|
Simon Quigley
|
1844ef0ba3 | 5 years ago |
|
Simon Quigley
|
be1f2e914f | 5 years ago |
|
Simon Quigley
|
ebda318e3a | 5 years ago |
|
Simon Quigley
|
3a60c18512 | 5 years ago |
|
Simon Quigley
|
7b340349c4 | 5 years ago |
|
Simon Quigley
|
79710f9e52 | 5 years ago |
|
Simon Quigley
|
c85e3c68ac | 5 years ago |
|
Simon Quigley
|
37ba3c45c0 | 5 years ago |
|
Rik Mills
|
8fe344195e | 5 years ago |
|
Dmitry Shachnev
|
cf69cd0838 | 6 years ago |
|
apt-ghetto
|
8d332ae0ff | 6 years ago |
|
apt-ghetto
|
df565377ca | 6 years ago |
apt-ghetto
|
46d568183e | 6 years ago |
Simon Quigley
|
eb9d7223f4 | 6 years ago |
|
Simon Quigley
|
d2b550e22b | 6 years ago |
Rik Mills
|
84d3a83403 | 6 years ago |
|
Simon Quigley
|
3c02201b2c | 6 years ago |
|
Simon Quigley
|
bf0ac0ec7b | 6 years ago |
|
Simon Quigley
|
4b035b4e5c | 6 years ago |
|
Simon Quigley
|
5d752b4944 | 6 years ago |
|
Simon Quigley
|
b6a413b3f3 | 6 years ago |
|
Simon Quigley
|
003e19f816 | 6 years ago |
|
Simon Quigley
|
7d21a05623 | 6 years ago |
|
Simon Quigley
|
5f7a5391c7 | 6 years ago |
@ -1 +0,0 @@
|
||||
11
|
||||
@ -0,0 +1,5 @@
|
||||
[DEFAULT]
|
||||
debian-branch = debian/sid
|
||||
upstream-branch = upstream/latest
|
||||
pristine-tar = True
|
||||
compression = xz
|
||||
@ -1,432 +0,0 @@
|
||||
Description: Dynamically load libfm-qt
|
||||
Dynamically load libfm-qt on demand to create the file dialog helper to
|
||||
prevent the hard dependency on libfm-qt. This speed up the loading of the QPA
|
||||
plugin and also avoid loading libfm-qt in Qt programs having QT_NO_GLIB=1.
|
||||
Author: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
|
||||
Origin: upstream
|
||||
Applied-Upstream: commit:334394a
|
||||
Last-Update: 2018-07-30
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -18,10 +18,6 @@ find_package(Qt5XdgIconLoader REQUIRED)
|
||||
|
||||
# Patch Version 0
|
||||
|
||||
-# for file dialog support
|
||||
-find_package(Qt5X11Extras REQUIRED)
|
||||
-find_package(fm-qt REQUIRED)
|
||||
-
|
||||
include(LXQtPreventInSourceBuilds)
|
||||
include(LXQtCompilerSettings NO_POLICY_SCOPE)
|
||||
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -6,7 +6,6 @@ include_directories(
|
||||
set(qtlxqt_HDRS
|
||||
lxqtplatformtheme.h
|
||||
lxqtsystemtrayicon.h
|
||||
- lxqtfiledialoghelper.h
|
||||
statusnotifieritem/statusnotifieritem.h
|
||||
statusnotifieritem/dbustypes.h
|
||||
)
|
||||
@@ -15,7 +14,6 @@ set(qtlxqt_SRCS
|
||||
main.cpp
|
||||
lxqtplatformtheme.cpp
|
||||
lxqtsystemtrayicon.cpp
|
||||
- lxqtfiledialoghelper.cpp
|
||||
statusnotifieritem/statusnotifieritem.cpp
|
||||
statusnotifieritem/dbustypes.cpp
|
||||
)
|
||||
@@ -38,7 +36,6 @@ target_link_libraries(qtlxqt
|
||||
Qt5::DBus
|
||||
dbusmenu-qt5
|
||||
Qt5XdgIconLoader
|
||||
- fm-qt
|
||||
)
|
||||
|
||||
|
||||
--- a/src/lxqtfiledialoghelper.cpp
|
||||
+++ /dev/null
|
||||
@@ -1,276 +0,0 @@
|
||||
-#include "lxqtfiledialoghelper.h"
|
||||
-
|
||||
-#include <libfm-qt/libfmqt.h>
|
||||
-#include <libfm-qt/filedialog.h>
|
||||
-
|
||||
-#include <QWindow>
|
||||
-#include <QDebug>
|
||||
-#include <QTimer>
|
||||
-#include <QSettings>
|
||||
-
|
||||
-#include <memory>
|
||||
-
|
||||
-static std::unique_ptr<Fm::LibFmQt> libfmQtContext_;
|
||||
-
|
||||
-inline static const QString viewModeToString(Fm::FolderView::ViewMode value);
|
||||
-inline static Fm::FolderView::ViewMode viewModeFromString(const QString& str);
|
||||
-
|
||||
-LXQtFileDialogHelper::LXQtFileDialogHelper() {
|
||||
- if(!libfmQtContext_) {
|
||||
- // initialize libfm-qt only once
|
||||
- libfmQtContext_ = std::unique_ptr<Fm::LibFmQt>{new Fm::LibFmQt()};
|
||||
- }
|
||||
-
|
||||
- // can only be used after libfm-qt initialization
|
||||
- dlg_ = std::unique_ptr<Fm::FileDialog>(new Fm::FileDialog());
|
||||
- connect(dlg_.get(), &Fm::FileDialog::accepted, [this]() {
|
||||
- saveSettings();
|
||||
- accept();
|
||||
- });
|
||||
- connect(dlg_.get(), &Fm::FileDialog::rejected, [this]() {
|
||||
- saveSettings();
|
||||
- reject();
|
||||
- });
|
||||
-
|
||||
- connect(dlg_.get(), &Fm::FileDialog::fileSelected, this, &LXQtFileDialogHelper::fileSelected);
|
||||
- connect(dlg_.get(), &Fm::FileDialog::filesSelected, this, &LXQtFileDialogHelper::filesSelected);
|
||||
- connect(dlg_.get(), &Fm::FileDialog::currentChanged, this, &LXQtFileDialogHelper::currentChanged);
|
||||
- connect(dlg_.get(), &Fm::FileDialog::directoryEntered, this, &LXQtFileDialogHelper::directoryEntered);
|
||||
- connect(dlg_.get(), &Fm::FileDialog::filterSelected, this, &LXQtFileDialogHelper::filterSelected);
|
||||
-}
|
||||
-
|
||||
-LXQtFileDialogHelper::~LXQtFileDialogHelper() {
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::exec() {
|
||||
- dlg_->exec();
|
||||
-}
|
||||
-
|
||||
-bool LXQtFileDialogHelper::show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow* parent) {
|
||||
- dlg_->setAttribute(Qt::WA_NativeWindow, true); // without this, sometimes windowHandle() will return nullptr
|
||||
-
|
||||
- dlg_->setWindowFlags(windowFlags);
|
||||
- dlg_->setWindowModality(windowModality);
|
||||
-
|
||||
- // Reference: KDE implementation
|
||||
- // https://github.com/KDE/plasma-integration/blob/master/src/platformtheme/kdeplatformfiledialoghelper.cpp
|
||||
- dlg_->windowHandle()->setTransientParent(parent);
|
||||
-
|
||||
- applyOptions();
|
||||
-
|
||||
- loadSettings();
|
||||
- // central positioning with respect to the parent window
|
||||
- if(parent && parent->isVisible()) {
|
||||
- dlg_->move(parent->x() + (parent->width() - dlg_->width()) / 2,
|
||||
- parent->y() + (parent->height() - dlg_->height()) / 2);
|
||||
- }
|
||||
-
|
||||
- // NOTE: the timer here is required as a workaround borrowed from KDE. Without this, the dialog UI will be blocked.
|
||||
- // QFileDialog calls our platform plugin to show our own native file dialog instead of showing its widget.
|
||||
- // However, it still creates a hidden dialog internally, and then make it modal.
|
||||
- // So user input from all other windows that are not the children of the QFileDialog widget will be blocked.
|
||||
- // This includes our own dialog. After the return of this show() method, QFileDialog creates its own window and
|
||||
- // then make it modal, which blocks our UI. The timer schedule a delayed popup of our file dialog, so we can
|
||||
- // show again after QFileDialog and override the modal state. Then our UI can be unblocked.
|
||||
- QTimer::singleShot(0, dlg_.get(), &QDialog::show);
|
||||
- dlg_->setFocus();
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::hide() {
|
||||
- dlg_->hide();
|
||||
-}
|
||||
-
|
||||
-bool LXQtFileDialogHelper::defaultNameFilterDisables() const {
|
||||
- return false;
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::setDirectory(const QUrl& directory) {
|
||||
- dlg_->setDirectory(directory);
|
||||
-}
|
||||
-
|
||||
-QUrl LXQtFileDialogHelper::directory() const {
|
||||
- return dlg_->directory();
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::selectFile(const QUrl& filename) {
|
||||
- dlg_->selectFile(filename);
|
||||
-}
|
||||
-
|
||||
-QList<QUrl> LXQtFileDialogHelper::selectedFiles() const {
|
||||
- return dlg_->selectedFiles();
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::setFilter() {
|
||||
- // FIXME: what's this?
|
||||
- // The gtk+ 3 file dialog helper in Qt5 update options in this method.
|
||||
- applyOptions();
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::selectNameFilter(const QString& filter) {
|
||||
- dlg_->selectNameFilter(filter);
|
||||
-}
|
||||
-
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
|
||||
-QString LXQtFileDialogHelper::selectedMimeTypeFilter() const {
|
||||
- return dlg_->selectedMimeTypeFilter();
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::selectMimeTypeFilter(const QString& filter) {
|
||||
- dlg_->selectMimeTypeFilter(filter);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
-QString LXQtFileDialogHelper::selectedNameFilter() const {
|
||||
- return dlg_->selectedNameFilter();
|
||||
-}
|
||||
-
|
||||
-bool LXQtFileDialogHelper::isSupportedUrl(const QUrl& url) const {
|
||||
- return dlg_->isSupportedUrl(url);
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::applyOptions() {
|
||||
- auto& opt = options();
|
||||
-
|
||||
- // set title
|
||||
- if(opt->windowTitle().isEmpty()) {
|
||||
- dlg_->setWindowTitle(opt->acceptMode() == QFileDialogOptions::AcceptOpen ? tr("Open File")
|
||||
- : tr("Save File"));
|
||||
- }
|
||||
- else {
|
||||
- dlg_->setWindowTitle(opt->windowTitle());
|
||||
- }
|
||||
-
|
||||
- dlg_->setFilter(opt->filter());
|
||||
- dlg_->setFileMode(QFileDialog::FileMode(opt->fileMode()));
|
||||
- dlg_->setAcceptMode(QFileDialog::AcceptMode(opt->acceptMode())); // also sets a default label for accept button
|
||||
- // bool useDefaultNameFilters() const;
|
||||
- dlg_->setNameFilters(opt->nameFilters());
|
||||
- if(!opt->mimeTypeFilters().empty()) {
|
||||
- dlg_->setMimeTypeFilters(opt->mimeTypeFilters());
|
||||
- }
|
||||
-
|
||||
- dlg_->setDefaultSuffix(opt->defaultSuffix());
|
||||
- // QStringList history() const;
|
||||
-
|
||||
- // explicitly set labels
|
||||
- for(int i = 0; i < QFileDialogOptions::DialogLabelCount; ++i) {
|
||||
- auto label = static_cast<QFileDialogOptions::DialogLabel>(i);
|
||||
- if(opt->isLabelExplicitlySet(label)) {
|
||||
- dlg_->setLabelText(static_cast<QFileDialog::DialogLabel>(label), opt->labelText(label));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- auto url = opt->initialDirectory();
|
||||
- if(url.isValid()) {
|
||||
- dlg_->setDirectory(url);
|
||||
- }
|
||||
-
|
||||
-
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
|
||||
- auto filter = opt->initiallySelectedMimeTypeFilter();
|
||||
- if(!filter.isEmpty()) {
|
||||
- selectMimeTypeFilter(filter);
|
||||
- }
|
||||
- else {
|
||||
- filter = opt->initiallySelectedNameFilter();
|
||||
- if(!filter.isEmpty()) {
|
||||
- selectNameFilter(opt->initiallySelectedNameFilter());
|
||||
- }
|
||||
- }
|
||||
-#else
|
||||
- auto filter = opt->initiallySelectedNameFilter();
|
||||
- if(!filter.isEmpty()) {
|
||||
- selectNameFilter(filter);
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
- auto selectedFiles = opt->initiallySelectedFiles();
|
||||
- for(const auto& selectedFile: selectedFiles) {
|
||||
- selectFile(selectedFile);
|
||||
- }
|
||||
- // QStringList supportedSchemes() const;
|
||||
-}
|
||||
-
|
||||
-static const QString viewModeToString(Fm::FolderView::ViewMode value) {
|
||||
- QString ret;
|
||||
- switch(value) {
|
||||
- case Fm::FolderView::DetailedListMode:
|
||||
- default:
|
||||
- ret = QLatin1String("Detailed");
|
||||
- break;
|
||||
- case Fm::FolderView::CompactMode:
|
||||
- ret = QLatin1String("Compact");
|
||||
- break;
|
||||
- case Fm::FolderView::IconMode:
|
||||
- ret = QLatin1String("Icon");
|
||||
- break;
|
||||
- case Fm::FolderView::ThumbnailMode:
|
||||
- ret = QLatin1String("Thumbnail");
|
||||
- break;
|
||||
- }
|
||||
- return ret;
|
||||
-}
|
||||
-
|
||||
-Fm::FolderView::ViewMode viewModeFromString(const QString& str) {
|
||||
- Fm::FolderView::ViewMode ret;
|
||||
- if(str == QLatin1String("Detailed")) {
|
||||
- ret = Fm::FolderView::DetailedListMode;
|
||||
- }
|
||||
- else if(str == QLatin1String("Compact")) {
|
||||
- ret = Fm::FolderView::CompactMode;
|
||||
- }
|
||||
- else if(str == QLatin1String("Icon")) {
|
||||
- ret = Fm::FolderView::IconMode;
|
||||
- }
|
||||
- else if(str == QLatin1String("Thumbnail")) {
|
||||
- ret = Fm::FolderView::ThumbnailMode;
|
||||
- }
|
||||
- else {
|
||||
- ret = Fm::FolderView::DetailedListMode;
|
||||
- }
|
||||
- return ret;
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::loadSettings() {
|
||||
- QSettings settings(QSettings::UserScope, "lxqt", "filedialog");
|
||||
- settings.beginGroup ("Sizes");
|
||||
- dlg_->resize(settings.value("WindowSize", QSize(700, 500)).toSize());
|
||||
- dlg_->setSplitterPos(settings.value("SplitterPos", 200).toInt());
|
||||
- settings.endGroup();
|
||||
-
|
||||
- settings.beginGroup ("View");
|
||||
- dlg_->setViewMode(viewModeFromString(settings.value("Mode", "Detailed").toString()));
|
||||
- settings.endGroup();
|
||||
-}
|
||||
-
|
||||
-void LXQtFileDialogHelper::saveSettings() {
|
||||
- QSettings settings(QSettings::UserScope, "lxqt", "filedialog");
|
||||
- settings.beginGroup ("Sizes");
|
||||
- QSize windowSize = dlg_->size();
|
||||
- if(settings.value("WindowSize") != windowSize) { // no redundant write
|
||||
- settings.setValue("WindowSize", windowSize);
|
||||
- }
|
||||
- int splitterPos = dlg_->splitterPos();
|
||||
- if(settings.value("SplitterPos") != splitterPos) {
|
||||
- settings.setValue("SplitterPos", splitterPos);
|
||||
- }
|
||||
- settings.endGroup();
|
||||
-
|
||||
- settings.beginGroup ("View");
|
||||
- QString mode = viewModeToString(dlg_->viewMode());
|
||||
- if(settings.value("Mode") != mode) {
|
||||
- settings.setValue("Mode", mode);
|
||||
- }
|
||||
- settings.endGroup();
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
-FileDialogPlugin::FileDialogPlugin() {
|
||||
-
|
||||
-}
|
||||
-
|
||||
-QPlatformFileDialogHelper *FileDialogPlugin::createHelper() {
|
||||
- return new LXQtFileDialogHelper();
|
||||
-}
|
||||
-*/
|
||||
--- a/src/lxqtfiledialoghelper.h
|
||||
+++ /dev/null
|
||||
@@ -1,50 +0,0 @@
|
||||
-#ifndef LXQTFILEDIALOGHELPER_H
|
||||
-#define LXQTFILEDIALOGHELPER_H
|
||||
-
|
||||
-#include <qpa/qplatformdialoghelper.h> // this private header is subject to changes
|
||||
-#include <memory>
|
||||
-
|
||||
-namespace Fm {
|
||||
-class FileDialog;
|
||||
-}
|
||||
-
|
||||
-class Q_GUI_EXPORT LXQtFileDialogHelper : public QPlatformFileDialogHelper {
|
||||
- Q_OBJECT
|
||||
-
|
||||
-public:
|
||||
- LXQtFileDialogHelper();
|
||||
-
|
||||
- virtual ~LXQtFileDialogHelper();
|
||||
-
|
||||
- // QPlatformDialogHelper
|
||||
- void exec() override;
|
||||
- bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override;
|
||||
- void hide() override;
|
||||
-
|
||||
- // QPlatformFileDialogHelper
|
||||
- bool defaultNameFilterDisables() const override;
|
||||
- void setDirectory(const QUrl &directory) override;
|
||||
- QUrl directory() const override;
|
||||
- void selectFile(const QUrl &filename) override;
|
||||
- QList<QUrl> selectedFiles() const override;
|
||||
- void setFilter() override;
|
||||
- void selectNameFilter(const QString &filter) override;
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
|
||||
- QString selectedMimeTypeFilter() const override;
|
||||
- void selectMimeTypeFilter(const QString &filter) override;
|
||||
-#endif
|
||||
- QString selectedNameFilter() const override;
|
||||
-
|
||||
- bool isSupportedUrl(const QUrl &url) const override;
|
||||
-
|
||||
-private:
|
||||
- void applyOptions();
|
||||
- void loadSettings();
|
||||
- void saveSettings();
|
||||
-
|
||||
-private:
|
||||
- std::unique_ptr<Fm::FileDialog> dlg_;
|
||||
-};
|
||||
-
|
||||
-
|
||||
-#endif // LXQTFILEDIALOGHELPER_H
|
||||
--- a/src/lxqtplatformtheme.cpp
|
||||
+++ b/src/lxqtplatformtheme.cpp
|
||||
@@ -45,8 +45,14 @@
|
||||
#include <QFileSystemWatcher>
|
||||
#include <QStyle>
|
||||
#include <private/xdgiconloader/xdgiconloader_p.h>
|
||||
+#include <QLibrary>
|
||||
+
|
||||
+
|
||||
+// Function to create a new Fm::FileDialogHelper object.
|
||||
+// This is dynamically loaded at runtime on demand from libfm-qt.
|
||||
+typedef QPlatformDialogHelper* (*CreateFileDialogHelperFunc)();
|
||||
+static CreateFileDialogHelperFunc createFileDialogHelper = nullptr;
|
||||
|
||||
-#include "lxqtfiledialoghelper.h"
|
||||
|
||||
LXQtPlatformTheme::LXQtPlatformTheme():
|
||||
iconFollowColorScheme_(true)
|
||||
@@ -222,8 +228,32 @@ bool LXQtPlatformTheme::usePlatformNativ
|
||||
QPlatformDialogHelper *LXQtPlatformTheme::createPlatformDialogHelper(DialogType type) const {
|
||||
if(type == FileDialog
|
||||
&& qobject_cast<QApplication *>(QCoreApplication::instance())) { // QML may not have qApp
|
||||
- // use our own file dialog
|
||||
- return new LXQtFileDialogHelper();
|
||||
+ // use our own file dialog provided by libfm
|
||||
+
|
||||
+ // When a process has this environment set, that means glib event loop integration is disabled.
|
||||
+ // In this case, libfm-qt just won't work. So let's disable the file dialog helper and return nullptr.
|
||||
+ if(qgetenv("QT_NO_GLIB") == "1") {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+
|
||||
+ // The createFileDialogHelper() method is dynamically loaded from libfm-qt on demand
|
||||
+ if(createFileDialogHelper == nullptr) {
|
||||
+ // try to dynamically load libfm-qt.so
|
||||
+ QLibrary libfmQtLibrary{"libfm-qt"};
|
||||
+ libfmQtLibrary.load();
|
||||
+ if(!libfmQtLibrary.isLoaded()) {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+
|
||||
+ // try to resolve the symbol to get the function pointer
|
||||
+ createFileDialogHelper = reinterpret_cast<CreateFileDialogHelperFunc>(libfmQtLibrary.resolve("createFileDialogHelper"));
|
||||
+ if(!createFileDialogHelper) {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // create a new file dialog helper provided by libfm
|
||||
+ return createFileDialogHelper();
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
dynamically-load-file-dialog.patch
|
||||
@ -0,0 +1,5 @@
|
||||
Name: lxqt-qtplugin
|
||||
Bug-Database: https://github.com/lxqt/lxqt-qtplugin/issues
|
||||
Bug-Submit: https://github.com/lxqt/lxqt-qtplugin/issues/new
|
||||
Changelog: https://github.com/lxqt/lxqt-qtplugin/blob/master/CHANGELOG
|
||||
Repository: https://github.com/lxqt/lxqt-qtplugin
|
||||
@ -1,50 +1,52 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
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
|
||||
=h7ww
|
||||
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
|
||||
sw==
|
||||
=gSIv
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
version=4
|
||||
opts="pgpsigurlmangle=s/$/.asc/" \
|
||||
https://github.com/lxde/lxqt-qtplugin/releases .*/lxqt-qtplugin-([\d\.]+).tar.xz
|
||||
opts="searchmode=plain, \
|
||||
pgpsigurlmangle=s/$/.asc/, \
|
||||
uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
|
||||
https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
|
||||
|
||||
Loading…
Reference in new issue