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

workbench: introduce an enclosing tab widget for repo tabs

additional tabs will have to be added at runtime

Changeset 6c19c618fc0b…

Parent 1d23891095ba…

by Adrian Buehlmann

Changes to 2 files · Browse files at 6c19c618fc0b Showing diff from parent 1d23891095ba Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​workbench.ui Stacked
 
14
15
16
17
 
18
19
20
 
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
 
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
 
14
15
16
 
17
18
19
20
 
22
23
24
 
 
 
25
26
27
28
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
 
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
@@ -14,7 +14,7 @@
  <string>MainWindow</string>   </property>   <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout_3"> + <layout class="QHBoxLayout" name="horizontalLayout">   <property name="spacing">   <number>0</number>   </property> @@ -22,35 +22,24 @@
  <number>0</number>   </property>   <item> - <widget class="QSplitter" name="revisions_splitter"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <widget class="QTabWidget" name="repoTabsWidget"> + <property name="currentIndex"> + <number>0</number>   </property> - <widget class="HgRepoView" name="tableView_revisions"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> - </property> - </widget> - <widget class="QFrame" name="frame_maincontent"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> + <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> + <layout class="QVBoxLayout" name="verticalLayout_3">   <property name="spacing">   <number>0</number>   </property> @@ -58,123 +47,163 @@
  <number>0</number>   </property>   <item> - <widget class="QSplitter" name="filelist_splitter"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QSplitter" name="revisions_splitter"> + <property name="orientation"> + <enum>Qt::Vertical</enum>   </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="childrenCollapsible"> - <bool>false</bool> - </property> - <widget class="HgFileListView" name="tableView_filelist"/> - <widget class="QFrame" name="frame"> + <widget class="HgRepoView" name="tableView_revisions">   <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>1</horstretch> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + </widget> + <widget class="QFrame" name="frame_maincontent"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch>   <verstretch>0</verstretch>   </sizepolicy>   </property>   <property name="frameShape">   <enum>QFrame::NoFrame</enum>   </property> - <layout class="QVBoxLayout" name="verticalLayout"> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2">   <property name="spacing">   <number>0</number>   </property> - <property name="sizeConstraint"> - <enum>QLayout::SetDefaultConstraint</enum> - </property>   <property name="margin">   <number>0</number>   </property>   <item> - <widget class="RevDisplay" name="textview_header" native="true"> + <widget class="QSplitter" name="filelist_splitter">   <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding">   <horstretch>0</horstretch>   <verstretch>0</verstretch>   </sizepolicy>   </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> + <property name="orientation"> + <enum>Qt::Horizontal</enum>   </property> - <property name="font"> - <font> - <pointsize>8</pointsize> - </font> + <property name="childrenCollapsible"> + <bool>false</bool>   </property> - </widget> - </item> - <item> - <widget class="QSplitter" name="message_splitter"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>50</width> - <height>50</height> - </size> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="lineWidth"> - <number>0</number> - </property> - <property name="midLineWidth"> - <number>0</number> - </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="opaqueResize"> - <bool>true</bool> - </property> - <widget class="RevMessage" name="message" native="true"> + <widget class="HgFileListView" name="tableView_filelist"/> + <widget class="QFrame" name="frame">   <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>1</horstretch>   <verstretch>0</verstretch>   </sizepolicy>   </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum>   </property> - <property name="font"> - <font> - <family>Courier</family> - <pointsize>9</pointsize> - </font> - </property> - </widget> - <widget class="HgFileView" name="textview_status" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>0</width> - <height>0</height> - </size> - </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="sizeConstraint"> + <enum>QLayout::SetDefaultConstraint</enum> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="RevDisplay" name="textview_header" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>8</pointsize> + </font> + </property> + </widget> + </item> + <item> + <widget class="QSplitter" name="message_splitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>50</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="lineWidth"> + <number>0</number> + </property> + <property name="midLineWidth"> + <number>0</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="opaqueResize"> + <bool>true</bool> + </property> + <widget class="RevMessage" name="message" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="font"> + <font> + <family>Courier</family> + <pointsize>9</pointsize> + </font> + </property> + </widget> + <widget class="HgFileView" name="textview_status" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + </widget> + </widget> + </item> + </layout>   </widget>   </widget>   </item>
