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

filedialogs: use module import of qtlib

Changeset dc70f178796d…

Parent faafad2afaa2…

by Steve Borho

Changes to one file · Browse files at dc70f178796d Showing diff from parent faafad2afaa2 Diff from another changeset...

Change 1 of 5 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
23
24
25
26
27
28
29
30
31
32
33
 
34
35
36
 
44
45
46
47
 
48
49
50
 
182
183
184
185
 
186
187
188
 
189
190
 
191
192
193
 
215
216
217
218
 
219
220
221
 
222
223
224
225
 
226
227
228
 
229
230
231
 
430
431
432
433
 
434
435
 
436
437
438
439
 
440
441
442
 
23
24
25
 
26
27
28
29
30
31
 
32
33
34
35
 
43
44
45
 
46
47
48
49
 
181
182
183
 
184
185
186
 
187
188
 
189
190
191
192
 
214
215
216
 
217
218
219
 
220
221
222
223
 
224
225
226
 
227
228
229
230
 
429
430
431
 
432
433
 
434
435
436
437
 
438
439
440
441
@@ -23,14 +23,13 @@
   from tortoisehg.util import hglib  from tortoisehg.hgqt.i18n import _ -from tortoisehg.hgqt.qtlib import geticon, getfont, getmenuicon  from tortoisehg.hgqt.filerevmodel import FileRevModel  from tortoisehg.hgqt.blockmatcher import BlockList, BlockMatch  from tortoisehg.hgqt.lexers import get_lexer  from tortoisehg.hgqt.fileview import HgFileView  from tortoisehg.hgqt.repoview import HgRepoView  from tortoisehg.hgqt.revpanel import RevPanelWidget -from tortoisehg.hgqt import visdiff +from tortoisehg.hgqt import qtlib, visdiff    from PyQt4.QtCore import *  from PyQt4.QtGui import * @@ -44,7 +43,7 @@
  QMainWindow.__init__(self)   self.repo = repo   - self._font = getfont('fontdiff').font() + self._font = qtlib.getfont('fontdiff').font()   self.setupUi(self)   self.setRepoViewer(repoviewer)   self._show_rev = None @@ -182,12 +181,12 @@
  def createActions(self):   self.actionClose.triggered.connect(self.close)   self.actionReload.triggered.connect(self.reload) - self.actionReload.setIcon(geticon('view-refresh')) + self.actionReload.setIcon(qtlib.geticon('view-refresh'))     self.actionBack = QAction(_('Back'), self, enabled=False, - icon=geticon('go-previous')) + icon=qtlib.geticon('go-previous'))   self.actionForward = QAction(_('Forward'), self, enabled=False, - icon=geticon('go-next')) + icon=qtlib.geticon('go-next'))   self.repoview.revisionSelected.connect(self._updateHistoryActions)   self.actionBack.triggered.connect(self.repoview.back)   self.actionForward.triggered.connect(self.repoview.forward) @@ -215,17 +214,17 @@
  if self.menu is None:   self.menu = menu = QMenu(self)   a = menu.addAction(_('Visual diff...')) - a.setIcon(getmenuicon('visualdiff')) + a.setIcon(qtlib.getmenuicon('visualdiff'))   a.triggered.connect(self.onVisualDiff)   a = menu.addAction(_('Diff to local...')) - a.setIcon(getmenuicon('ldiff')) + a.setIcon(qtlib.getmenuicon('ldiff'))   a.triggered.connect(self.onVisualDiffToLocal)   menu.addSeparator()   a = menu.addAction(_('Visual diff file...')) - a.setIcon(getmenuicon('visualdiff')) + a.setIcon(qtlib.getmenuicon('visualdiff'))   a.triggered.connect(self.onVisualDiffFile)   a = menu.addAction(_('Diff file to local...')) - a.setIcon(getmenuicon('ldiff')) + a.setIcon(qtlib.getmenuicon('ldiff'))   a.triggered.connect(self.onVisualDiffFileToLocal)   self.selection = selection   self.menu.exec_(point) @@ -430,13 +429,13 @@
  def createActions(self):   self.actionClose.triggered.connect(self.close)   self.actionReload.triggered.connect(self.reload) - self.actionReload.setIcon(geticon('view-refresh')) + self.actionReload.setIcon(qtlib.geticon('view-refresh'))   - self.actionNextDiff = QAction(geticon('go-down'), 'Next diff', self) + self.actionNextDiff = QAction(qtlib.geticon('go-down'), 'Next diff', self)   self.actionNextDiff.setShortcut('Alt+Down')   self.actionNextDiff.triggered.connect(self.nextDiff)   - self.actionPrevDiff = QAction(geticon('go-up'), 'Previous diff', self) + self.actionPrevDiff = QAction(qtlib.geticon('go-up'), 'Previous diff', self)   self.actionPrevDiff.setShortcut('Alt+Up')   self.actionPrevDiff.triggered.connect(self.prevDiff)