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

repowidget: use wildcard import for Qt things

Changeset 4e7b912aa17b…

Parent 62369a04676b…

by Adrian Buehlmann

Changes to one file · Browse files at 4e7b912aa17b Showing diff from parent 62369a04676b Diff from another changeset...

Change 1 of 10 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
10
11
12
13
14
15
16
17
 
26
27
28
 
 
29
30
31
32
 
33
34
35
 
36
37
38
 
 
39
40
41
 
50
51
52
53
 
54
55
56
 
67
68
69
70
 
71
72
 
73
74
75
 
80
81
82
83
 
84
85
86
 
90
91
92
93
 
94
95
96
 
115
116
117
118
 
119
120
121
 
136
137
138
139
 
140
141
142
 
309
310
311
312
 
313
314
315
316
317
318
319
 
320
321
322
 
331
332
333
334
 
335
336
 
10
11
12
 
 
13
14
15
 
24
25
26
27
28
29
 
 
 
30
31
32
 
33
34
 
 
35
36
37
38
39
 
48
49
50
 
51
52
53
54
 
65
66
67
 
68
69
 
70
71
72
73
 
78
79
80
 
81
82
83
84
 
88
89
90
 
91
92
93
94
 
113
114
115
 
116
117
118
119
 
134
135
136
 
137
138
139
140
 
307
308
309
 
310
311
312
313
314
315
316
 
317
318
319
320
 
329
330
331
 
332
333
334
@@ -10,8 +10,6 @@
   import os   -from PyQt4 import QtCore, QtGui -  from mercurial import hg    from tortoisehg.util.util import has_closed_branch_support @@ -26,16 +24,16 @@
 from repoview import HgRepoView  from revdetailswidget import RevDetailsWidget   +from PyQt4.QtCore import * +from PyQt4.QtGui import *   -Qt = QtCore.Qt -connect = QtCore.QObject.connect -SIGNAL = QtCore.SIGNAL +connect = QObject.connect     -class RepoWidget(QtGui.QWidget): +class RepoWidget(QWidget):   - showMessageSignal = QtCore.pyqtSignal(str) - switchToSignal = QtCore.pyqtSignal(QtGui.QWidget) + showMessageSignal = pyqtSignal(str) + switchToSignal = pyqtSignal(QWidget)     def __init__(self, repo, stackedWidget, commitWidget):   self.repo = repo @@ -50,7 +48,7 @@
  self.currentMessage = ''   self.currenWidget = None   - QtGui.QWidget.__init__(self) + QWidget.__init__(self)     self.load_config()   self.setupUi() @@ -67,9 +65,9 @@
  self.restoreSettings()     def setupUi(self): - SP = QtGui.QSizePolicy + SP = QSizePolicy   - self.hbox = QtGui.QHBoxLayout(self) + self.hbox = QHBoxLayout(self)   self.hbox.setSpacing(0)   self.hbox.setMargin(0)   @@ -80,7 +78,7 @@
  sp.setVerticalStretch(1)   sp.setHeightForWidth(self.repoview.sizePolicy().hasHeightForWidth())   self.repoview.setSizePolicy(sp) - self.repoview.setFrameShape(QtGui.QFrame.StyledPanel) + self.repoview.setFrameShape(QFrame.StyledPanel)     w = RevDetailsWidget(self.repo, self.repoview)   self.stackedWidget.addWidget(w) @@ -90,7 +88,7 @@
  def load_config(self):   cfg = HgConfig(self.repo.ui)   fontstr = cfg.getFont() - font = QtGui.QFont() + font = QFont()   try:   if not font.fromString(fontstr):   raise Exception @@ -115,7 +113,7 @@
  self.showMessageSignal.emit(msg)     def showEvent(self, event): - QtGui.QWidget.showEvent(self, event) + QWidget.showEvent(self, event)   self.showMessageSignal.emit(self.currentMessage)     def timerEvent(self, event): @@ -136,7 +134,7 @@
  self._loading = False     def createActions(self): - self.actionActivateRev = QtGui.QAction('Activate rev.', self) + self.actionActivateRev = QAction('Activate rev.', self)   self.actionActivateRev.setShortcuts([Qt.SHIFT+Qt.Key_Return, Qt.SHIFT+Qt.Key_Enter])   connect(self.actionActivateRev, SIGNAL('triggered()'),   self.revision_activated) @@ -309,14 +307,14 @@
  self.stackedWidget.setCurrentWidget(self.currenWidget)     def storeSettings(self): - s = QtCore.QSettings() + s = QSettings()   wb = "RepoWidget/"   for n in self.splitternames:   s.setValue(wb + n, getattr(self, n).saveState())   self.revDetailsWidget.storeSettings()     def restoreSettings(self): - s = QtCore.QSettings() + s = QSettings()   wb = "RepoWidget/"   for n in self.splitternames:   getattr(self, n).restoreState(s.value(wb + n).toByteArray()) @@ -331,6 +329,6 @@
  # assuming here that there is at most one RepoWidget visible   self.storeSettings()   self.stackedWidget.removeWidget(self.revDetailsWidget) - s = QtCore.QSettings() + s = QSettings()   self.commitWidget.storeConfigs(s)   return True