History - Kiln » TortoiseHg » TortoiseHg

Kiln »

TortoiseHg »

TortoiseHg

Clone URL:

Pushed to one repository ·

View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable icons: rename some common icons according to xdg icon naming spec

Note that it renames find.svg to view-filter.svg according to KDE oxygen theme,
because there's already edit-find.svg and there seems no standard name
for filter icon.

Changeset 0308f916217a …

Parent 495f80e1243c …

by Yuya Nishihara Feb 13 11 at 4:59 PM

Changes to 22 files · Browse files at 0308f916217a Showing diff from parent 495f80e1243c Diff from another changeset...

icons/22x22/actions/window-close.png

Side by side

renamed from tortoisehg/hgqt/icons/close.png

Show Entire File icons/scalable/actions/application-exit.svg Stacked renamed from tortoisehg/hgqt/icons/quit.svg
		(No changes)

Show Entire File icons/scalable/actions/document-new.svg Stacked renamed from tortoisehg/hgqt/icons/document-new.svg
		(No changes)

Show Entire File icons/scalable/actions/edit-cut.svg Stacked renamed from tortoisehg/hgqt/icons/edit-cut.svg
		(No changes)

Show Entire File icons/scalable/actions/edit-find.svg Stacked renamed from tortoisehg/hgqt/icons/edit-find.svg
		(No changes)

Show Entire File icons/scalable/actions/go-down.svg Stacked renamed from tortoisehg/hgqt/icons/down.svg
		(No changes)

Show Entire File icons/scalable/actions/go-jump.svg Stacked renamed from tortoisehg/hgqt/icons/go-jump.svg
		(No changes)

Show Entire File icons/scalable/actions/go-next.svg Stacked renamed from tortoisehg/hgqt/icons/forward.svg
		(No changes)

Show Entire File icons/scalable/actions/go-previous.svg Stacked renamed from tortoisehg/hgqt/icons/back.svg
		(No changes)

Show Entire File icons/scalable/actions/go-up.svg Stacked renamed from tortoisehg/hgqt/icons/up.svg
		(No changes)

Show Entire File icons/scalable/actions/mail-forward.svg Stacked renamed from tortoisehg/hgqt/icons/mail-forward.svg
		(No changes)

Show Entire File icons/scalable/actions/process-stop.svg Stacked renamed from tortoisehg/hgqt/icons/process-stop.svg
		(No changes)

Show Entire File icons/scalable/actions/tasktab-refresh.svg Stacked renamed from tortoisehg/hgqt/icons/reloadtt.svg
		(No changes)

Show Entire File icons/scalable/actions/view-filter.svg Stacked renamed from tortoisehg/hgqt/icons/find.svg
		(No changes)

Show Entire File icons/scalable/actions/view-refresh.svg Stacked renamed from tortoisehg/hgqt/icons/reload.svg
		(No changes)

