Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable postreview: use a QShortcut instead of reimplementing keyPressEvent

Also pruned some trailing white-space

Changeset 0cba1c9acf59…

Parent 2f77c1fd5325…

by Steve Borho

Changes to one file · Browse files at 0cba1c9acf59 Showing diff from parent 2f77c1fd5325 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgqt/​postreview.py Stacked
 
43
44
45
46
 
47
48
49
 
94
95
96
97
 
98
99
100
101
102
103
104
105
106
107
108
 
109
110
111
 
136
137
138
139
 
140
141
142
 
164
165
166
167
168
 
 
169
170
171
172
173
174
 
175
176
177
 
236
237
238
239
 
240
241
242
 
308
309
310
311
 
312
313
314
 
 
315
316
317
 
43
44
45
 
46
47
48
49
 
94
95
96
 
97
98
 
 
 
 
 
 
 
 
 
 
99
100
101
102
 
127
128
129
 
130
131
132
133
 
155
156
157
 
 
158
159
160
161
162
163
164
 
165
166
167
168
 
227
228
229
 
230
231
232
233
 
299
300
301
 
302
303
304
305
306
307
308
309
310
@@ -43,7 +43,7 @@
  #later   if not pwd:   pwd = "None" - +   self.reviewboard = rb.make_rbclient(self.dialog.server,   self.dialog.user,   pwd) @@ -94,18 +94,9 @@
  self.readSettings()     self.review_thread = LoadReviewDataThread(self) - self.review_thread.finished.connect(self.errorPrompt) + self.review_thread.finished.connect(self.errorPrompt)   self.review_thread.start() - - def keyPressEvent(self, event): - # don't post review by just hitting enter - if event.key() in (Qt.Key_Return, Qt.Key_Enter): - if event.modifiers() == Qt.ControlModifier and self.isValid(): - self.accept() # Ctrl+Enter - - return - - super(PostReviewDialog, self).keyPressEvent(event) + QShortcut(QKeySequence('Ctrl+Return'), self, self.accept)     @pyqtSlot()   def passwordPrompt(self): @@ -136,7 +127,7 @@
  if self.cmd and self.cmd.core.running():   self.cmd.commandFinished.disconnect(self.onCompletion)   self.cmd.cancel() - +   # Dispose of the review data thread   self.review_thread.terminate()   self.review_thread.wait() @@ -164,14 +155,14 @@
  self.repo_id = int(self.repo.ui.config('reviewboard', 'repoid'))   except Exception:   self.repo_id = None - - if not self.repo_id: + + if not self.repo_id:   self.repo_id = s.value('reviewboard/repo_id').toInt()[0]     self.server = self.repo.ui.config('reviewboard', 'server')   self.user = self.repo.ui.config('reviewboard', 'user')   self.password = self.repo.ui.config('reviewboard', 'password') - self.browser = self.repo.ui.config('reviewboard', 'browser') + self.browser = self.repo.ui.config('reviewboard', 'browser')     def writeSettings(self):   s = QSettings() @@ -236,7 +227,7 @@
  return str(comboText[1])     def postReviewOpts(self, **opts): - """Generate opts for reviewboard by form values""" + """Generate opts for reviewboard by form values"""   opts['outgoingchanges'] = self.qui.outgoing_changes_check.isChecked()   opts['branch'] = self.qui.branch_check.isChecked()   opts['publish'] = self.qui.publish_immediately_check.isChecked() @@ -308,10 +299,12 @@
  self.initChangesets(self.allRevs, self.allRevs)   self.qui.changesets_view.setEnabled(True)   - def close(self): + def close(self):   super(PostReviewDialog, self).close()     def accept(self): + if not self.isValid(): + return   if not self.password and not self.passwordPrompt():   return