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

manifestdialog: remove redundant close toolbar button

and the toolbar altogether

Changeset 98d766195d01…

Parent 1c6b83aab581…

by Adrian Buehlmann

Changes to 3 files · Browse files at 98d766195d01 Showing diff from parent 1c6b83aab581 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​ManifestDialog.ui Stacked
 
1
 
 
2
3
4
 
 
5
6
7
 
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
 
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
 
 
1
2
3
 
 
4
5
6
7
8
 
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
 
49
50
51
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
52
53
54
@@ -1,7 +1,8 @@
-<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0">   <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow" > - <property name="geometry" > + <widget class="QMainWindow" name="MainWindow"> + <property name="geometry">   <rect>   <x>0</x>   <y>0</y> @@ -9,46 +10,38 @@
  <height>300</height>   </rect>   </property> - <property name="windowTitle" > + <property name="windowTitle">   <string>Dialog</string>   </property> - <widget class="QWidget" name="centralwidget" > - <property name="geometry" > - <rect> - <x>0</x> - <y>33</y> - <width>400</width> - <height>267</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <property name="margin" > + <widget class="QWidget" name="centralwidget"> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="margin">   <number>2</number>   </property>   <item> - <widget class="QSplitter" name="splitter" > - <property name="orientation" > + <widget class="QSplitter" name="splitter"> + <property name="orientation">   <enum>Qt::Horizontal</enum>   </property> - <widget class="QTreeView" name="treeView" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTreeView" name="treeView"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding">   <horstretch>1</horstretch>   <verstretch>0</verstretch>   </sizepolicy>   </property>   </widget> - <widget class="QFrame" name="mainFrame" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > + <widget class="QFrame" name="mainFrame"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred">   <horstretch>3</horstretch>   <verstretch>0</verstretch>   </sizepolicy>   </property> - <property name="frameShape" > + <property name="frameShape">   <enum>QFrame::StyledPanel</enum>   </property> - <property name="frameShadow" > + <property name="frameShadow">   <enum>QFrame::Raised</enum>   </property>   </widget> @@ -56,42 +49,6 @@
  </item>   </layout>   </widget> - <widget class="QToolBar" name="toolBar" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>33</height> - </rect> - </property> - <property name="windowTitle" > - <string>toolBar</string> - </property> - <attribute name="toolBarArea" > - <enum>TopToolBarArea</enum> - </attribute> - <attribute name="toolBarBreak" > - <bool>false</bool> - </attribute> - <addaction name="actionClose" /> - </widget> - <action name="actionClose" > - <property name="text" > - <string>Close</string> - </property> - <property name="shortcut" > - <string>Ctrl+Q</string> - </property> - </action> - <action name="actionReload" > - <property name="text" > - <string>Reload</string> - </property> - <property name="shortcut" > - <string>Ctrl+R</string> - </property> - </action>   </widget>   <resources/>   <connections/>
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​ManifestDialog_ui.py Stacked
 
2
3
4
5
 
6
7
8
 
14
15
16
17
18
19
20
 
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
 
2
3
4
 
5
6
7
8
 
14
15
16
 
17
18
19
 
39
40
41
 
 
 
 
 
 
 
 
 
42
43
44
45
46
47
 
 
 
 
 
48
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\ManifestDialog.ui'  # -# Created: Sun May 02 13:47:20 2010 +# Created: Tue May 18 11:33:55 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -14,7 +14,6 @@
  MainWindow.setObjectName("MainWindow")   MainWindow.resize(400, 300)   self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setGeometry(QtCore.QRect(0, 33, 400, 267))   self.centralwidget.setObjectName("centralwidget")   self.verticalLayout = QtGui.QVBoxLayout(self.centralwidget)   self.verticalLayout.setMargin(2) @@ -40,24 +39,10 @@
  self.mainFrame.setObjectName("mainFrame")   self.verticalLayout.addWidget(self.splitter)   MainWindow.setCentralWidget(self.centralwidget) - self.toolBar = QtGui.QToolBar(MainWindow) - self.toolBar.setGeometry(QtCore.QRect(0, 0, 400, 33)) - self.toolBar.setObjectName("toolBar") - MainWindow.addToolBar(QtCore.Qt.ToolBarArea(QtCore.Qt.TopToolBarArea), self.toolBar) - self.actionClose = QtGui.QAction(MainWindow) - self.actionClose.setObjectName("actionClose") - self.actionReload = QtGui.QAction(MainWindow) - self.actionReload.setObjectName("actionReload") - self.toolBar.addAction(self.actionClose)     self.retranslateUi(MainWindow)   QtCore.QMetaObject.connectSlotsByName(MainWindow)     def retranslateUi(self, MainWindow):   MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Dialog", None, QtGui.QApplication.UnicodeUTF8)) - self.toolBar.setWindowTitle(QtGui.QApplication.translate("MainWindow", "toolBar", None, QtGui.QApplication.UnicodeUTF8)) - self.actionClose.setText(QtGui.QApplication.translate("MainWindow", "Close", None, QtGui.QApplication.UnicodeUTF8)) - self.actionClose.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+Q", None, QtGui.QApplication.UnicodeUTF8)) - self.actionReload.setText(QtGui.QApplication.translate("MainWindow", "Reload", None, QtGui.QApplication.UnicodeUTF8)) - self.actionReload.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+R", None, QtGui.QApplication.UnicodeUTF8))  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
71
72
73
74
75
76
 
77
78
79
 
71
72
73
 
 
 
74
75
76
77
@@ -71,9 +71,7 @@
  self.fileSelected)     def createActions(self): - connect(self.actionClose, SIGNAL('triggered()'), - self.close) - self.actionClose.setIcon(geticon('quit')) + pass     def setupTextview(self):   lay = QtGui.QHBoxLayout(self.mainFrame)