Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

settings, qtlib: move generic editor functionality to qtlib

If you don't like the properties lexer, make it an argument

Changeset 6afe5bf217f4…

Parent 581dccdce09f…

by Steve Borho

Changes to 2 files · Browse files at 6afe5bf217f4 Showing diff from parent 581dccdce09f Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
10
11
12
 
13
14
15
 
17
18
19
 
 
20
21
22
 
202
203
204
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
10
11
12
13
14
15
16
 
18
19
20
21
22
23
24
25
 
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
@@ -10,6 +10,7 @@
 import tempfile    from PyQt4 import QtCore, QtGui +from PyQt4 import Qsci  from mercurial import extensions    from tortoisehg.util import hglib @@ -17,6 +18,8 @@
 from tortoisehg.hgqt import icon as geticon  from hgext.color import _styles   +qsci = Qsci.QsciScintilla +  tmproot = None  def gettempdir():   global tmproot @@ -202,3 +205,40 @@
    def is_collapsed(self):   return not self.is_expanded() + +def fileEditor(filename): + 'Open a simple modal file editing dialog' + dialog = QtGui.QDialog() + vbox = QtGui.QVBoxLayout() + dialog.setLayout(vbox) + editor = qsci() + editor.setBraceMatching(qsci.SloppyBraceMatch) + vbox.addWidget(editor) + BB = QtGui.QDialogButtonBox + bb = QtGui.QDialogButtonBox(BB.Save|BB.Cancel) + dialog.connect(bb, QtCore.SIGNAL('accepted()'), + dialog, QtCore.SLOT('accept()')) + dialog.connect(bb, QtCore.SIGNAL('rejected()'), + dialog, QtCore.SLOT('reject()')) + vbox.addWidget(bb) + lexer = Qsci.QsciLexerProperties() + editor.setLexer(lexer) + s = QtCore.QSettings() + ret = QtGui.QDialog.Rejected + try: + contents = open(filename, 'rb').read() + dialog.setWindowTitle(filename) + geomname = 'editor-geom' + editor.setText(contents) + editor.setModified(False) + dialog.restoreGeometry(s.value(geomname).toByteArray()) + ret = dialog.exec_() + if ret == QtGui.QDialog.Accepted: + f = util.atomictempfile(filename, 'w', createmode=None) + f.write(editor.text()) + f.rename() + s.setValue(geomname, dialog.saveGeometry()) + except EnvironmentError, e: + qtlib.WarningMsgBox(_('Unable to read/write config file'), + hglib.tounicode(e), parent=dialog) + return ret
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​settings.py Stacked
 
16
17
18
19
20
21
22
23
24
25
26
27
 
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
 
 
569
570
571
 
16
17
18
 
19
20
21
 
 
22
23
24
 
532
533
534
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
535
536
537
538
539
@@ -16,12 +16,9 @@
 from tortoisehg.util import hglib, settings, paths  from tortoisehg.hgqt import qtlib   -from PyQt4 import Qsci  from PyQt4.QtCore import *  from PyQt4.QtGui import *   -qsci = Qsci.QsciScintilla -  # Technical Debt  # stacked widget or pages need to be scrollable  # add extensions page after THG 1.1 is released @@ -535,37 +532,8 @@
  self.applyChanges()   elif ret == 2:   return - - dialog = QDialog() - vbox = QVBoxLayout() - dialog.setLayout(vbox) - editor = qsci() - editor.setBraceMatching(qsci.SloppyBraceMatch) - vbox.addWidget(editor) - BB = QDialogButtonBox - bb = QDialogButtonBox(BB.Save|BB.Cancel) - self.connect(bb, SIGNAL("accepted()"), dialog, SLOT('accept()')) - self.connect(bb, SIGNAL("rejected()"), dialog, SLOT('reject()')) - vbox.addWidget(bb) - lexer = Qsci.QsciLexerProperties() - editor.setLexer(lexer) - s = self.settings - try: - contents = open(self.fn, 'rb').read() - dialog.setWindowTitle(self.fn) - geomname = 'settings/editor-geom' - editor.setText(contents) - editor.setModified(False) - dialog.restoreGeometry(s.value(geomname).toByteArray()) - if dialog.exec_() == QDialog.Accepted: - f = util.atomictempfile(self.fn, 'w', createmode=None) - f.write(editor.text()) - f.rename() - self.refresh() - s.setValue(geomname, dialog.saveGeometry()) - except EnvironmentError, e: - qtlib.WarningMsgBox(_('Unable to read/write config file'), - hglib.tounicode(e), parent=self) + if qtlib.fileEditor(self.fn) == QDialog.Accepted: + self.refresh()     def refresh(self, *args):   # determine target config file