Change 1 of 2 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/filedialogs.py Stacked
186 187 188 189 190 191 192 193 194 195 196 197 363 364 365 366 367 368 369 370 371 372 373 374 375	186 187 188 189 190 191 192 193 194 195 196 197 363 364 365 366 367 368 369 370 371 372 373 374 375	@@ -186,12 +186,12 @@ `def createActions(self):` `self.actionClose.triggered.connect(self.close)` `self.actionReload.triggered.connect(self.reload)`-`self.actionReload.setIcon(geticon('reload'))`+`self.actionReload.setIcon(geticon('view-refresh'))` `self.actionBack = QAction(_('Back'), self, enabled=False,`-`icon=geticon('back'))`+`icon=geticon('go-previous'))` `self.actionForward = QAction(_('Forward'), self, enabled=False,`-`icon=geticon('forward'))`+`icon=geticon('go-next'))` `self.repoview.revisionSelected.connect(self._updateHistoryActions)` `self.actionBack.triggered.connect(self.repoview.back)` `self.actionForward.triggered.connect(self.repoview.forward)`@@ -363,13 +363,13 @@ `def createActions(self):` `self.actionClose.triggered.connect(self.close)` `self.actionReload.triggered.connect(self.reload)`-`self.actionReload.setIcon(geticon('reload'))`+`self.actionReload.setIcon(geticon('view-refresh'))` -`self.actionNextDiff = QAction(geticon('down'), 'Next diff', self)`+`self.actionNextDiff = QAction(geticon('go-down'), 'Next diff', self)` `self.actionNextDiff.setShortcut('Alt+Down')` `self.actionNextDiff.triggered.connect(self.nextDiff)` -`self.actionPrevDiff = QAction(geticon('up'), 'Previous diff', self)`+`self.actionPrevDiff = QAction(geticon('go-up'), 'Previous diff', self)` `self.actionPrevDiff.setShortcut('Alt+Up')` `self.actionPrevDiff.triggered.connect(self.prevDiff)`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/fileview.py Stacked
152 153 154 155 156 157 158 159 160 161 162	152 153 154 155 156 157 158 159 160 161 162	@@ -152,11 +152,11 @@ `self.modeToggleGroup.triggered.connect(self.setMode)` `# Next/Prev diff (in full file mode)`-`self.actionNextDiff = QAction(qtlib.geticon('down'),`+`self.actionNextDiff = QAction(qtlib.geticon('go-down'),` `'Next diff (alt+down)', self)` `self.actionNextDiff.setShortcut('Alt+Down')` `self.actionNextDiff.triggered.connect(self.nextDiff)`-`self.actionPrevDiff = QAction(qtlib.geticon('up'),`+`self.actionPrevDiff = QAction(qtlib.geticon('go-up'),` `'Previous diff (alt+up)', self)` `self.actionPrevDiff.setShortcut('Alt+Up')` `self.actionPrevDiff.triggered.connect(self.prevDiff)`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/qscilib.py Stacked
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 488 489 490 491 492 493 494 495 496 497 498 499	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 488 489 490 491 492 493 494 495 496 497 498 499	`# qscilib.py - Utility codes for QsciScintilla` `#` `# Copyright 2010 Steve Borho <steve@borho.org>` `# Copyright 2010 Yuya Nishihara <yuya@tcha.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 re` `from mercurial import util` `from tortoisehg.util import hglib` `from tortoisehg.hgqt import qtlib` `from tortoisehg.hgqt.i18n import _` `from PyQt4.QtCore import ` `from PyQt4.QtGui import ` `from PyQt4.Qsci import ` `class _SciImSupport(object):` `"""Patch for QsciScintilla to implement improved input method support` `See http://doc.trolltech.com/4.7/qinputmethodevent.html` `"""` `PREEDIT_INDIC_ID = QsciScintilla.INDIC_MAX` `"""indicator for highlighting preedit text"""` `def __init__(self, sci):` `self._sci = sci` `self._preeditpos = (0, 0) # (line, index) where preedit text starts` `self._preeditlen = 0` `self._preeditcursorpos = 0 # relative pos where preedit cursor exists` `self._undoactionbegun = False` `self._setuppreeditindic()` `def removepreedit(self):` `"""Remove the previous preedit text` `original pos: preedit cursor` `final pos: target cursor` `"""` `l, i = self._sci.getCursorPosition()` `i -= self._preeditcursorpos` `self._preeditcursorpos = 0` `try:` `self._sci.setSelection(` `self._preeditpos[0], self._preeditpos[1],` `self._preeditpos[0], self._preeditpos[1] + self._preeditlen)` `self._sci.removeSelectedText()` `finally:` `self._sci.setCursorPosition(l, i)` `def commitstr(self, start, repllen, commitstr):` `"""Remove the repl string followed by insertion of the commit string` `original pos: target cursor` `final pos: end of committed text (= start of preedit text)` `"""` `l, i = self._sci.getCursorPosition()` `i += start` `self._sci.setSelection(l, i, l, i + repllen)` `self._sci.removeSelectedText()` `self._sci.insert(commitstr)` `self._sci.setCursorPosition(l, i + len(commitstr))` `if commitstr:` `self.endundo()` `def insertpreedit(self, text):` `"""Insert preedit text` `original pos: start of preedit text` `final pos: start of preedit text (unchanged)` `"""` `if text and not self._preeditlen:` `self.beginundo()` `l, i = self._sci.getCursorPosition()` `self._sci.insert(text)` `self._updatepreeditpos(l, i, len(text))` `if not self._preeditlen:` `self.endundo()` `def movepreeditcursor(self, pos):` `"""Move the cursor to the relative pos inside preedit text"""` `self._preeditcursorpos = pos` `l, i = self._preeditpos` `self._sci.setCursorPosition(l, i + self._preeditcursorpos)` `def beginundo(self):` `if self._undoactionbegun:` `return` `self._sci.beginUndoAction()` `self._undoactionbegun = True` `def endundo(self):` `if not self._undoactionbegun:` `return` `self._sci.endUndoAction()` `self._undoactionbegun = False` `def _updatepreeditpos(self, l, i, len):` `"""Update the indicator and internal state for preedit text"""` `self._sci.SendScintilla(QsciScintilla.SCI_SETINDICATORCURRENT,` `self.PREEDIT_INDIC_ID)` `self._preeditpos = (l, i)` `self._preeditlen = len` `if len <= 0: # have problem on sci` `return` `p = self._sci.positionFromLineIndex(self._preeditpos)` `q = self._sci.positionFromLineIndex(self._preeditpos[0],` `self._preeditpos[1] + len)` `self._sci.SendScintilla(QsciScintilla.SCI_INDICATORFILLRANGE,` `p, q - p) # q - p != len` `def _setuppreeditindic(self):` `"""Configure the style of preedit text indicator"""` `self._sci.SendScintilla(QsciScintilla.SCI_INDICSETSTYLE,` `self.PREEDIT_INDIC_ID,` `QsciScintilla.INDIC_PLAIN)` `class Scintilla(QsciScintilla):` `_stdMenu = None` `def __init__(self, parent=None):` `super(Scintilla, self).__init__(parent)` `self.setUtf8(True)` `self.textChanged.connect(self._resetfindcond)` `self._resetfindcond()` `def inputMethodQuery(self, query):` `if query == Qt.ImMicroFocus:` `return self.cursorRect()` `return super(Scintilla, self).inputMethodQuery(query)` `def inputMethodEvent(self, event):` `if self.isReadOnly():` `return` `self.removeSelectedText()` `self._imsupport.removepreedit()` `self._imsupport.commitstr(event.replacementStart(),` `event.replacementLength(),` `event.commitString())` `self._imsupport.insertpreedit(event.preeditString())` `for a in event.attributes():` `if a.type == QInputMethodEvent.Cursor:` `self._imsupport.movepreeditcursor(a.start)` `# TODO TextFormat` `event.accept()` `@util.propertycache` `def _imsupport(self):` `return _SciImSupport(self)` `def cursorRect(self):` `"""Return a rectangle (in viewport coords) including the cursor"""` `l, i = self.getCursorPosition()` `p = self.positionFromLineIndex(l, i)` `x = self.SendScintilla(QsciScintilla.SCI_POINTXFROMPOSITION, 0, p)` `y = self.SendScintilla(QsciScintilla.SCI_POINTYFROMPOSITION, 0, p)` `w = self.SendScintilla(QsciScintilla.SCI_GETCARETWIDTH)` `return QRect(x, y, w, self.textHeight(l))` `def createStandardContextMenu(self):` `"""Create standard context menu"""` `if not self._stdMenu:` `self._stdMenu = QMenu(self)` `else:` `self._stdMenu.clear()` `if not self.isReadOnly():` `a = self._stdMenu.addAction(_('Undo'), self.undo, QKeySequence.Undo)` `a.setEnabled(self.isUndoAvailable())` `a = self._stdMenu.addAction(_('Redo'), self.redo, QKeySequence.Redo)` `a.setEnabled(self.isRedoAvailable())` `self._stdMenu.addSeparator()` `a = self._stdMenu.addAction(_('Cut'), self.cut, QKeySequence.Cut)` `a.setEnabled(self.hasSelectedText())` `a = self._stdMenu.addAction(_('Copy'), self.copy, QKeySequence.Copy)` `a.setEnabled(self.hasSelectedText())` `if not self.isReadOnly():` `self._stdMenu.addAction(_('Paste'), self.paste, QKeySequence.Paste)` `a = self._stdMenu.addAction(_('Delete'), self.removeSelectedText,` `QKeySequence.Delete)` `a.setEnabled(self.hasSelectedText())` `self._stdMenu.addSeparator()` `self._stdMenu.addAction(_('Select All'),` `self.selectAll, QKeySequence.SelectAll)` `self._stdMenu.addSeparator()` `qsci = QsciScintilla` `wrapmenu = QMenu(_('Wrap'), self)` `for name, mode in ((_('None'), qsci.WrapNone),` `(_('Word'), qsci.WrapWord),` `(_('Character'), qsci.WrapCharacter)):` `def mkaction(n, m):` `a = wrapmenu.addAction(n)` `a.setCheckable(True)` `a.setChecked(self.wrapMode() == m)` `a.triggered.connect(lambda: self.setWrapMode(m))` `mkaction(name, mode)` `wsmenu = QMenu(_('Whitespace'), self)` `for name, mode in ((_('Visible'), qsci.WsVisible),` `(_('Invisible'), qsci.WsInvisible),` `(_('AfterIndent'), qsci.WsVisibleAfterIndent)):` `def mkaction(n, m):` `a = wsmenu.addAction(n)` `a.setCheckable(True)` `a.setChecked(self.whitespaceVisibility() == m)` `a.triggered.connect(lambda: self.setWhitespaceVisibility(m))` `mkaction(name, mode)` `self._stdMenu.addMenu(wrapmenu)` `self._stdMenu.addMenu(wsmenu)` `return self._stdMenu` `def saveSettings(self, qs, prefix):` `qs.setValue(prefix+'/wrap', self.wrapMode())` `qs.setValue(prefix+'/whitespace', self.whitespaceVisibility())` `def loadSettings(self, qs, prefix):` `self.setWrapMode(qs.value(prefix+'/wrap').toInt()[0])` `self.setWhitespaceVisibility(qs.value(prefix+'/whitespace').toInt()[0])` `@pyqtSlot(unicode, bool, bool, bool)` `def find(self, exp, icase=True, wrap=False, forward=True):` `"""Find the next/prev occurence; returns True if found` `This method tries to imitate the behavior of QTextEdit.find(),` `unlike combo of QsciScintilla.findFirst() and findNext().` `"""` `cond = (exp, True, not icase, False, wrap, forward)` `if cond == self.__findcond:` `return self.findNext()` `else:` `self.__findcond = cond` `return self.findFirst(cond)` `@pyqtSlot()` `def _resetfindcond(self):` `self.__findcond = ()` `@pyqtSlot(unicode, bool)` `def highlightText(self, match, icase=False):` `"""Highlight text matching to the given regexp pattern [unicode]` `The previous highlight is cleared automatically.` `"""` `try:` `flags = 0` `if icase:` `flags \|= re.IGNORECASE` `pat = re.compile(unicode(match).encode('utf-8'), flags)` `except re.error:` `return # it could be partial pattern while user typing` `self.clearHighlightText()` `self.SendScintilla(self.SCI_SETINDICATORCURRENT,` `self._highlightIndicator)` `# NOTE: pat and target text are not* unicode because scintilla` `# requires positions in byte. For accuracy, it should do pattern` `# match in unicode, then calculating byte length of substring::` `#` `# text = unicode(self.text())` `# for m in pat.finditer(text):` `# p = len(text[:m.start()].encode('utf-8'))` `# self.SendScintilla(self.SCI_INDICATORFILLRANGE,` `# p, len(m.group(0).encode('utf-8')))` `#` `# but it doesn't to avoid possible performance issue.` `for m in pat.finditer(unicode(self.text()).encode('utf-8')):` `self.SendScintilla(self.SCI_INDICATORFILLRANGE,` `m.start(), m.end() - m.start())` `@pyqtSlot()` `def clearHighlightText(self):` `self.SendScintilla(self.SCI_SETINDICATORCURRENT,` `self._highlightIndicator)` `self.SendScintilla(self.SCI_INDICATORCLEARRANGE, 0, self.length())` `@util.propertycache` `def _highlightIndicator(self):` `"""Return indicator number for highlight after initializing it"""` `id = self._imsupport.PREEDIT_INDIC_ID - 1` `self.SendScintilla(self.SCI_INDICSETSTYLE, id, self.INDIC_ROUNDBOX)` `self.SendScintilla(self.SCI_INDICSETUNDER, id, True)` `self.SendScintilla(self.SCI_INDICSETFORE, id, 0x00ffff) # 0xbbggrr` `# document says alpha value is 0 to 255, but it looks 0 to 100` `self.SendScintilla(self.SCI_INDICSETALPHA, id, 100)` `return id` `class SearchToolBar(QToolBar):` `conditionChanged = pyqtSignal(unicode, bool, bool)` `"""Emitted (pattern, icase, wrap) when search condition changed"""` `searchRequested = pyqtSignal(unicode, bool, bool, bool)` `"""Emitted (pattern, icase, wrap, forward) when requested"""` `def __init__(self, parent=None, hidable=False, settings=None):` `super(SearchToolBar, self).__init__(_('Search'), parent,` `objectName='search',` `iconSize=QSize(16, 16))` `if hidable:`-`self._close_button = QToolButton(icon=qtlib.geticon('close'),`+`self._close_button = QToolButton(icon=qtlib.geticon('window-close'),` `shortcut=Qt.Key_Escape)` `self._close_button.clicked.connect(self.hide)` `self.addWidget(self._close_button)` `self._lbl = QLabel(_('Regexp:'),` `toolTip=_('Regular expression search pattern'))` `self.addWidget(self._lbl)` `self._le = QLineEdit()` `self._le.returnPressed.connect(self._emitSearchRequested)` `self._lbl.setBuddy(self._le)` `self.addWidget(self._le)` `self._chk = QCheckBox(_('Ignore case'))` `self.addWidget(self._chk)` `self._wrapchk = QCheckBox(_('Wrap search'))` `self.addWidget(self._wrapchk)` `self._bt = QPushButton(_('Search'), enabled=False)` `self._bt.clicked.connect(self._emitSearchRequested)` `self._le.textChanged.connect(lambda s: self._bt.setEnabled(bool(s)))` `self.addWidget(self._bt)` `self.setFocusProxy(self._le)` `def defaultsettings():` `s = QSettings()` `s.beginGroup('searchtoolbar')` `return s` `self._settings = settings or defaultsettings()` `self.searchRequested.connect(self._writesettings)` `self._readsettings()` `self._le.textChanged.connect(self._emitConditionChanged)` `self._chk.toggled.connect(self._emitConditionChanged)` `self._wrapchk.toggled.connect(self._emitConditionChanged)` `def keyPressEvent(self, event):` `if event.matches(QKeySequence.FindNext):` `self._emitSearchRequested(forward=True)` `return` `if event.matches(QKeySequence.FindPrevious):` `self._emitSearchRequested(forward=False)` `return` `if event.key() in (Qt.Key_Enter, Qt.Key_Return):` `return # handled by returnPressed` `super(SearchToolBar, self).keyPressEvent(event)` `def wheelEvent(self, event):` `if event.delta() > 0:` `self._emitSearchRequested(forward=False)` `return` `if event.delta() < 0:` `self._emitSearchRequested(forward=True)` `return` `super(SearchToolBar, self).wheelEvent(event)` `def setVisible(self, visible=True):` `super(SearchToolBar, self).setVisible(visible)` `if visible:` `self._le.setFocus()` `self._le.selectAll()` `def _readsettings(self):` `self.setCaseInsensitive(self._settings.value('icase', False).toBool())` `self.setWrapAround(self._settings.value('wrap', False).toBool())` `@pyqtSlot()` `def _writesettings(self):` `self._settings.setValue('icase', self.caseInsensitive())` `self._settings.setValue('wrap', self.wrapAround())` `@pyqtSlot()` `def _emitConditionChanged(self):` `self.conditionChanged.emit(self.pattern(), self.caseInsensitive(),` `self.wrapAround())` `@pyqtSlot()` `def _emitSearchRequested(self, forward=True):` `self.searchRequested.emit(self.pattern(), self.caseInsensitive(),` `self.wrapAround(), forward)` `def pattern(self):` `"""Returns the current search pattern [unicode]"""` `return self._le.text()` `def setPattern(self, text):` `"""Set the search pattern [unicode]"""` `self._le.setText(text)` `def caseInsensitive(self):` `"""True if case-insensitive search is requested"""` `return self._chk.isChecked()` `def setCaseInsensitive(self, icase):` `self._chk.setChecked(icase)` `def wrapAround(self):` `"""True if wrap search is requested"""` `return self._wrapchk.isChecked()` `def setWrapAround(self, wrap):` `self._wrapchk.setChecked(wrap)` `@pyqtSlot(unicode)` `def search(self, text):` `"""Request search with the given pattern"""` `self.setPattern(text)` `self._emitSearchRequested()` `class KeyPressInterceptor(QObject):` `"""Grab key press events important for dialogs` `Usage::` `sci = qscilib.Scintilla(self)` `sci.installEventFilter(KeyPressInterceptor(self))` `"""` `def __init__(self, parent=None, keys=None, keyseqs=None):` `super(KeyPressInterceptor, self).__init__(parent)` `self._keys = set((Qt.Key_Escape,))` `self._keyseqs = set((QKeySequence.Refresh,))` `if keys:` `self._keys.update(keys)` `if keyseqs:` `self._keyseqs.update(keyseqs)` `def eventFilter(self, watched, event):` `if event.type() != QEvent.KeyPress:` `return super(KeyPressInterceptor, self).eventFilter(` `watched, event)` `if self._isinterceptable(event):` `event.ignore()` `return True` `return False` `def _isinterceptable(self, event):` `if event.key() in self._keys:` `return True` `if util.any(event.matches(e) for e in self._keyseqs):` `return True` `return False` `def fileEditor(filename, *opts):` `'Open a simple modal file editing dialog'` `dialog = QDialog()` `dialog.setWindowFlags(dialog.windowFlags() & ~Qt.WindowContextHelpButtonHint)` `dialog.setWindowTitle(filename)` `dialog.setLayout(QVBoxLayout())` `editor = Scintilla()` `editor.setBraceMatching(QsciScintilla.SloppyBraceMatch)` `editor.installEventFilter(KeyPressInterceptor(dialog))` `editor.setMarginLineNumbers(1, True)` `editor.setMarginWidth(1, '000')` `editor.setLexer(QsciLexerProperties())` `if opts.get('foldable'):` `editor.setFolding(QsciScintilla.BoxedTreeFoldStyle)` `dialog.layout().addWidget(editor)` `searchbar = SearchToolBar(dialog, hidable=True)` `searchbar.searchRequested.connect(editor.find)` `searchbar.conditionChanged.connect(editor.highlightText)` `searchbar.hide()` `def showsearchbar():` `searchbar.show()` `searchbar.setFocus(Qt.OtherFocusReason)` `QShortcut(QKeySequence.Find, dialog, showsearchbar)` `dialog.layout().addWidget(searchbar)` `BB = QDialogButtonBox` `bb = QDialogButtonBox(BB.Save\|BB.Cancel)` `bb.accepted.connect(dialog.accept)` `bb.rejected.connect(dialog.reject)` `dialog.layout().addWidget(bb)` `s = QSettings()` `geomname = 'editor-geom'` `desktopgeom = qApp.desktop().availableGeometry()` `dialog.resize(desktopgeom.size() 0.5)` `dialog.restoreGeometry(s.value(geomname).toByteArray())` `ret = QDialog.Rejected` `try:` `f = QFile(filename)` `f.open(QIODevice.ReadOnly)` `editor.read(f)` `editor.setModified(False)` `ret = dialog.exec_()` `if ret == QDialog.Accepted:` `f = QFile(filename)` `f.open(QIODevice.WriteOnly)` `editor.write(f)` `s.setValue(geomname, dialog.saveGeometry())` `except EnvironmentError, e:` `qtlib.WarningMsgBox(_('Unable to read/write config file'),` `hglib.tounicode(str(e)), parent=dialog)` `return ret`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/repofilter.py Stacked
62 63 64 65 66 67 68	62 63 64 65 66 67 68	@@ -62,7 +62,7 @@ `self.addWidget(combo)` `self.searchBtn = QToolButton(self)`-`self.searchBtn.setIcon(qtlib.geticon('find'))`+`self.searchBtn.setIcon(qtlib.geticon('view-filter'))` `self.searchBtn.setToolTip(_('Trigger revision set query'))` `self.searchBtn.clicked.connect(self.returnPressed)` `self.addWidget(self.searchBtn)`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/shelve.py Stacked
121 122 123 124 125 126 127	121 122 123 124 125 126 127	@@ -121,7 +121,7 @@ `self.tbarhbox.addStretch(1)` `self.tbarhbox.addWidget(self.rbar)` `self.refreshAction = a = QAction(_('Refresh'), self)`-`a.setIcon(qtlib.geticon('reload'))`+`a.setIcon(qtlib.geticon('view-refresh'))` `a.setShortcut(QKeySequence.Refresh)` `a.triggered.connect(self.refreshCombos)` `self.rbar.addAction(self.refreshAction)`

