by
Changes to 4 files · Browse files at 8cf34332ed01 Showing diff from parent 57fa0272f191 c5b82b5a2bc7 Diff from another changeset...
@@ -63,6 +63,7 @@ grid.setColumnStretch(0, 0)
grid.setColumnStretch(1, 1)
layout.addLayout(grid)
+ layout.addStretch()
newbranch.toggled.connect(branchCombo.setEnabled)
branchCombo.setEnabled(False)
|
@@ -289,7 +289,7 @@ return
else:
try:
- targetdir = os.path.dirname(dest)
+ targetdir = os.path.dirname(fulldest)
if not os.path.isdir(targetdir):
os.makedirs(targetdir)
os.rename(fullsrc, fulldest)
|
@@ -11,7 +11,7 @@
from mercurial import revset, error, patch
-from tortoisehg.util import hglib
+from tortoisehg.util import hglib, shlib
from tortoisehg.hgqt.i18n import _
from tortoisehg.hgqt import qtlib
@@ -1788,6 +1788,7 @@
def onCommandFinished(self, ret):
self.repo.decrementBusyCount()
+ shlib.shell_notify(self.repo.root)
def runCommand(self, *cmdlines):
if self.runner.core.running():
|
@@ -222,33 +222,31 @@ self.securebutton = a
tbar.addWidget(qtlib.Spacer(2, 2))
+ self.hostAndPortActions = []
+
fontm = QFontMetrics(self.font())
self.hostentry = QLineEdit()
self.hostentry.setToolTip(_('Hostname'))
self.hostentry.setAcceptDrops(False)
self.hostentry.setFixedWidth(30 * fontm.width('9'))
self.hostentry.textChanged.connect(self.refreshUrl)
- tbar.addWidget(self.hostentry)
- tbar.addWidget(qtlib.Spacer(2, 2))
+ self.hostAndPortActions.append(tbar.addWidget(self.hostentry))
+ self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))
- self.HostAndPortWidgets = [self.hostentry]
w = QLabel(':')
- tbar.addWidget(w)
- tbar.addWidget(qtlib.Spacer(2, 2))
- self.HostAndPortWidgets.append(w)
+ self.hostAndPortActions.append(tbar.addWidget(w))
+ self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))
self.portentry = QLineEdit()
self.portentry.setAcceptDrops(False)
self.portentry.setToolTip(_('Port'))
self.portentry.setFixedWidth(8 * fontm.width('9'))
self.portentry.setValidator(QIntValidator(0, 65536, self.portentry))
self.portentry.textChanged.connect(self.refreshUrl)
- tbar.addWidget(self.portentry)
- tbar.addWidget(qtlib.Spacer(2, 2))
- self.HostAndPortWidgets.append(self.portentry)
+ self.hostAndPortActions.append(tbar.addWidget(self.portentry))
+ self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))
w = QLabel('/')
- tbar.addWidget(w)
- tbar.addWidget(qtlib.Spacer(2, 2))
- self.HostAndPortWidgets.append(w)
+ self.hostAndPortActions.append(tbar.addWidget(w))
+ self.hostAndPortActions.append(tbar.addWidget(qtlib.Spacer(2, 2)))
self.pathentry = QLineEdit()
self.pathentry.setAcceptDrops(False)
self.pathentry.setToolTip(_('Path'))
@@ -465,8 +463,8 @@ return
self.urllabel.setText(hglib.tounicode(self.currentUrl(True)))
schemeIndex = self.schemecombo.currentIndex()
- for w in self.HostAndPortWidgets:
- w.setDisabled(schemeIndex == 0)
+ for w in self.hostAndPortActions:
+ w.setVisible(schemeIndex != 0)
self.securebutton.setVisible(schemeIndex >= 3)
opts = []
|
Loading...