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

qtlib: fix reference for WarningMsgBox() from fileEditor()

Changeset 56f70d1a40e4

Parent f2d1560083a7

by Yuya Nishihara

Changes to one file · Browse files at 56f70d1a40e4 Showing diff from parent f2d1560083a7 Diff from another changeset...

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
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
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
 
 
487
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
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
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
 
 
485
486
487
 # qtlib.py - Qt utility code  #  # Copyright 2010 Steve Borho <steve@borho.org>  #  # This software may be used and distributed according to the terms of the  # GNU General Public License version 2 or any later version.    import os  import atexit  import shutil  import tempfile    from PyQt4.QtCore import *  from PyQt4.QtGui import *  from PyQt4.Qsci import *  from mercurial import extensions, util    from tortoisehg.util import hglib, paths  from tortoisehg.hgqt.i18n import _  from hgext.color import _styles    tmproot = None  def gettempdir():   global tmproot   def cleanup():   try: shutil.rmtree(tmproot)   except: pass   if not tmproot:   tmproot = tempfile.mkdtemp(prefix='thg.')   atexit.register(cleanup)   return tmproot    # _styles maps from ui labels to effects  # _effects maps an effect to font style properties. We define a limited  # set of _effects, since we convert color effect names to font style  # effect programatically.    _effects = {   'bold': 'font-weight: bold',   'italic': 'font-style: italic',   'underline': 'text-decoration: underline',  }    thgstylesheet = '* { white-space: pre; font-family: monospace; font-size: 9pt; }'    """app-global stylesheet"""  appstylesheet = '''  /* expander-like check box: checkbox.setProperty('expander', True) */  QCheckBox[expander="true"]::indicator:unchecked { image: url(:/icons/plus.png); }  QCheckBox[expander="true"]::indicator:checked { image: url(:/icons/minus.png); }  '''    def configstyles(ui):   # extensions may provide more labels and default effects   for name, ext in extensions.extensions():   _styles.update(getattr(ext, 'colortable', {}))     # tortoisehg defines a few labels and default effects   _styles.update({'ui.error':'red bold', 'control':'black bold'})     # allow the user to override   for status, cfgeffects in ui.configitems('color'):   if '.' not in status:   continue   cfgeffects = ui.configlist('color', status)   _styles[status] = ' '.join(cfgeffects)     for status, cfgeffects in ui.configitems('thg-color'):   if '.' not in status:   continue   cfgeffects = ui.configlist('thg-color', status)   _styles[status] = ' '.join(cfgeffects)    # See http://doc.trolltech.com/4.2/richtext-html-subset.html  # and http://www.w3.org/TR/SVG/types.html#ColorKeywords    def geteffect(labels):   'map labels like "log.date" to Qt font styles'   effects = []   # Multiple labels may be requested   for l in labels.split():   if not l:   continue   # Each label may request multiple effects   es = _styles.get(l, '')   for e in es.split():   if e in _effects:   effects.append(_effects[e])   elif e in QColor.colorNames():   # Accept any valid QColor   effects.append('color: ' + e)   elif e.endswith('_background'):   e = e[:-11]   if e in QColor.colorNames():   effects.append('bgcolor: ' + e)   return ';'.join(effects)      # Copy of patch.difflabel from Mercurial, hacked to always return  # a label for unmatched text, so it gets escaped by our htmlui  def difflabel(func, *args, **kw):   '''yields 2-tuples of (output, label) based on the output of func()'''   prefixes = [('diff', 'diff.diffline'),   ('copy', 'diff.extended'),   ('rename', 'diff.extended'),   ('old', 'diff.extended'),   ('new', 'diff.extended'),   ('deleted', 'diff.extended'),   ('---', 'diff.file_a'),   ('+++', 'diff.file_b'),   ('@@', 'diff.hunk'),   ('-', 'diff.deleted'),   ('+', 'diff.inserted')]     for chunk in func(*args, **kw):   lines = chunk.split('\n')   for i, line in enumerate(lines):   if i != 0:   yield ('\n', '')   stripline = line   if line and line[0] in '+-':   # highlight trailing whitespace, but only in changed lines   stripline = line.rstrip()   for prefix, label in prefixes:   if stripline.startswith(prefix):   yield (stripline, label)   break   else:   yield (line, 'ui.status')   if line != stripline:   yield (line[len(stripline):], 'diff.trailingwhitespace')      NAME_MAP = {   'fg': 'color', 'bg': 'background-color', 'family': 'font-family',   'size': 'font-size', 'weight': 'font-weight', 'space': 'white-space',   'style': 'font-style', 'decoration': 'text-decoration',  }    def markup(msg, **styles):   style = {'white-space': 'pre'}   for name, value in styles.items():   if not value:   continue   if NAME_MAP.has_key(name):   name = NAME_MAP[name]   style[name] = value   style = ';'.join(['%s: %s' % t for t in style.items()])   msg = hglib.tounicode(msg)   msg = Qt.escape(msg)   msg = msg.replace('\n', '<br />')   return '<span style="%s">%s</span>' % (style, msg)    _iconcache = {}    def geticon(name):   """   Return a QIcon for the specified name. (the given 'name' parameter   must *not* provide the extension).     This searches for the icon from Qt resource or icons directory,   named as 'name.(svg|png|ico)'.   """   # TODO: icons should be placed at single location before release   def findicon(name):   for pfx in (':/icons', paths.get_icon_path()):   for ext in ('svg', 'png', 'ico'):   path = '%s/%s.%s' % (pfx, name, ext)   if QFile.exists(path):   return QIcon(path)     return QIcon(':/icons/fallback.svg')     try:   return _iconcache[name]   except KeyError:   _iconcache[name] = findicon(name)   return _iconcache[name]    _pixmapcache = {}    def getpixmap(name, width=16, height=16):   key = '%s_%sx%s' % (name, width, height)   try:   return _pixmapcache[key]   except KeyError:   pixmap = geticon(name).pixmap(width, height)   _pixmapcache[key] = pixmap   return pixmap    def CommonMsgBox(icon, title, main, text='', buttons=QMessageBox.Close,   labels=[], parent=None):   msg = QMessageBox(parent)   msg.setIcon(icon)   msg.setWindowTitle(title)   msg.setStandardButtons(buttons)   for button_id, label in labels:   msg.setButtonText(button_id, label)   msg.setText('<b>%s</b>' % main)   info = ''   for line in text.split('\n'):   info += '<nobr>%s</nobr><br />' % line   msg.setInformativeText(info)   return msg.exec_()    def InfoMsgBox(*args, **kargs):   return CommonMsgBox(QMessageBox.Information, *args, **kargs)    def WarningMsgBox(*args, **kargs):   return CommonMsgBox(QMessageBox.Warning, *args, **kargs)    def ErrorMsgBox(*args, **kargs):   return CommonMsgBox(QMessageBox.Critical, *args, **kargs)    def QuestionMsgBox(*args, **kargs):   btn = QMessageBox.Yes | QMessageBox.No   res = CommonMsgBox(QMessageBox.Question, buttons=btn, *args, **kargs)   return res == QMessageBox.Yes    class CustomPrompt(QMessageBox):   def __init__(self, title, message, parent, choices, default=None,   esc=None, files=None):   QMessageBox.__init__(self, parent)     self.setWindowTitle(hglib.toutf(title))   self.setText(hglib.toutf(message))   if files:   msg = ''   for i, file in enumerate(files):   msg += ' %s\n' % file   if i == 9:   msg += ' ...\n'   break   self.setDetailedText(hglib.toutf(msg))   self.hotkeys = {}   for i, s in enumerate(choices):   btn = self.addButton(s, QMessageBox.AcceptRole)   try:   char = s[s.index('&')+1].lower()   self.hotkeys[char] = btn   if default == i:   self.setDefaultButton(btn)   if esc == i:   self.setEscapeButton(btn)   except ValueError:   pass     def run(self):   return self.exec_()     def keyPressEvent(self, event):   for k, btn in self.hotkeys.iteritems():   if event.text() == k:   btn.emit(SIGNAL('clicked()'))   super(CustomPrompt, self).keyPressEvent(event)    def setup_font_substitutions():   QFont.insertSubstitutions('monospace', ['monaco', 'courier new'])    class PMButton(QPushButton):   """Toggle button with plus/minus icon images"""     def __init__(self, expanded=True, parent=None):   QPushButton.__init__(self, parent)     size = QSize(11, 11)   self.setIconSize(size)   self.setMaximumSize(size)   self.setFlat(True)   self.setAutoDefault(False)     self.plus = geticon('plus')   self.minus = geticon('minus')   icon = expanded and self.minus or self.plus   self.setIcon(icon)     def clicked():   icon = self.is_expanded() and self.plus or self.minus   self.setIcon(icon)   self.clicked.connect(clicked)     def set_expanded(self, state=True):   icon = state and self.minus or self.plus   self.setIcon(icon)     def set_collapsed(self, state=True):   icon = state and self.plus or self.minus   self.setIcon(icon)     def is_expanded(self):   return self.icon().serialNumber() == self.minus.serialNumber()     def is_collapsed(self):   return not self.is_expanded()    class ClickableLabel(QLabel):     clicked = pyqtSignal()     def __init__(self, label, parent=None):   QLabel.__init__(self, parent)     self.setText(label)     def mouseReleaseEvent(self, event):   self.clicked.emit()    class ExpanderLabel(QWidget):     expanded = pyqtSignal(bool)     def __init__(self, label, expanded=True, stretch=True, parent=None):   QWidget.__init__(self, parent)     box = QHBoxLayout()   box.setSpacing(4)   box.setContentsMargins(*(0,)*4)   self.button = PMButton(expanded, self)   self.button.clicked.connect(self.pm_clicked)   box.addWidget(self.button)   self.label = ClickableLabel(label, self)   self.label.clicked.connect(lambda: self.button.click())   box.addWidget(self.label)   if not stretch:   box.addStretch(0)     self.setLayout(box)     def pm_clicked(self):   self.expanded.emit(self.button.is_expanded())    class StatusLabel(QWidget):     def __init__(self, parent=None):   QWidget.__init__(self, parent)     box = QHBoxLayout()   box.setContentsMargins(*(0,)*4)   self.status_icon = QLabel()   self.status_icon.setMaximumSize(16, 16)   self.status_icon.setAlignment(Qt.AlignCenter)   box.addWidget(self.status_icon)   self.status_text = QLabel()   self.status_text.setAlignment(Qt.AlignVCenter | Qt.AlignLeft)   box.addWidget(self.status_text)   box.addStretch(0)     self.setLayout(box)     def set_status(self, text, icon=None):   self.set_text(text)   self.set_icon(icon)     def clear_status(self):   self.clear_text()   self.clear_icon()     def set_text(self, text=''):   if text is None:   text = ''   self.status_text.setText(text)     def clear_text(self):   self.set_text()     def set_icon(self, icon=None):   if icon is None:   self.clear_icon()   else:   if isinstance(icon, bool):   pixmap = icon and getpixmap('success') or getpixmap('error')   elif isinstance(icon, basestring):   pixmap = getpixmap(icon)   elif isinstance(icon, QIcon):   pixmap = icon.pixmap(16, 16)   elif isinstance(icon, QPixmap):   pixmap = icon   else:   raise TypeError, '%s: bool, str, QIcon or QPixmap' % type(icon)   self.status_icon.setShown(True)   self.status_icon.setPixmap(pixmap)     def clear_icon(self):   self.status_icon.setHidden(True)    class LabeledSeparator(QWidget):     def __init__(self, label=None, parent=None):   QWidget.__init__(self, parent)     box = QHBoxLayout()   box.setContentsMargins(*(0,)*4)     if label:   label = QLabel(label)   box.addWidget(label)     sep = QFrame()   sep.setFrameShadow(QFrame.Sunken)   sep.setFrameShape(QFrame.HLine)   box.addWidget(sep, 1, Qt.AlignVCenter)     self.setLayout(box)    class WidgetGroups(object):   """ Support for bulk-updating properties of Qt widgets """     def __init__(self):   object.__init__(self)     self.clear(all=True)     ### Public Methods ###     def add(self, widget, group='default'):   if group not in self.groups:   self.groups[group] = []   widgets = self.groups[group]   if widget not in widgets:   widgets.append(widget)     def remove(self, widget, group='default'):   if group not in self.groups:   return   widgets = self.groups[group]   if widget in widgets:   widgets.remove(widget)     def clear(self, group='default', all=True):   if all:   self.groups = {}   else:   del self.groups[group]     def set_prop(self, prop, value, group='default', cond=None):   if group not in self.groups:   return   widgets = self.groups[group]   if callable(cond):   widgets = [w for w in widgets if cond(w)]   for widget in widgets:   getattr(widget, prop)(value)     def set_visible(self, *args, **kargs):   self.set_prop('setVisible', *args, **kargs)     def set_enable(self, *args, **kargs):   self.set_prop('setEnabled', *args, **kargs)    def fileEditor(filename):   'Open a simple modal file editing dialog'   dialog = QDialog()   dialog.setWindowFlags(dialog.windowFlags() & ~Qt.WindowContextHelpButtonHint)   vbox = QVBoxLayout()   dialog.setLayout(vbox)   editor = QsciScintilla()   editor.setBraceMatching(QsciScintilla.SloppyBraceMatch)   vbox.addWidget(editor)   BB = QDialogButtonBox   bb = QDialogButtonBox(BB.Save|BB.Cancel)   dialog.connect(bb, SIGNAL('accepted()'),   dialog, SLOT('accept()'))   dialog.connect(bb, SIGNAL('rejected()'),   dialog, SLOT('reject()'))   vbox.addWidget(bb)   lexer = QsciLexerProperties()   editor.setLexer(lexer)   s = QSettings()   ret = QDialog.Rejected   try:   contents = open(filename, 'rb').read()   dialog.setWindowTitle(filename)   geomname = 'editor-geom'   editor.setText(contents)   editor.setUtf8(True)   editor.setModified(False)   dialog.restoreGeometry(s.value(geomname).toByteArray())   ret = dialog.exec_()   if ret == QDialog.Accepted:   f = util.atomictempfile(filename, 'wb', createmode=None)   f.write(hglib.fromunicode(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) + WarningMsgBox(_('Unable to read/write config file'), + hglib.tounicode(e), parent=dialog)   return ret