feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix that files could not be dropped onto welcome screen

Browse Source 
Needs to be implemented in Qt Quick itself nowadays.

Task-number: QTCREATORBUG-14194
Change-Id: I0456dc5d86c03672d8b6b8f9c45799851db1b059
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Eike Ziller
2016-11-15 15:58:51 +01:00
parent 45216d5c1a
commit 3508a09010
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/welcomescreen/welcomescreen.qml
View File

@@ -33,6 +33,16 @@ Item {
property int screenDependHeightDistance: Math.min(50, Math.max(16, height / 30)) property int screenDependHeightDistance: Math.min(50, Math.max(16, height / 30))
DropArea {
anchors.fill: parent
keys: ["text/uri-list"]
onDropped: {
if ((drop.supportedActions & Qt.CopyAction != 0)
&& welcomeMode.openDroppedFiles(drop.urls))
drop.accept(Qt.CopyAction);
}
}
SideBar { SideBar {
id: sideBar id: sideBar
model: pagesModel model: pagesModel

15
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -52,6 +52,7 @@
#include <QDir> #include <QDir>
#include <QQmlPropertyMap> #include <QQmlPropertyMap>
#include <QQuickImageProvider> #include <QQuickImageProvider>
#include <QTimer>
#include <QtQuickWidgets/QQuickWidget> #include <QtQuickWidgets/QQuickWidget>
#include <QtQml/QQmlContext> #include <QtQml/QQmlContext>
@@ -135,6 +136,8 @@ public:
QStringList recentProjectsShortcuts() const { return m_recentProjectsShortcuts; } QStringList recentProjectsShortcuts() const { return m_recentProjectsShortcuts; }
QStringList sessionsShortcuts() const { return m_sessionsShortcuts; } QStringList sessionsShortcuts() const { return m_sessionsShortcuts; }
Q_INVOKABLE bool openDroppedFiles(const QList<QUrl> &urls);
public slots: public slots:
void setActivePlugin(int pos) void setActivePlugin(int pos)
{ {
@@ -307,6 +310,18 @@ void WelcomeMode::initPlugins()
m_welcomePage->setSource(QUrl::fromLocalFile(path)); m_welcomePage->setSource(QUrl::fromLocalFile(path));
} }
bool WelcomeMode::openDroppedFiles(const QList<QUrl> &urls)
{
const QList<QUrl> localUrls = Utils::filtered(urls, &QUrl::isLocalFile);
if (!localUrls.isEmpty()) {
QTimer::singleShot(0, [localUrls]() {
ICore::openFiles(Utils::transform(localUrls, &QUrl::toLocalFile), ICore::SwitchMode);
});
return true;
}
return false;
}
void WelcomeMode::welcomePluginAdded(QObject *obj) void WelcomeMode::welcomePluginAdded(QObject *obj)
{ {
IWelcomePage *page = qobject_cast<IWelcomePage*>(obj); IWelcomePage *page = qobject_cast<IWelcomePage*>(obj);