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

rename hgqt/hgqv.qrc to workbench.qrc

Changeset c0a000e0376f…

Parent 440c94ce9ff7…

by Adrian Buehlmann

Changes to 7 files · Browse files at c0a000e0376f Showing diff from parent 440c94ce9ff7 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgqt/​__init__.py Stacked
 
30
31
32
33
34
 
 
35
36
37
 
45
46
47
48
 
49
50
51
 
76
77
78
79
 
80
81
82
 
30
31
32
 
 
33
34
35
36
37
 
45
46
47
 
48
49
50
51
 
76
77
78
 
79
80
81
82
@@ -30,8 +30,8 @@
 # automatically load resource module, creating it on the fly if  # required  curdir = osp.dirname(__file__) -pyfile = osp.join(curdir, "hgqv_rc.py") -rcfile = osp.join(curdir, "hgqv.qrc") +pyfile = osp.join(curdir, "workbench_rc.py") +rcfile = osp.join(curdir, "workbench.qrc")  if should_rebuild(rcfile, pyfile):   if os.system('pyrcc4 %s -o %s' % (rcfile, pyfile)):   print "ERROR: Cannot convert the resource file '%s' into a python module." @@ -45,7 +45,7 @@
 connect = QtCore.QObject.connect  SIGNAL = QtCore.SIGNAL  Qt = QtCore.Qt -import hgqv_rc +import workbench_rc      _icons = {} @@ -76,7 +76,7 @@
 import repoview, fileview  sys.modules['repoview'] = repoview  sys.modules['fileview'] = fileview -sys.modules['hgqv_rc'] = hgqv_rc +sys.modules['workbench_rc'] = workbench_rc    def setup_font_substitutions():   # be sure monospace default font for diffs have a decent substitution
Show Entire File tortoisehg/​hgqt/​hgqv_rc.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgqv_ui.py Stacked
 
