Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 9bf5c26b7555…

Parents bf1160f429d7…

Parents 255b4122865a…

by Steve Borho

Changes to 6 files · Browse files at 9bf5c26b7555 Showing diff from parent bf1160f429d7 255b4122865a Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​branchop.py Stacked
 
89
90
91
 
92
93
94
 
89
90
91
92
93
94
95
@@ -89,6 +89,7 @@
  self.bb = bb   self.branchCombo = branchCombo   QShortcut(QKeySequence('Ctrl+Return'), self, self.accept) + QShortcut(QKeySequence('Ctrl+Enter'), self, self.accept)   QShortcut(QKeySequence('Escape'), self, self.reject)     def accept(self):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
279
280
281
282
 
 
 
 
283
284
285
 
279
280
281
 
282
283
284
285
286
287
288
@@ -279,7 +279,10 @@
  # add our splitter where the docf used to be   self.stwidget.split.addWidget(self.split)   self.msgte = msgte - QShortcut(QKeySequence('Ctrl+Return'), self, self.commit) + QShortcut(QKeySequence('Ctrl+Return'), self, self.commit).setContext( + Qt.WidgetWithChildrenShortcut) + QShortcut(QKeySequence('Ctrl+Enter'), self, self.commit).setContext( + Qt.WidgetWithChildrenShortcut)     @pyqtSlot(QString, QString)   def fileDisplayed(self, wfile, contents):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgemail.py Stacked
 
48
49
50
 
51
52
53
 
48
49
50
51
52
53
54
@@ -48,6 +48,7 @@
  self._updateforms()   self._readsettings()   QShortcut(QKeySequence('CTRL+Return'), self, self.accept) + QShortcut(QKeySequence('Ctrl+Enter'), self, self.accept)     def closeEvent(self, event):   self._writesettings()
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​postreview.py Stacked
 
102
103
104
 
105
106
107
 
102
103
104
105
106
107
108
@@ -102,6 +102,7 @@
  self.review_thread.finished.connect(self.errorPrompt)   self.review_thread.start()   QShortcut(QKeySequence('Ctrl+Return'), self, self.accept) + QShortcut(QKeySequence('Ctrl+Enter'), self, self.accept)     @pyqtSlot()   def passwordPrompt(self):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​quickop.py Stacked
 
112
113
114
 
115
116
117
 
112
113
114
115
116
117
118
@@ -112,6 +112,7 @@
  self.stwidget = stwidget   self.stwidget.refreshWctx()   QShortcut(QKeySequence('Ctrl+Return'), self, self.accept) + QShortcut(QKeySequence('Ctrl+Enter'), self, self.accept)   QShortcut(QKeySequence.Refresh, self, self.stwidget.refreshWctx)   QShortcut(QKeySequence('Escape'), self, self.reject)  
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
 
46
47
48
 
 
 
 
49
50
51
 
130
131
132
133
134
135
136
137
138
139
140
141
142
 
145
146
147
 
148
149
150
 
161
162
163
164
165
 
 
 
166
167
168
 
46
47
48
49
50
51
52
53
54
55
 
134
135
136
 
 
 
 
 
 
 
137
138
139
 
142
143
144
145
146
147
148
 
159
160
161
 
 
162
163
164
165
166
167
@@ -46,6 +46,10 @@
  self.setDropIndicatorShown(True)   self.setEditTriggers(QAbstractItemView.DoubleClicked)   self.setSelectionBehavior(QAbstractItemView.SelectRows) + QShortcut('Return', self, self.showFirstTabOrOpen).setContext( + Qt.WidgetShortcut) + QShortcut('Enter', self, self.showFirstTabOrOpen).setContext( + Qt.WidgetShortcut)     def contextMenuEvent(self, event):   if not self.selitem: @@ -130,13 +134,6 @@
  return   super(RepoTreeView, self).mouseMoveEvent(event)   - def keyPressEvent(self, event): - if event.key() in (Qt.Key_Enter, Qt.Key_Return): - if self.selitem and self.selitem.internalPointer().isRepo(): - self.showFirstTabOrOpen() - else: - super(RepoTreeView, self).keyPressEvent(event) -   def leaveEvent(self, event):   if self.msg != '':   self.showMessage.emit('') @@ -145,6 +142,7 @@
  if self.selitem and self.selitem.internalPointer().isRepo():   self.showFirstTabOrOpen()   else: + # a double-click on non-repo rows opens an editor   super(RepoTreeView, self).mouseDoubleClickEvent(event)     def selectionChanged(self, selected, deselected): @@ -161,8 +159,9 @@
    def showFirstTabOrOpen(self):   'Enter or double click events, show existing or open a new repowidget' - root = self.selitem.internalPointer().rootpath() - self.openRepo.emit(hglib.tounicode(root), True) + if self.selitem and self.selitem.internalPointer().isRepo(): + root = self.selitem.internalPointer().rootpath() + self.openRepo.emit(hglib.tounicode(root), True)      class RepoRegistryView(QDockWidget):