Change 1 of 1 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/status.py Stacked
99 100 101 102 103 104 105	99 100 101 102 103 104 105	@@ -99,7 +99,7 @@ `hbox.setContentsMargins (5, 0, 0, 0)` `self.refreshBtn = tb = QToolButton()` `tb.setToolTip(_('Refresh file list'))`-`tb.setIcon(qtlib.geticon('reload'))`+`tb.setIcon(qtlib.geticon('view-refresh'))` `tb.clicked.connect(self.refreshWctx)` `le = QLineEdit()` `if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7`

Change 1 of 3 Show Changes Only Show Entire File Loading... tortoisehg/hgqt/workbench.py Stacked
179 180 181 182 183 184 185 186 187 188 189 190 191 236 237 238 239 240 241 242 243 244 245 246 247 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295	179 180 181 182 183 184 185 186 187 188 189 190 191 236 237 238 239 240 241 242 243 244 245 246 247 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295	@@ -179,13 +179,13 @@ `menu='file', icon='clone')` `newaction(_("&Open Repository..."), self.openRepository,` `shortcut='Open', menu='file', icon='plus')`-`newaction(_("&Close Repository"), self.closeRepository, icon='close',`+`newaction(_("&Close Repository"), self.closeRepository, icon='window-close',` `shortcut='Close', enabled='repoopen', menu='file')` `newseparator(menu='file')` `newaction(_('&Settings...'), self.editSettings, icon='settings_user',` `shortcut='Preferences', menu='file')` `newseparator(menu='file')`-`newaction(_("E&xit"), self.close, icon='quit',`+`newaction(_("E&xit"), self.close, icon='application-exit',` `shortcut='Quit', menu='file')` `a = self.reporegistry.toggleViewAction()`@@ -236,12 +236,12 @@ `addtaskview('branch', _('&Patch Branch'), 'pbranch')` `newseparator(menu='view')` -`newaction(_("&Refresh"), self._repofwd('reload'), icon='reload',`+`newaction(_("&Refresh"), self._repofwd('reload'), icon='view-refresh',` `shortcut='Refresh', enabled='repoopen',` `menu='view', toolbar='edit',` `tooltip=_('Refresh current repository'))` `newaction(_("Refresh &Task Tab"), self._repofwd('reloadTaskTab'),`-`icon='reloadtt', enabled='repoopen',`+`icon='tasktab-refresh', enabled='repoopen',` `shortcut=modifiedkeysequence('Refresh', modifier='Shift'),` `tooltip=_('Refresh only the current task tab'),` `menu='view')`@@ -280,16 +280,16 @@ `newseparator(toolbar='edit')` `self.actionBack = \`-`newaction(_("Back"), self._repofwd('back'), icon='back',`+`newaction(_("Back"), self._repofwd('back'), icon='go-previous',` `enabled=False, toolbar='edit')` `self.actionForward = \`-`newaction(_("Forward"), self._repofwd('forward'), icon='forward',`+`newaction(_("Forward"), self._repofwd('forward'), icon='go-next',` `enabled=False, toolbar='edit')` `newseparator(toolbar='edit', menu='View')` `self.filtertbaction = \` `newaction(_('Filter Toolbar'), self._repotogglefwd('toggleFilterBar'),`-`icon='find', shortcut='Ctrl+S', enabled='repoopen',`+`icon='view-filter', shortcut='Ctrl+S', enabled='repoopen',` `toolbar='edit', menu='View', checkable=True,` `tooltip=_('Filter graph with revision sets or branches'))`

Diff Options

stable icons: rename some common icons according to xdg icon naming spec

Note that it renames find.svg to view-filter.svg according to KDE oxygen theme,
because there's already edit-find.svg and there seems no standard name
for filter icon.

Attach a Trello Card

Your session has expired

Diff Options

Add a bookmark

stable icons: rename some common icons according to xdg icon naming spec Note that it renames find.svg to view-filter.svg according to KDE oxygen theme,because there's already edit-find.svg and there seems no standard namefor filter icon.

Diff to 0308f916217a

Attach a Trello Card

Add a tag

Your session has expired

stable icons: rename some common icons according to xdg icon naming spec

Note that it renames find.svg to view-filter.svg according to KDE oxygen theme,
because there's already edit-find.svg and there seems no standard name
for filter icon.