kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-21 09:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/17.08'

Browse source
This commit is contained in:
Elvis Angelaccio 2017-07-27 16:05:18 +02:00
parent 9a957c3b5c c3de867622
commit 82b2dbd3ec
8 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/CMakeLists.txt
View file

@ -180,6 +180,8 @@ set(dolphinpart_SRCS
dolphindebug.cpp
)
qt5_add_resources(dolphinpart_SRCS dolphinpart.qrc)
add_library(dolphinpart MODULE ${dolphinpart_SRCS})
target_link_libraries(dolphinpart
@ -188,7 +190,6 @@ target_link_libraries(dolphinpart
install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
install(FILES dolphinpart.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphinpart)
install(FILES dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
##########################################
@ -267,6 +268,8 @@ if(NOT WIN32)
set(dolphinstatic_SRCS ${dolphinstatic_SRCS} panels/terminal/terminalpanel.cpp)
endif()
qt5_add_resources(dolphinstatic_SRCS dolphin.qrc)
add_library(dolphinstatic STATIC ${dolphinstatic_SRCS})
target_include_directories(dolphinstatic PRIVATE ${PHONON_INCLUDES})
@ -389,7 +392,6 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
settings/dolphin_detailsmodesettings.kcfg
settings/dolphin_versioncontrolsettings.kcfg
DESTINATION ${KDE_INSTALL_KCFGDIR} )
install( FILES dolphinui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphin )
install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
${KDE_INSTALL_KSERVICES5DIR} )

5
src/dolphin.qrc Normal file
View file

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/kxmlgui5/dolphin">
<file>dolphinui.rc</file>
</qresource>
</RCC>

5
src/dolphinpart.qrc Normal file
View file

@ -0,0 +1,5 @@
<RCC>
<qresource prefix="/kxmlgui5/dolphinpart">
<file>dolphinpart.rc</file>
</qresource>
</RCC>

2
src/dolphintabwidget.cpp
View file

@ -284,7 +284,7 @@ void DolphinTabWidget::tabDropEvent(int index, QDropEvent* event)
{
if (index >= 0) {
DolphinView* view = tabPageAt(index)->activeViewContainer()->view();
view->dropUrls(view->url(), event);
view->dropUrls(view->url(), event, view);
}
}

11
src/dolphinviewcontainer.cpp
View file

@ -29,6 +29,7 @@
#include <KFilePlacesModel>
#include <KLocalizedString>
#include <KIO/PreviewJob>
#include <kio_version.h>
#include <KMessageWidget>
#include <KShell>
#include <QUrl>
@ -135,8 +136,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
this, &DolphinViewContainer::slotUrlNavigatorLocationChanged);
connect(m_urlNavigator, &KUrlNavigator::returnPressed,
this, &DolphinViewContainer::slotReturnPressed);
connect(m_urlNavigator, &KUrlNavigator::urlsDropped,
m_view, &DolphinView::dropUrls);
connect(m_urlNavigator, &KUrlNavigator::urlsDropped, this, [=](const QUrl &destination, QDropEvent *event) {
#if KIO_VERSION >= QT_VERSION_CHECK(5, 37, 0)
m_view->dropUrls(destination, event, m_urlNavigator->dropWidget());
#else
// TODO: remove as soon as we can hard-depend of KF5 >= 5.37
m_view->dropUrls(destination, event, m_view);
#endif
});
// Initialize status bar
m_statusBar = new DolphinStatusBar(this);

6
src/views/dolphinview.cpp
View file

@ -1051,14 +1051,14 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
event->mimeData(),
event->buttons(),
event->modifiers());
dropUrls(destUrl, &dropEvent);
dropUrls(destUrl, &dropEvent, this);
setActive(true);
}
void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent)
void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget)
{
KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, this);
KIO::DropJob* job = DragAndDropHelper::dropUrls(destUrl, dropEvent, dropWidget);
if (job) {
connect(job, &KIO::DropJob::result, this, &DolphinView::slotPasteJobResult);

4
src/views/dolphinview.h
View file

@ -363,9 +363,9 @@ public slots:
void pasteIntoFolder();
/**
* Handles a drop of @p dropEvent onto @p destUrl
* Handles a drop of @p dropEvent onto widget @p dropWidget and destination @p destUrl
*/
void dropUrls(const QUrl &destUrl, QDropEvent *dropEvent);
void dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget *dropWidget);
void stopLoading();

2
src/views/draganddrophelper.h
View file

@ -41,7 +41,7 @@ public:
* @param destUrl URL of the item destination. Is used only if destItem::isNull()
* is true.
* @param event Drop event.
* @param window Associated widget.
* @param window Widget where the drop happened, will be used as parent of the drop menu.
* @return KIO::DropJob pointer
*/
static KIO::DropJob* dropUrls(const QUrl& destUrl,