From a2b91c8a585341c5b76e5b0dac376834dfd08106 Mon Sep 17 00:00:00 2001 From: kostas Date: Sat, 12 May 2012 08:45:31 +0000 Subject: [PATCH] Fixed DnD on OSX FossilOrigin-Name: 165f5a8e367ecb525d3886e6c16d8fd09e458d27 --- MainWindow.cpp | 9 +++------ manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 571e2cf..02ce87e 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -2449,19 +2449,16 @@ void MainWindow::onFileViewDragOut() { QStringList filenames; getFileViewSelection(filenames); - QString uris; if(filenames.isEmpty()) return; - // text/uri-list is a new-line separate list of uris + QList urls; foreach(QString f, filenames) - { - uris += QUrl::fromLocalFile(getCurrentWorkspace()+QDir::separator()+f).toString() + '\n'; - } + urls.append(QUrl::fromLocalFile(getCurrentWorkspace()+QDir::separator()+f)); QMimeData *mime_data = new QMimeData; - mime_data->setData("text/uri-list", uris.toUtf8()); + mime_data->setUrls(urls); QDrag *drag = new QDrag(this); drag->setMimeData(mime_data); diff --git a/manifest b/manifest index 1d3ae97..a53a910 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sGUI\sfixes\n -D 2012-05-12T08:29:59.590 +C Fixed\sDnD\son\sOSX +D 2012-05-12T08:45:31.929 F CloneDialog.cpp 85bc6473d1e3a47d0f981e96357a376be63ab0bc F CloneDialog.h 1c63da4346ca20b67d52016b7b64875b9c5b477f F CloneDialog.ui 0fc820804df91f16506ee466a44519fdd44e468f @@ -11,7 +11,7 @@ F FileActionDialog.h 15db1650b3a13d70bc338371e4c033c66e3b79ce F FileActionDialog.ui c63644428579741aeb5fa052e237ba799ced9ad7 F FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2 F FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df -F MainWindow.cpp e1e547b11d4cf41062c832d9d4a71ef1544b3e37 +F MainWindow.cpp 3e51da42bb24ae5b7b9c772c6b346464b69c7d76 F MainWindow.h f97ef3776d10211f42651cd2b7c7291d90bac3c1 F MainWindow.ui 5f4e40bfb3e93b00f2e06a6071187998eb617224 F SettingsDialog.cpp 296c77c5704bd8cb77a00d561db072aaaf60c1d6 @@ -179,7 +179,7 @@ F installer/fuel.iss 13b6a938bcdf273cbd3649d2549887baa1577214 F installer/license.txt 4cc77b90af91e615a64ae04893fdffa7939db84c F main.cpp f2913af0af1a5fcbebe93fb53b8a9cf6e7bbf65a F resources.qrc e98383ed205f4e37100c60057e0129c3b86dea53 -P 4db466899df13050ac14c60097286f1df3adc46f -R bdc86da69acabe1561fb34eb2f70bb57 +P 2bf7d04d9971660eacc30c6e05bfa82c595bbf6c +R d34566b9ebfcbb183db6d996f16341ba U kostas -Z 784ab37b21c2d131d1e7b56fcb7f97a9 +Z f5cbd5690840eda22ecacfb73012b989 diff --git a/manifest.uuid b/manifest.uuid index b470188..99eceb8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2bf7d04d9971660eacc30c6e05bfa82c595bbf6c \ No newline at end of file +165f5a8e367ecb525d3886e6c16d8fd09e458d27 \ No newline at end of file