We are currently indexing your data, so search results may be incomplete until we finish.
reporegistry: better placement of externally-dragged repos (closes #553)
Changeset 00364dee4aba…
Parent 0cd6bea9499a…
by
Changes to 2 files · Browse files at 00364dee4aba Showing diff from parent 0cd6bea9499a Diff from another changeset...
|
|
@@ -7,9 +7,9 @@
import os
-from tortoisehg.util import hglib
+from tortoisehg.util import hglib, paths
from tortoisehg.hgqt.i18n import _
-from tortoisehg.hgqt import qtlib, repotreemodel, clone, settings
+from tortoisehg.hgqt import qtlib, repotreemodel, clone, settings, thgrepo
from PyQt4.QtCore import *
from PyQt4.QtGui import *
@@ -25,6 +25,7 @@ showMessage = pyqtSignal(QString)
openRepo = pyqtSignal(QString, bool)
menuRequested = pyqtSignal(object, object)
+ addRepo = pyqtSignal(object, QModelIndex, int)
def __init__(self, parent):
QTreeView.__init__(self, parent, allColumnsShowFocus=True)
@@ -40,7 +41,7 @@ self.setDragEnabled(True)
self.setAcceptDrops(True)
self.setAutoScroll(True)
- self.setDragDropMode(QAbstractItemView.InternalMove)
+ self.setDragDropMode(QAbstractItemView.DragDrop)
self.setDropIndicatorShown(True)
self.setEditTriggers(QAbstractItemView.DoubleClicked)
self.setSelectionBehavior(QAbstractItemView.SelectRows)
@@ -50,6 +51,71 @@ return
self.menuRequested.emit(event.globalPos(), self.selitem)
+ def dragEnterEvent(self, event):
+ if event.source() is self:
+ # Use the default event handler for internal dragging
+ super(RepoTreeView, self).dragEnterEvent(event)
+ return
+
+ d = event.mimeData()
+ for u in d.urls():
+ root = paths.find_root(hglib.fromunicode(u.toLocalFile()))
+ if root:
+ event.setDropAction(Qt.LinkAction)
+ event.accept()
+ self.setState(QAbstractItemView.DraggingState)
+ break
+
+ def dropLocation(self, event):
+ index = self.indexAt(event.pos())
+
+ # Determine where the item was dropped.
+ # Depth in tree: 1 = group, 2 = repo, and (eventually) 3+ = subrepo
+ depth = self.model().depth(index)
+ if depth == 1:
+ group = index
+ row = -1
+ elif depth == 2:
+ indicator = self.dropIndicatorPosition()
+ group = index.parent()
+ row = index.row()
+ if indicator == QAbstractItemView.BelowItem:
+ row = index.row() + 1
+ else:
+ index = group = row = None
+
+ return index, group, row
+
+ def dropEvent(self, event):
+ data = event.mimeData()
+ index, group, row = self.dropLocation(event)
+
+ if index:
+ if event.source() is self:
+ # Event is an internal move, so pass it to the model
+ col = 0
+ drop = self.model().dropMimeData(data, Qt.MoveAction, row,
+ col, group)
+ if drop:
+ event.setDropAction(Qt.MoveAction)
+ event.accept()
+ else:
+ # Event is a drop of an external repo
+ accept = False
+ for u in data.urls():
+ root = paths.find_root(hglib.fromunicode(u.toLocalFile()))
+ if root:
+ repo = thgrepo.repository(None,
+ path=hglib.fromunicode(root))
+ self.addRepo.emit(repo, group, row)
+ accept = True
+ if accept:
+ event.setDropAction(Qt.LinkAction)
+ event.accept()
+ self.setAutoScroll(False)
+ self.setState(QAbstractItemView.NoState)
+ self.viewport().update()
+
def mouseMoveEvent(self, event):
self.msg = ''
pos = event.pos()
@@ -58,6 +124,11 @@ item = idx.internalPointer()
self.msg = item.details()
self.showMessage.emit(self.msg)
+
+ if event.buttons() == Qt.NoButton:
+ # Bail out early to avoid tripping over this bug:
+ # http://bugreports.qt.nokia.com/browse/QTBUG-10180
+ return
super(RepoTreeView, self).mouseMoveEvent(event)
def keyPressEvent(self, event):
@@ -127,6 +198,7 @@ tv.showMessage.connect(self.showMessage)
tv.openRepo.connect(self.openRepo)
tv.menuRequested.connect(self.onMenuRequest)
+ tv.addRepo.connect(self.addRepo)
self.createActions()
QTimer.singleShot(0, self.expand)
@@ -134,12 +206,12 @@ def expand(self):
self.tview.expandToDepth(0)
- def addRepo(self, repo):
+ def addRepo(self, repo, group=None, row=-1):
'workbench has opened a new repowidget, ensure its in the registry'
m = self.tview.model()
it = m.getRepoItem(repo.root)
if it == None:
- m.addRepo(None, repo)
+ m.addRepo(group, repo, row)
else:
# ensure the registry item has a thgrepo instance
it.ensureRepoLoaded()
|
|
|
@@ -21,6 +21,7 @@
repoRegMimeType = 'application/thg-reporegistry'
repoRegGroupMimeType = 'application/thg-reporegistrygroup'
+repoExternalMimeType = 'text/uri-list'
def writeXml(target, item, rootElementName):
@@ -160,7 +161,8 @@ return res
def mimeTypes(self):
- return QStringList([repoRegMimeType, repoRegGroupMimeType])
+ return QStringList([repoRegMimeType, repoRegGroupMimeType,
+ repoExternalMimeType])
def mimeData(self, indexes):
i = indexes[0]
@@ -211,14 +213,15 @@ def allreposIndex(self):
return self.createIndex(0, 0, self.allrepos)
- def addRepo(self, group, repo):
+ def addRepo(self, group, repo, row=-1):
grp = group
if grp == None:
grp = self.allreposIndex()
rgi = grp.internalPointer()
- cc = rgi.childCount()
- self.beginInsertRows(grp, cc, cc + 1)
- rgi.appendChild(RepoItem(self, repo))
+ if row < 0:
+ row = rgi.childCount()
+ self.beginInsertRows(grp, row, row)
+ rgi.insertChild(row, RepoItem(self, repo))
self.endInsertRows()
def getRepoItem(self, reporoot):
@@ -236,3 +239,11 @@ f.open(QIODevice.WriteOnly)
writeXml(f, self.rootItem, reporegistryXmlElementName)
f.close()
+
+ def depth(self, index):
+ count = 0
+ while True:
+ index = index.parent()
+ if index.row() < 0:
+ return count
+ count += 1
|
||
Add a tag
Loading...