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

workbench: change reporegistry into a QDockWidget

Changeset 6bc377a0bcf3…

Parent 4616270030ce…

by Adrian Buehlmann

Changes to 4 files · Browse files at 6bc377a0bcf3 Showing diff from parent 4616270030ce Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​reporegistry.py Stacked
 
13
14
15
16
 
17
18
19
 
345
346
347
348
349
350
351
352
 
518
519
520
521
 
522
523
524
525
526
 
 
527
 
 
 
 
 
 
528
529
530
 
 
531
532
533
 
13
14
15
 
16
17
18
19
 
345
346
347
 
 
348
349
350
 
516
517
518
 
519
520
521
522
 
 
523
524
525
526
527
528
529
530
531
532
533
 
534
535
536
537
538
@@ -13,7 +13,7 @@
 from PyQt4.QtCore import Qt, QVariant, SIGNAL, SLOT  from PyQt4.QtCore import QModelIndex, QString   -from PyQt4.QtGui import QWidget, QVBoxLayout +from PyQt4.QtGui import QVBoxLayout, QDockWidget, QFrame    from tortoisehg.hgqt.i18n import _  from tortoisehg.hgqt import icon as geticon @@ -345,8 +345,6 @@
  def headerData(self, section, orientation, role):   if role == Qt.DisplayRole:   if orientation == Qt.Horizontal: - if section == 0: - return QString(_('Repositories'))   if section == 1:   return QString(_('Path'))   return QVariant() @@ -518,16 +516,23 @@
  m.removeRows(row, 1, parent)     -class RepoRegistryView(QWidget): +class RepoRegistryView(QDockWidget):     openRepoSignal = QtCore.pyqtSignal(QtCore.QString)   - def __init__(self, parent=None): - QWidget.__init__(self, parent) + def __init__(self, parent): + QDockWidget.__init__(self, parent)   + self.setFeatures(QDockWidget.DockWidgetClosable | + QDockWidget.DockWidgetMovable | + QDockWidget.DockWidgetFloatable) + self.setWindowTitle(_('Repositories')) + + mainframe = QFrame()   lay = QVBoxLayout()   lay.setContentsMargins(0, 0, 0, 0) - self.setLayout(lay) + mainframe.setLayout(lay) + self.setWidget(mainframe)     self.tmodel = m = RepoTreeModel(settingsfilename())  
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​workbench.py Stacked
 
29
30
31
 
32
33
34
 
66
67
68
 
 
 
 
 
 
 
69
70
71
 
78
79
80
 
 
 
 
81
82
83
84
85
86
87
88
 
 
89
90
91
 
478
479
480
481
 
482
483
484
 
29
30
31
32
33
34
35
 
67
68
69
70
71
72
73
74
75
76
77
78
79
 
86
87
88
89
90
91
92
93
 
 
 
 
 
 
 
94
95
96
97
98
 
485
486
487
 
488
489
490
491
@@ -29,6 +29,7 @@
 from tortoisehg.hgqt.quickbar import FindInGraphlogQuickBar  from tortoisehg.hgqt.repowidget import RepoWidget  from tortoisehg.hgqt.commit import CommitWidget +from tortoisehg.hgqt.reporegistry import RepoRegistryView    from tortoisehg.util import paths   @@ -66,6 +67,13 @@
    self.setWindowTitle('TortoiseHg Workbench')   + self.reporegistry = rr = RepoRegistryView(self) + rr.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea) + rr.setObjectName('RepoRegistryView') + self.addDockWidget(Qt.LeftDockWidgetArea, rr) + + rr.openRepoSignal.connect(self.openRepo) +   if repo:   self.addRepoTab(repo)   @@ -78,14 +86,13 @@
  self.createToolbars()     self.repoTabChanged() + self.setupBranchCombo() + self.restoreSettings() + self.setAcceptDrops(True) + self.showRepoRegistry()   - self.setupBranchCombo() - - self.restoreSettings() - - self.setAcceptDrops(True) - - self.reporegistry.openRepoSignal.connect(self.openRepo) + def showRepoRegistry(self): + self.reporegistry.show()     def openRepo(self, repopath):   repo = hg.repository(self.ui, path=str(repopath)) @@ -478,7 +485,7 @@
  self.restoreState(s.value(wb + 'windowState').toByteArray())     self.splitternames = [] - sn = ('reporegistry', 'repotabs') + sn = ('repotabs', )   for n in sn:   n += '_splitter'   self.splitternames.append(n)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​workbench.ui Stacked
 
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
 
256
257
258
259
260
261
262
263
264
265
266
267
268
269
 
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
 
