API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 12th, 2018
41
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.56 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/alt-fix-create-icon.patch b/alt-fix-create-icon.patch
  2. index 4971c31f..99d34cd3 100644
  3. --- a/alt-fix-create-icon.patch
  4. +++ b/alt-fix-create-icon.patch
  5. @@ -28,7 +28,7 @@ index 2bb4c11f..854566fe 100644
  6. } else if (role == IsLinkRole) {
  7. const KFileItem item = itemForIndex(index);
  8. return item.isLink();
  9. -@@ -1331,21 +1325,36 @@ bool FolderModel::isDir(const QModelIndex &index, const KDirModel *dirModel) con
  10. +@@ -1331,21 +1325,37 @@ bool FolderModel::isDir(const QModelIndex &index, const KDirModel *dirModel) con
  11. return true;
  12. }
  13.  
  14. @@ -71,11 +71,12 @@ index 2bb4c11f..854566fe 100644
  15. + job->setSide(KIO::StatJob::SourceSide);
  16. + job->setDetails(0);
  17. + connect(job, &KJob::result, this, &FolderModel::statResult);
  18. ++ qDebug() << "inserting" << item.url() << "to dirjobs";
  19. + m_isDirJobs.insert(item.url(), job);
  20. }
  21.  
  22. return false;
  23. -@@ -1358,11 +1367,13 @@ void FolderModel::statResult(KJob *job)
  24. +@@ -1358,11 +1367,14 @@ void FolderModel::statResult(KJob *job)
  25. const QUrl &url = statJob->property("org.kde.plasma.folder_url").toUrl();
  26. const QModelIndex &idx = index(indexForUrl(url), 0);
  27.  
  28. @@ -86,6 +87,7 @@ index 2bb4c11f..854566fe 100644
  29. emit dataChanged(idx, idx, QVector<int>() << IsDirRole);
  30. }
  31. +
  32. ++ qDebug() << "removing" << url << "from dirjobs";
  33. + m_isDirJobs.remove(url);
  34. }
  35.  
  36. diff --git a/plasma-desktop.spec b/plasma-desktop.spec
  37. index 4a6361cc..ac4d0968 100644
  38. --- a/plasma-desktop.spec
  39. +++ b/plasma-desktop.spec
  40. @@ -137,6 +137,7 @@ KF5 library
  41. %build
  42. %K5cmake \
  43. -DLIBEXEC_INSTALL_DIR=%_K5exec \
  44. + -DCMAKE_BUILD_TYPE=Debug \
  45. #
  46. %K5make
  47.  
  48. diff --git a/plasma-desktop/containments/desktop/package/contents/ui/FolderViewLayer.qml b/plasma-desktop/containments/desktop/package/contents/ui/FolderViewLayer.qml
  49. index ba4dc1e7..b3510dc7 100644
  50. --- a/plasma-desktop/containments/desktop/package/contents/ui/FolderViewLayer.qml
  51. +++ b/plasma-desktop/containments/desktop/package/contents/ui/FolderViewLayer.qml
  52. @@ -114,6 +114,9 @@ Item {
  53. }
  54.  
  55. onSortModeChanged: {
  56. + console.log("viewPropertiesMenu.onSortModeChanged");
  57. + console.log(plasmoid.configuration);
  58. + console.log(plasmoid.configuration.sortMode);
  59. plasmoid.configuration.sortMode = sortMode;
  60. }
  61.  
  62. @@ -189,8 +192,15 @@ Item {
  63. }
  64.  
  65. onSortModeChanged: {
  66. + console.log("configuration.onSortModeChanged");
  67. + console.log(plasmoid.configuration.sortMode);
  68. + console.log(folderView.sortMode);
  69. + console.log(viewPropertiesMenu.sortMode);
  70. folderView.sortMode = plasmoid.configuration.sortMode;
  71. viewPropertiesMenu.sortMode = plasmoid.configuration.sortMode;
  72. + console.log(plasmoid.configuration.sortMode);
  73. + console.log(folderView.sortMode);
  74. + console.log(viewPropertiesMenu.sortMode);
  75. }
  76.  
  77. onSortDescChanged: {
  78. @@ -206,6 +216,9 @@ Item {
  79. }
  80.  
  81. onPositionsChanged: {
  82. + console.log("configuration.onPositionsChanged");
  83. + console.log(plasmoid.configuration.positions);
  84. + console.log(folderView.positions);
  85. folderView.positions = plasmoid.configuration.positions;
  86. }
  87. }
  88. @@ -240,14 +253,21 @@ Item {
  89. layoutDirection: (plasmoid.configuration.alignment == 0) ? Qt.LeftToRight : Qt.RightToLeft
  90.  
  91. onSortModeChanged: {
  92. + console.log("folderView.onSortModeChanged");
  93. + console.log(plasmoid.configuration);
  94. + console.log(plasmoid.configuration.sortMode);
  95. plasmoid.configuration.sortMode = sortMode;
  96. }
  97.  
  98. onPositionsChanged: {
  99. + console.log("folderView.onPositionsChanged");
  100. plasmoid.configuration.positions = folderView.positions;
  101. }
  102.  
  103. Component.onCompleted: {
  104. + console.log("folderView.onCompleted");
  105. + console.log(plasmoid.configuration.sortMode);
  106. + console.log(plasmoid.configuration.positions);
  107. folderView.sortMode = plasmoid.configuration.sortMode;
  108. folderView.positions = plasmoid.configuration.positions;
  109. }
  110. diff --git a/plasma-desktop/containments/desktop/plugins/folder/foldermodel.cpp b/plasma-desktop/containments/desktop/plugins/folder/foldermodel.cpp
  111. index 8436ccfb..0f3cc7fb 100644
  112. --- a/plasma-desktop/containments/desktop/plugins/folder/foldermodel.cpp
  113. +++ b/plasma-desktop/containments/desktop/plugins/folder/foldermodel.cpp
  114. @@ -162,6 +162,7 @@ FolderModel::FolderModel(QObject *parent) : QSortFilterProxyModel(parent),
  115. auto it = m_dropTargetPositions.find(url.fileName());
  116. if (it != m_dropTargetPositions.end()) {
  117. const auto pos = it.value();
  118. + qDebug() << "erasing" << it.key() << it.value() << "from dropTargetPositions";
  119. m_dropTargetPositions.erase(it);
  120. setSortMode(-1);
  121. emit move(pos.x(), pos.y(), {url});
  122. @@ -268,6 +269,7 @@ void FolderModel::newFileMenuItemCreated(const QUrl &url)
  123. {
  124. if (m_usedByContainment) {
  125. m_screenMapper->addMapping(url, m_screen, ScreenMapper::DelayedSignal);
  126. + qDebug() << "inserting" << url.fileName() << m_menuPosition << "to dropTargetPositions";
  127. m_dropTargetPositions.insert(url.fileName(), m_menuPosition);
  128. m_menuPosition = {};
  129. m_dropTargetPositionsCleanup->start();
  130. @@ -432,6 +434,7 @@ int FolderModel::sortMode() const
  131.  
  132. void FolderModel::setSortMode(int mode)
  133. {
  134. + qDebug() << "setSortMode" << m_sortMode << mode;
  135. if (m_sortMode != mode) {
  136. m_sortMode = mode;
  137.  
  138. @@ -1079,6 +1082,7 @@ void FolderModel::drop(QQuickItem *target, QObject* dropEvent, int row)
  139. setSortMode(-1);
  140.  
  141. for (const auto &url : mimeData->urls()) {
  142. + qDebug() << "inserting" << url.fileName() << dropPos << "to dropTargetPositions";
  143. m_dropTargetPositions.insert(url.fileName(), dropPos);
  144. m_screenMapper->addMapping(mappableUrl(url), m_screen, ScreenMapper::DelayedSignal);
  145. m_screenMapper->removeItemFromDisabledScreen(mappableUrl(url));
  146. @@ -1113,6 +1117,7 @@ void FolderModel::drop(QQuickItem *target, QObject* dropEvent, int row)
  147. if (isDropBetweenSharedViews(mimeData->urls(), dropTargetFolderUrl)) {
  148. setSortMode(-1);
  149. for (const auto &url : mimeData->urls()) {
  150. + qDebug() << "inserting" << url.fileName() << dropPos << "to dropTargetPositions";
  151. m_dropTargetPositions.insert(url.fileName(), dropPos);
  152. m_screenMapper->addMapping(mappableUrl(url), m_screen, ScreenMapper::DelayedSignal);
  153. m_screenMapper->removeItemFromDisabledScreen(mappableUrl(url));
  154. @@ -1156,6 +1161,7 @@ void FolderModel::drop(QQuickItem *target, QObject* dropEvent, int row)
  155. */
  156. connect(dropJob, &KIO::DropJob::copyJobStarted, this, [this, dropPos, dropTargetUrl](KIO::CopyJob* copyJob) {
  157. auto map = [this, dropPos, dropTargetUrl](const QUrl &targetUrl) {
  158. + qDebug() << "inserting" << targetUrl.fileName() << dropPos << "to dropTargetPositions";
  159. m_dropTargetPositions.insert(targetUrl.fileName(), dropPos);
  160. m_dropTargetPositionsCleanup->start();
  161.  
  162. diff --git a/plasma-desktop/containments/desktop/plugins/folder/positioner.cpp b/plasma-desktop/containments/desktop/plugins/folder/positioner.cpp
  163. index 258a1ca2..df8c625c 100644
  164. --- a/plasma-desktop/containments/desktop/plugins/folder/positioner.cpp
  165. +++ b/plasma-desktop/containments/desktop/plugins/folder/positioner.cpp
  166. @@ -64,6 +64,7 @@ void Positioner::setEnabled(bool enabled)
  167. emit enabledChanged();
  168.  
  169. if (!enabled) {
  170. + qDebug() << "start timer: setEnabled";
  171. m_updatePositionsTimer->start();
  172. }
  173. }
  174. @@ -128,6 +129,7 @@ void Positioner::setPositions(const QStringList &positions)
  175. if (m_positions != positions) {
  176. m_positions = positions;
  177.  
  178. + qDebug() << "emit setPositions";
  179. emit positionsChanged();
  180.  
  181. if (!m_proxyToSource.isEmpty()) {
  182. @@ -355,6 +357,7 @@ void Positioner::reset()
  183. endResetModel();
  184.  
  185. m_positions = QStringList();
  186. + qDebug() << "emit reset";
  187. emit positionsChanged();
  188. }
  189.  
  190. @@ -438,6 +441,7 @@ void Positioner::move(const QVariantList &moves) {
  191. endRemoveRows();
  192. }
  193.  
  194. + qDebug() << "start timer: move";
  195. m_updatePositionsTimer->start();
  196. }
  197.  
  198. @@ -472,7 +476,8 @@ void Positioner::updatePositions()
  199. if (positions != m_positions) {
  200. m_positions = positions;
  201.  
  202. - emit positionsChanged();
  203. + qDebug() << "emit updatePositions";
  204. + //emit positionsChanged();
  205. }
  206. }
  207.  
  208. @@ -651,6 +656,7 @@ void Positioner::sourceRowsInserted(const QModelIndex &parent, int first, int la
  209.  
  210. flushPendingChanges();
  211.  
  212. + qDebug() << "start timer: sourceRowsInserted";
  213. m_updatePositionsTimer->start();
  214. }
  215.  
  216. @@ -680,6 +686,7 @@ void Positioner::sourceRowsRemoved(const QModelIndex &parent, int first, int las
  217.  
  218. flushPendingChanges();
  219.  
  220. + qDebug() << "start timer: sourceRowsRemoved";
  221. m_updatePositionsTimer->start();
  222. }
  223.  
  224. @@ -866,6 +873,7 @@ void Positioner::applyPositions()
  225.  
  226. m_pendingPositions = false;
  227.  
  228. + qDebug() << "start timer: applyPositions";
  229. m_updatePositionsTimer->start();
  230. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!