Change 1 of 4 Show Entire File tortoisehg/​hgqt/​workbench_ui.py Stacked
 
2
3
4
5
 
6
7
8
 
15
16
17
18
 
 
 
 
 
 
 
 
 
 
 
 
19
20
21
22
 
23
24
25
 
115
116
117
 
 
118
119
120
 
172
173
174
 
175
176
177
178
 
179
180
181
 
2
3
4
 
5
6
7
8
 
15
16
17
 
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
 
33
34
35
36
 
126
127
128
129
130
131
132
133
 
185
186
187
188
189
190
191
192
193
194
195
196
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\workbench.ui'  # -# Created: Tue May 04 20:29:14 2010 +# Created: Tue May 11 11:55:26 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -15,11 +15,22 @@
  MainWindow.resize(698, 642)   self.centralwidget = QtGui.QWidget(MainWindow)   self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_3 = QtGui.QVBoxLayout(self.centralwidget) + self.horizontalLayout = QtGui.QHBoxLayout(self.centralwidget) + self.horizontalLayout.setSpacing(0) + self.horizontalLayout.setMargin(0) + self.horizontalLayout.setObjectName("horizontalLayout") + self.repoTabsWidget = QtGui.QTabWidget(self.centralwidget) + self.repoTabsWidget.setDocumentMode(True) + self.repoTabsWidget.setTabsClosable(True) + self.repoTabsWidget.setMovable(True) + self.repoTabsWidget.setObjectName("repoTabsWidget") + self.firstRepoTab = QtGui.QWidget() + self.firstRepoTab.setObjectName("firstRepoTab") + self.verticalLayout_3 = QtGui.QVBoxLayout(self.firstRepoTab)   self.verticalLayout_3.setSpacing(0)   self.verticalLayout_3.setMargin(0)   self.verticalLayout_3.setObjectName("verticalLayout_3") - self.revisions_splitter = QtGui.QSplitter(self.centralwidget) + self.revisions_splitter = QtGui.QSplitter(self.firstRepoTab)   self.revisions_splitter.setOrientation(QtCore.Qt.Vertical)   self.revisions_splitter.setObjectName("revisions_splitter")   self.tableView_revisions = HgRepoView(self.revisions_splitter) @@ -115,6 +126,8 @@
  self.verticalLayout.addWidget(self.message_splitter)   self.verticalLayout_2.addWidget(self.filelist_splitter)   self.verticalLayout_3.addWidget(self.revisions_splitter) + self.repoTabsWidget.addTab(self.firstRepoTab, "") + self.horizontalLayout.addWidget(self.repoTabsWidget)   MainWindow.setCentralWidget(self.centralwidget)   self.menubar = QtGui.QMenuBar(MainWindow)   self.menubar.setGeometry(QtCore.QRect(0, 0, 698, 19)) @@ -172,10 +185,12 @@
  self.toolBar_help.addAction(self.actionHelp)     self.retranslateUi(MainWindow) + self.repoTabsWidget.setCurrentIndex(0)   QtCore.QMetaObject.connectSlotsByName(MainWindow)     def retranslateUi(self, MainWindow):   MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "MainWindow", None, QtGui.QApplication.UnicodeUTF8)) + self.repoTabsWidget.setTabText(self.repoTabsWidget.indexOf(self.firstRepoTab), QtGui.QApplication.translate("MainWindow", "repo1", None, QtGui.QApplication.UnicodeUTF8))   self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "&File", None, QtGui.QApplication.UnicodeUTF8))   self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "&Help", None, QtGui.QApplication.UnicodeUTF8))   self.menu_Edit.setTitle(QtGui.QApplication.translate("MainWindow", "&Edit", None, QtGui.QApplication.UnicodeUTF8))