diff --git a/.gitignore b/.gitignore
index c5ce538bf..6d8b66479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/*.pyc
+*.pyc
/style.rcc
/style_pyside_rc.py
./.idea
diff --git a/example/compile_ui.sh b/example/compile_ui.sh
new file mode 100755
index 000000000..f91e6ea4a
--- /dev/null
+++ b/example/compile_ui.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Compile example.ui for PyQt and PySide.
+pyuic4 --from-imports example.ui > example_pyqt_ui.py
+pyside-uic --from-imports example.ui > example_pyside_ui.py
\ No newline at end of file
diff --git a/example/example.ui b/example/example.ui
index 4ef86a1ba..566aaab34 100644
--- a/example/example.ui
+++ b/example/example.ui
@@ -200,6 +200,40 @@
-
+ -
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Row
+
+
+
+
+ New Column
+
+
+
+
+ New Column 2
+
+
+
+
-
diff --git a/example/example_pyqt_ui.py b/example/example_pyqt_ui.py
index 5a9d7a59e..4732d5f32 100644
--- a/example/example_pyqt_ui.py
+++ b/example/example_pyqt_ui.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'example.ui'
#
-# Created: Thu Jan 2 15:54:09 2014
+# Created: Sun Jan 26 15:54:23 2014
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -120,6 +120,23 @@ class Ui_MainWindow(object):
self.textEdit = QtGui.QTextEdit(self.dockWidgetContents)
self.textEdit.setObjectName(_fromUtf8("textEdit"))
self.verticalLayout.addWidget(self.textEdit)
+ self.tableWidget = QtGui.QTableWidget(self.dockWidgetContents)
+ self.tableWidget.setObjectName(_fromUtf8("tableWidget"))
+ self.tableWidget.setColumnCount(2)
+ self.tableWidget.setRowCount(4)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(0, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(1, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(2, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(3, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setHorizontalHeaderItem(0, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setHorizontalHeaderItem(1, item)
+ self.verticalLayout.addWidget(self.tableWidget)
self.progressBar = QtGui.QProgressBar(self.dockWidgetContents)
self.progressBar.setProperty("value", 24)
self.progressBar.setObjectName(_fromUtf8("progressBar"))
@@ -178,6 +195,18 @@ class Ui_MainWindow(object):
self.pushButton_3.setText(_translate("MainWindow", "PushButton", None))
self.comboBox.setItemText(0, _translate("MainWindow", "Item 0", None))
self.comboBox.setItemText(1, _translate("MainWindow", "Item 2", None))
+ item = self.tableWidget.verticalHeaderItem(0)
+ item.setText(_translate("MainWindow", "New Row", None))
+ item = self.tableWidget.verticalHeaderItem(1)
+ item.setText(_translate("MainWindow", "New Row", None))
+ item = self.tableWidget.verticalHeaderItem(2)
+ item.setText(_translate("MainWindow", "New Row", None))
+ item = self.tableWidget.verticalHeaderItem(3)
+ item.setText(_translate("MainWindow", "New Row", None))
+ item = self.tableWidget.horizontalHeaderItem(0)
+ item.setText(_translate("MainWindow", "New Column", None))
+ item = self.tableWidget.horizontalHeaderItem(1)
+ item.setText(_translate("MainWindow", "New Column 2", None))
self.actionSubmenu.setText(_translate("MainWindow", "Submenu", None))
self.actionSubsubmenu.setText(_translate("MainWindow", "Subsubmenu", None))
diff --git a/example/example_pyqt_ui.pyc b/example/example_pyqt_ui.pyc
index ea70c4a08..3f83d787a 100644
Binary files a/example/example_pyqt_ui.pyc and b/example/example_pyqt_ui.pyc differ
diff --git a/example/example_pyside_ui.py b/example/example_pyside_ui.py
index 0a52a2b0f..69e7f73ab 100644
--- a/example/example_pyside_ui.py
+++ b/example/example_pyside_ui.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'example.ui'
#
-# Created: Sun Mar 10 15:08:16 2013
-# by: pyside-uic 0.2.13 running on PySide 1.1.1
+# Created: Sun Jan 26 15:54:23 2014
+# by: pyside-uic 0.2.14 running on PySide 1.1.2
#
# WARNING! All changes made in this file will be lost!
@@ -98,6 +98,23 @@ class Ui_MainWindow(object):
self.textEdit = QtGui.QTextEdit(self.dockWidgetContents)
self.textEdit.setObjectName("textEdit")
self.verticalLayout.addWidget(self.textEdit)
+ self.tableWidget = QtGui.QTableWidget(self.dockWidgetContents)
+ self.tableWidget.setObjectName("tableWidget")
+ self.tableWidget.setColumnCount(2)
+ self.tableWidget.setRowCount(4)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(0, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(1, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(2, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setVerticalHeaderItem(3, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setHorizontalHeaderItem(0, item)
+ item = QtGui.QTableWidgetItem()
+ self.tableWidget.setHorizontalHeaderItem(1, item)
+ self.verticalLayout.addWidget(self.tableWidget)
self.progressBar = QtGui.QProgressBar(self.dockWidgetContents)
self.progressBar.setProperty("value", 24)
self.progressBar.setObjectName("progressBar")
@@ -148,6 +165,12 @@ class Ui_MainWindow(object):
self.pushButton_3.setText(QtGui.QApplication.translate("MainWindow", "PushButton", None, QtGui.QApplication.UnicodeUTF8))
self.comboBox.setItemText(0, QtGui.QApplication.translate("MainWindow", "Item 0", None, QtGui.QApplication.UnicodeUTF8))
self.comboBox.setItemText(1, QtGui.QApplication.translate("MainWindow", "Item 2", None, QtGui.QApplication.UnicodeUTF8))
+ self.tableWidget.verticalHeaderItem(0).setText(QtGui.QApplication.translate("MainWindow", "New Row", None, QtGui.QApplication.UnicodeUTF8))
+ self.tableWidget.verticalHeaderItem(1).setText(QtGui.QApplication.translate("MainWindow", "New Row", None, QtGui.QApplication.UnicodeUTF8))
+ self.tableWidget.verticalHeaderItem(2).setText(QtGui.QApplication.translate("MainWindow", "New Row", None, QtGui.QApplication.UnicodeUTF8))
+ self.tableWidget.verticalHeaderItem(3).setText(QtGui.QApplication.translate("MainWindow", "New Row", None, QtGui.QApplication.UnicodeUTF8))
+ self.tableWidget.horizontalHeaderItem(0).setText(QtGui.QApplication.translate("MainWindow", "New Column", None, QtGui.QApplication.UnicodeUTF8))
+ self.tableWidget.horizontalHeaderItem(1).setText(QtGui.QApplication.translate("MainWindow", "New Column 2", None, QtGui.QApplication.UnicodeUTF8))
self.actionSubmenu.setText(QtGui.QApplication.translate("MainWindow", "Submenu", None, QtGui.QApplication.UnicodeUTF8))
self.actionSubsubmenu.setText(QtGui.QApplication.translate("MainWindow", "Subsubmenu", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/example/example_pyside_ui.pyc b/example/example_pyside_ui.pyc
deleted file mode 100644
index 4247827c0..000000000
Binary files a/example/example_pyside_ui.pyc and /dev/null differ