w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-05 15:34:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Recompile qrc for PyQt4

Browse Source 
PR #16 did not recompile the qrc file so the fix was not visible: see #18

Also add an tristate checkbox to the example
This commit is contained in:
ColinDuquesnoy
2015-01-09 17:01:11 +01:00
parent 712e4d8e7b
commit b765f541b9
5 changed files with 1379 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/ui/example.ui
+16 -6
View File
@@ -21,7 +21,7 @@
<enum>QTabWidget::East</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<property name="tabsClosable">
<bool>true</bool>
@@ -47,8 +47,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>388</width>
<height>390</height>
<width>96</width>
<height>42</height>
</rect>
</property>
<attribute name="label">
@@ -65,8 +65,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>388</width>
<height>390</height>
<width>404</width>
<height>372</height>
</rect>
</property>
<attribute name="label">
@@ -158,6 +158,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>CheckBox Tristate</string>
</property>
<property name="tristate">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QTreeWidget" name="treeWidget">
<column>
@@ -192,7 +202,7 @@
<x>0</x>
<y>0</y>
<width>880</width>
<height>25</height>
<height>28</height>
</rect>
</property>
<widget class="QMenu" name="menuMenu">
example/ui/example_pyqt5_ui.py
+11 -6
View File
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'example.ui'
#
# Created: Sat May 17 20:31:42 2014
# by: PyQt5 UI code generator 5.2.1
# Created: Fri Jan 9 16:47:47 2015
# by: PyQt5 UI code generator 5.4
#
# WARNING! All changes made in this file will be lost!
@@ -32,7 +32,7 @@ class Ui_MainWindow(object):
self.toolBox = QtWidgets.QToolBox(self.groupBox)
self.toolBox.setObjectName("toolBox")
self.page = QtWidgets.QWidget()
self.page.setGeometry(QtCore.QRect(0, 0, 388, 390))
self.page.setGeometry(QtCore.QRect(0, 0, 96, 42))
self.page.setObjectName("page")
self.gridLayout_4 = QtWidgets.QGridLayout(self.page)
self.gridLayout_4.setObjectName("gridLayout_4")
@@ -41,7 +41,7 @@ class Ui_MainWindow(object):
self.gridLayout_4.addWidget(self.lineEdit, 0, 0, 1, 1)
self.toolBox.addItem(self.page, "")
self.page_2 = QtWidgets.QWidget()
self.page_2.setGeometry(QtCore.QRect(0, 0, 388, 390))
self.page_2.setGeometry(QtCore.QRect(0, 0, 404, 372))
self.page_2.setObjectName("page_2")
self.gridLayout_5 = QtWidgets.QGridLayout(self.page_2)
self.gridLayout_5.setObjectName("gridLayout_5")
@@ -85,6 +85,10 @@ class Ui_MainWindow(object):
self.checkBox = QtWidgets.QCheckBox(self.groupBox_2)
self.checkBox.setObjectName("checkBox")
self.verticalLayout_4.addWidget(self.checkBox)
self.checkBox_2 = QtWidgets.QCheckBox(self.groupBox_2)
self.checkBox_2.setTristate(True)
self.checkBox_2.setObjectName("checkBox_2")
self.verticalLayout_4.addWidget(self.checkBox_2)
self.treeWidget = QtWidgets.QTreeWidget(self.groupBox_2)
self.treeWidget.setObjectName("treeWidget")
item_0 = QtWidgets.QTreeWidgetItem(self.treeWidget)
@@ -95,7 +99,7 @@ class Ui_MainWindow(object):
self.horizontalLayout_2.addWidget(self.tabWidget)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 880, 25))
self.menubar.setGeometry(QtCore.QRect(0, 0, 880, 28))
self.menubar.setObjectName("menubar")
self.menuMenu = QtWidgets.QMenu(self.menubar)
self.menuMenu.setObjectName("menuMenu")
@@ -190,7 +194,7 @@ class Ui_MainWindow(object):
self.toolBar.addAction(self.actionSub_menu)
self.retranslateUi(MainWindow)
self.tabWidget.setCurrentIndex(0)
self.tabWidget.setCurrentIndex(1)
self.toolBox.setCurrentIndex(1)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
@@ -224,6 +228,7 @@ class Ui_MainWindow(object):
self.label.setText(_translate("MainWindow", "TextLabel"))
self.radioButton.setText(_translate("MainWindow", "RadioButton"))
self.checkBox.setText(_translate("MainWindow", "CheckBox"))
self.checkBox_2.setText(_translate("MainWindow", "CheckBox Tristate"))
self.treeWidget.headerItem().setText(0, _translate("MainWindow", "qdz"))
__sortingEnabled = self.treeWidget.isSortingEnabled()
self.treeWidget.setSortingEnabled(False)
example/ui/example_pyqt_ui.py
+11 -6
View File
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'example.ui'
#
# Created: Tue Feb 25 09:02:44 2014
# by: PyQt4 UI code generator 4.10.3
# Created: Fri Jan 9 16:47:47 2015
# by: PyQt4 UI code generator 4.11.3
#
# WARNING! All changes made in this file will be lost!
@@ -46,7 +46,7 @@ class Ui_MainWindow(object):
self.toolBox = QtGui.QToolBox(self.groupBox)
self.toolBox.setObjectName(_fromUtf8("toolBox"))
self.page = QtGui.QWidget()
self.page.setGeometry(QtCore.QRect(0, 0, 388, 390))
self.page.setGeometry(QtCore.QRect(0, 0, 96, 42))
self.page.setObjectName(_fromUtf8("page"))
self.gridLayout_4 = QtGui.QGridLayout(self.page)
self.gridLayout_4.setObjectName(_fromUtf8("gridLayout_4"))
@@ -55,7 +55,7 @@ class Ui_MainWindow(object):
self.gridLayout_4.addWidget(self.lineEdit, 0, 0, 1, 1)
self.toolBox.addItem(self.page, _fromUtf8(""))
self.page_2 = QtGui.QWidget()
self.page_2.setGeometry(QtCore.QRect(0, 0, 388, 390))
self.page_2.setGeometry(QtCore.QRect(0, 0, 404, 372))
self.page_2.setObjectName(_fromUtf8("page_2"))
self.gridLayout_5 = QtGui.QGridLayout(self.page_2)
self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5"))
@@ -99,6 +99,10 @@ class Ui_MainWindow(object):
self.checkBox = QtGui.QCheckBox(self.groupBox_2)
self.checkBox.setObjectName(_fromUtf8("checkBox"))
self.verticalLayout_4.addWidget(self.checkBox)
self.checkBox_2 = QtGui.QCheckBox(self.groupBox_2)
self.checkBox_2.setTristate(True)
self.checkBox_2.setObjectName(_fromUtf8("checkBox_2"))
self.verticalLayout_4.addWidget(self.checkBox_2)
self.treeWidget = QtGui.QTreeWidget(self.groupBox_2)
self.treeWidget.setObjectName(_fromUtf8("treeWidget"))
item_0 = QtGui.QTreeWidgetItem(self.treeWidget)
@@ -109,7 +113,7 @@ class Ui_MainWindow(object):
self.horizontalLayout_2.addWidget(self.tabWidget)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtGui.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 880, 25))
self.menubar.setGeometry(QtCore.QRect(0, 0, 880, 28))
self.menubar.setObjectName(_fromUtf8("menubar"))
self.menuMenu = QtGui.QMenu(self.menubar)
self.menuMenu.setObjectName(_fromUtf8("menuMenu"))
@@ -204,7 +208,7 @@ class Ui_MainWindow(object):
self.toolBar.addAction(self.actionSub_menu)
self.retranslateUi(MainWindow)
self.tabWidget.setCurrentIndex(0)
self.tabWidget.setCurrentIndex(1)
self.toolBox.setCurrentIndex(1)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
@@ -237,6 +241,7 @@ class Ui_MainWindow(object):
self.label.setText(_translate("MainWindow", "TextLabel", None))
self.radioButton.setText(_translate("MainWindow", "RadioButton", None))
self.checkBox.setText(_translate("MainWindow", "CheckBox", None))
self.checkBox_2.setText(_translate("MainWindow", "CheckBox Tristate", None))
self.treeWidget.headerItem().setText(0, _translate("MainWindow", "qdz", None))
__sortingEnabled = self.treeWidget.isSortingEnabled()
self.treeWidget.setSortingEnabled(False)