1
2
3
4
5
6
7
8
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
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
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,146 +0,0 @@
-# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\hgqv.ui' -# -# Created: Sun May 02 11:37:41 2010 -# by: PyQt4 UI code generator 4.7.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(730, 646) - self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_3 = QtGui.QVBoxLayout(self.centralwidget) - self.verticalLayout_3.setSpacing(0) - self.verticalLayout_3.setMargin(0) - self.verticalLayout_3.setObjectName("verticalLayout_3") - self.splitter_3 = QtGui.QSplitter(self.centralwidget) - self.splitter_3.setOrientation(QtCore.Qt.Vertical) - self.splitter_3.setObjectName("splitter_3") - self.tableView_revisions = HgRepoView(self.splitter_3) - self.tableView_revisions.setFrameShape(QtGui.QFrame.StyledPanel) - self.tableView_revisions.setObjectName("tableView_revisions") - self.frame_maincontent = QtGui.QFrame(self.splitter_3) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.frame_maincontent.sizePolicy().hasHeightForWidth()) - self.frame_maincontent.setSizePolicy(sizePolicy) - self.frame_maincontent.setFrameShape(QtGui.QFrame.NoFrame) - self.frame_maincontent.setFrameShadow(QtGui.QFrame.Plain) - self.frame_maincontent.setObjectName("frame_maincontent") - self.verticalLayout = QtGui.QVBoxLayout(self.frame_maincontent) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName("verticalLayout") - self.splitter_2 = QtGui.QSplitter(self.frame_maincontent) - self.splitter_2.setOrientation(QtCore.Qt.Horizontal) - self.splitter_2.setObjectName("splitter_2") - self.tableView_filelist = HgFileListView(self.splitter_2) - self.tableView_filelist.setObjectName("tableView_filelist") - self.splitter = QtGui.QSplitter(self.splitter_2) - self.splitter.setOrientation(QtCore.Qt.Vertical) - self.splitter.setObjectName("splitter") - self.textview_header = RevDisplay(self.splitter) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(1) - sizePolicy.setHeightForWidth(self.textview_header.sizePolicy().hasHeightForWidth()) - self.textview_header.setSizePolicy(sizePolicy) - self.textview_header.setObjectName("textview_header") - self.textview_status = HgFileView(self.splitter) - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(2) - sizePolicy.setHeightForWidth(self.textview_status.sizePolicy().hasHeightForWidth()) - self.textview_status.setSizePolicy(sizePolicy) - self.textview_status.setObjectName("textview_status") - self.verticalLayout.addWidget(self.splitter_2) - self.verticalLayout_3.addWidget(self.splitter_3) - MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtGui.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 730, 26)) - self.menubar.setObjectName("menubar") - self.menuFile = QtGui.QMenu(self.menubar) - self.menuFile.setObjectName("menuFile") - self.menuHelp = QtGui.QMenu(self.menubar) - self.menuHelp.setObjectName("menuHelp") - self.menu_Edit = QtGui.QMenu(self.menubar) - self.menu_Edit.setObjectName("menu_Edit") - MainWindow.setMenuBar(self.menubar) - self.statusbar = QtGui.QStatusBar(MainWindow) - self.statusbar.setObjectName("statusbar") - MainWindow.setStatusBar(self.statusbar) - self.toolBar_file = QtGui.QToolBar(MainWindow) - self.toolBar_file.setObjectName("toolBar_file") - MainWindow.addToolBar(QtCore.Qt.ToolBarArea(QtCore.Qt.TopToolBarArea), self.toolBar_file) - self.toolBar_edit = QtGui.QToolBar(MainWindow) - self.toolBar_edit.setEnabled(True) - self.toolBar_edit.setObjectName("toolBar_edit") - MainWindow.addToolBar(QtCore.Qt.ToolBarArea(QtCore.Qt.TopToolBarArea), self.toolBar_edit) - self.toolBar_treefilters = QtGui.QToolBar(MainWindow) - self.toolBar_treefilters.setEnabled(True) - self.toolBar_treefilters.setObjectName("toolBar_treefilters") - MainWindow.addToolBar(QtCore.Qt.ToolBarArea(QtCore.Qt.TopToolBarArea), self.toolBar_treefilters) - self.toolBar_diff = QtGui.QToolBar(MainWindow) - self.toolBar_diff.setObjectName("toolBar_diff") - MainWindow.addToolBar(QtCore.Qt.ToolBarArea(QtCore.Qt.TopToolBarArea), self.toolBar_diff) - self.toolBar_help = QtGui.QToolBar(MainWindow) - self.toolBar_help.setObjectName("toolBar_help") - MainWindow.addToolBar(QtCore.Qt.ToolBarArea(QtCore.Qt.TopToolBarArea), self.toolBar_help) - self.actionOpen_repository = QtGui.QAction(MainWindow) - self.actionOpen_repository.setObjectName("actionOpen_repository") - self.actionRefresh = QtGui.QAction(MainWindow) - self.actionRefresh.setObjectName("actionRefresh") - self.actionQuit = QtGui.QAction(MainWindow) - self.actionQuit.setObjectName("actionQuit") - self.actionAbout = QtGui.QAction(MainWindow) - self.actionAbout.setObjectName("actionAbout") - self.actionDisplayAllBranches = QtGui.QAction(MainWindow) - self.actionDisplayAllBranches.setObjectName("actionDisplayAllBranches") - self.actionHelp = QtGui.QAction(MainWindow) - self.actionHelp.setObjectName("actionHelp") - self.menuFile.addAction(self.actionOpen_repository) - self.menuFile.addAction(self.actionRefresh) - self.menuFile.addSeparator() - self.menuFile.addAction(self.actionQuit) - self.menuHelp.addAction(self.actionAbout) - self.menuHelp.addAction(self.actionHelp) - self.menubar.addAction(self.menuFile.menuAction()) - self.menubar.addAction(self.menu_Edit.menuAction()) - self.menubar.addAction(self.menuHelp.menuAction()) - self.toolBar_file.addAction(self.actionQuit) - self.toolBar_file.addAction(self.actionRefresh) - self.toolBar_help.addAction(self.actionHelp) - - self.retranslateUi(MainWindow) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "MainWindow", 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)) - self.toolBar_file.setWindowTitle(QtGui.QApplication.translate("MainWindow", "File toolbar", None, QtGui.QApplication.UnicodeUTF8)) - self.toolBar_edit.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Edit toolbar", None, QtGui.QApplication.UnicodeUTF8)) - self.toolBar_treefilters.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Filter toolbar", None, QtGui.QApplication.UnicodeUTF8)) - self.toolBar_diff.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Diff toolbar", None, QtGui.QApplication.UnicodeUTF8)) - self.toolBar_help.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Help toolbar", None, QtGui.QApplication.UnicodeUTF8)) - self.actionOpen_repository.setText(QtGui.QApplication.translate("MainWindow", "&Open repository", None, QtGui.QApplication.UnicodeUTF8)) - self.actionOpen_repository.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+O", None, QtGui.QApplication.UnicodeUTF8)) - self.actionRefresh.setText(QtGui.QApplication.translate("MainWindow", "&Refresh", None, QtGui.QApplication.UnicodeUTF8)) - self.actionRefresh.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+R", None, QtGui.QApplication.UnicodeUTF8)) - self.actionQuit.setText(QtGui.QApplication.translate("MainWindow", "&Quit", None, QtGui.QApplication.UnicodeUTF8)) - self.actionQuit.setToolTip(QtGui.QApplication.translate("MainWindow", "Quit", None, QtGui.QApplication.UnicodeUTF8)) - self.actionQuit.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+Q", None, QtGui.QApplication.UnicodeUTF8)) - self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8)) - self.actionDisplayAllBranches.setText(QtGui.QApplication.translate("MainWindow", "displayAllBranches", None, QtGui.QApplication.UnicodeUTF8)) - self.actionHelp.setText(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) - -from fileview import HgFileView, HgFileListView -from repoview import HgRepoView, RevDisplay -import hgqv_rc
Show Entire File tortoisehg/​hgqt/​workbench.qrc Stacked
renamed from tortoisehg/hgqt/hgqv.qrc
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​workbench.ui Stacked
 
249
250
251
252
 
253
254
255
 
249
250
251
 
252
253
254
255
@@ -249,7 +249,7 @@
  </customwidget>   </customwidgets>   <resources> - <include location="hgqv.qrc"/> + <include location="workbench.qrc"/>   </resources>   <connections/>  </ui>
Show Entire File tortoisehg/​hgqt/​workbench_rc.py Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​workbench_ui.py Stacked
 
2
3
4
5
 
6
7
8
 
143
144
145
146
 
 
2
3
4
 
5
6
7
8
 
143
144
145
 
146
@@ -2,7 +2,7 @@
   # Form implementation generated from reading ui file 'C:\Users\adi\hgrepos\thg-qt\tortoisehg\hgqt\workbench.ui'  # -# Created: Sun May 02 11:53:07 2010 +# Created: Sun May 02 12:03:11 2010  # by: PyQt4 UI code generator 4.7.3  #  # WARNING! All changes made in this file will be lost! @@ -143,4 +143,4 @@
   from fileview import HgFileView, HgFileListView  from repoview import HgRepoView, RevDisplay -import hgqv_rc +import workbench_rc