224
225
226
 
 
 
 
 
 
 
 
227
228
229
@@ -18,76 +18,44 @@
  <normaloff>:/icons/log.svg</normaloff>:/icons/log.svg</iconset>   </property>   <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property>   <property name="margin">   <number>0</number>   </property>   <item> - <widget class="QSplitter" name="reporegistry_splitter"> + <widget class="QSplitter" name="repotabs_splitter">   <property name="orientation"> - <enum>Qt::Horizontal</enum> + <enum>Qt::Vertical</enum>   </property> - <widget class="RepoRegistryView" name="reporegistry" native="true"> + <widget class="QTabWidget" name="repoTabsWidget">   <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>1</horstretch> + <verstretch>1</verstretch>   </sizepolicy>   </property> + <property name="currentIndex"> + <number>0</number> + </property> + <property name="documentMode"> + <bool>true</bool> + </property> + <property name="tabsClosable"> + <bool>true</bool> + </property> + <property name="movable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="firstRepoTab"> + <attribute name="title"> + <string>repo1</string> + </attribute> + </widget>   </widget> - <widget class="QFrame" name="repoframe"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QSplitter" name="repotabs_splitter"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <widget class="QTabWidget" name="repoTabsWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>1</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="currentIndex"> - <number>0</number> - </property> - <property name="documentMode"> - <bool>true</bool> - </property> - <property name="tabsClosable"> - <bool>true</bool> - </property> - <property name="movable"> - <bool>true</bool> - </property> - <widget class="QWidget" name="firstRepoTab"> - <attribute name="title"> - <string>repo1</string> - </attribute> - </widget> - </widget> - <widget class="QStackedWidget" name="stackedWidget"> - </widget> - </widget> - </item> - </layout> - </widget> + <widget class="QStackedWidget" name="stackedWidget"/>   </widget>   </item>   </layout> @@ -256,14 +224,6 @@
  </property>   </action>   </widget> - <customwidgets> - <customwidget> - <class>RepoRegistryView</class> - <extends>QWidget</extends> - <header>reporegistry.h</header> - <container>1</container> - </customwidget> - </customwidgets>   <resources>   <include location="workbench.qrc"/>   </resources>
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​workbench_ui.py Stacked
 
2
3
4
5
 
6
7
8
 
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
 
62
63
64
65
66
67
68
 
162
163
164
165
166
 
2
3
4
 
5
6
7
8
 
18
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
22
23
24
 
25
26
27
28
 
41
42
43
 
44
45
46
 
140
141
142
 
143
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\workbench.ui'  # -# Created: Mon May 24 11:13:32 2010 +# Created: Tue May 25 20:34:59 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -18,32 +18,11 @@
  MainWindow.setWindowIcon(icon)   self.centralwidget = QtGui.QWidget(MainWindow)   self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_2 = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName("verticalLayout_2") - self.reporegistry_splitter = QtGui.QSplitter(self.centralwidget) - self.reporegistry_splitter.setOrientation(QtCore.Qt.Horizontal) - self.reporegistry_splitter.setObjectName("reporegistry_splitter") - self.reporegistry = RepoRegistryView(self.reporegistry_splitter) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.reporegistry.sizePolicy().hasHeightForWidth()) - self.reporegistry.setSizePolicy(sizePolicy) - self.reporegistry.setObjectName("reporegistry") - self.repoframe = QtGui.QFrame(self.reporegistry_splitter) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(1) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.repoframe.sizePolicy().hasHeightForWidth()) - self.repoframe.setSizePolicy(sizePolicy) - self.repoframe.setFrameShape(QtGui.QFrame.StyledPanel) - self.repoframe.setFrameShadow(QtGui.QFrame.Raised) - self.repoframe.setObjectName("repoframe") - self.verticalLayout = QtGui.QVBoxLayout(self.repoframe) + self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget) + self.verticalLayout.setSpacing(0)   self.verticalLayout.setMargin(0)   self.verticalLayout.setObjectName("verticalLayout") - self.repotabs_splitter = QtGui.QSplitter(self.repoframe) + self.repotabs_splitter = QtGui.QSplitter(self.centralwidget)   self.repotabs_splitter.setOrientation(QtCore.Qt.Vertical)   self.repotabs_splitter.setObjectName("repotabs_splitter")   self.repoTabsWidget = QtGui.QTabWidget(self.repotabs_splitter) @@ -62,7 +41,6 @@
  self.stackedWidget = QtGui.QStackedWidget(self.repotabs_splitter)   self.stackedWidget.setObjectName("stackedWidget")   self.verticalLayout.addWidget(self.repotabs_splitter) - self.verticalLayout_2.addWidget(self.reporegistry_splitter)   MainWindow.setCentralWidget(self.centralwidget)   self.menubar = QtGui.QMenuBar(MainWindow)   self.menubar.setGeometry(QtCore.QRect(0, 0, 685, 19)) @@ -162,5 +140,4 @@
  self.actionForward.setText(QtGui.QApplication.translate("MainWindow", "Forward", None, QtGui.QApplication.UnicodeUTF8))   self.actionShowPaths.setText(QtGui.QApplication.translate("MainWindow", "Show paths", None, QtGui.QApplication.UnicodeUTF8))   -from reporegistry import RepoRegistryView  import workbench_rc