From 0e7920eb6847af01baf98c6a1379346bbba0250d Mon Sep 17 00:00:00 2001 From: ColinDuquesnoy Date: Sun, 26 Jan 2014 15:58:50 +0100 Subject: [PATCH] #4 Add a QTableWidget to the examples and a compile script for convenience --- .gitignore | 2 +- example/compile_ui.sh | 4 ++++ example/example.ui | 34 ++++++++++++++++++++++++++++++++++ example/example_pyqt_ui.py | 31 ++++++++++++++++++++++++++++++- example/example_pyqt_ui.pyc | Bin 6853 -> 7709 bytes example/example_pyside_ui.py | 27 +++++++++++++++++++++++++-- example/example_pyside_ui.pyc | Bin 6154 -> 0 bytes 7 files changed, 94 insertions(+), 4 deletions(-) create mode 100755 example/compile_ui.sh delete mode 100644 example/example_pyside_ui.pyc 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 ea70c4a08296c6828fd173a14cdf629c001101c8..3f83d787a2cadf62cd8548c00c5f84fd54dd50d9 100644 GIT binary patch delta 1253 zcmaJ=OHUI~6h3#R(%1qi1=|ktE?^PZm=HHUc_^h&>0mICL{gjy^rp12b88b*(nVS5 z*1Iz?Ec6eU{s9-VF>#B=l^eG%B+bzb92A*ednFopL%`Gs~)!b_6EPd z^RBAO+w-+`HQ}uQ2nNOwR2jXj48X4gzX3+H8Q%nB*v3KyehaDqI||gbx4{TNS%Ino z>|}c6bh^UPJ$gD%^ynG%^x4UgZX~C2uL5tc*G=6DbpiN{ZJ4C?P_jO2!&%^SU|a$t zX7@$DXmW-%MpAcJjfk`ItFOOu=O`E}GvIeY3;~}99;Zs26nvsFs|7$&J#oTzO}JSu zyIE+a&ALTfx9IA|T^-d}83n#n=iLfNTvLLS_J$iKlqYGME-~P0QE`m8S1*)NJIlaR zE;ayGViN$66h463Z~r$I^&=GNjjZ_~V{Dotqae@#`IdWeM70- zKa%TX$cuJ7EK|(nv&HS)Oum>Cg2JLn&zBq=K%8oFj0u}XW&3lnEcrBp*O?=__VUl zlRo((IHi2?)ZPc*sH|J|b%td&6!2=myTLdo2Rpl(aEpsQ#LGQLOyHvJ`8?F>r=60a z?!BM^&bz8M_SFO2XaB(X4`YgBTyGPH0U8|MR$@K!Rp?XP@?w8UvowG+wQzm*-5I$> z6Cuih16KrTSBe|kX0Ax9rn}|9SfAVtKVj?gSGY81Z!d`a)Bjh{h32gj=C3<*MmFZb wLw_W9A`=*IM~nN`(6EP}wI%;XQZlGTWKtV$Nt13(CcBs9zShBZVN{}81*+x1f*exO<4vm`-nR8DP zCl1oHn;s=j&W=tl{sA+?5+pmDncwrg&-+fMI9Tp;tM6XV<#GAWy{IZ@Ri#yR#@#dw zvl(Ut1qI{?phKWQp1^EDf$)!AR@a{hp$oJhVlyBF=`}z{B;`qF=()*PujP$Dah9c7O@Y>w3xUeI=1f0Q+lOd)Zuo@AB3Bw_|N@SXtYStyww3 z&#c#{lbKS+x2||oKU%t-&H6L04(>=B?AHIRynvn7KCsQY9_3jr73;24_7n&uz}a05KwWi~s-t 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 4247827c01e39b3cb111c90c22b095aefee84242..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6154 zcmcgwYg-h_6|M$EMUXoP-te;PL{#t=j4>Mp)V&~adL*0pWu9ibkj7zpGF_wMv-`>X zwS3Qi$qz{0^Hz8D^bF)#p6nA~YWkdd&$Ui3+52sjy%DU8yfh{q^mD3I|lBbOJ)rzwuM*!;=}rP&R9E zOB2ZcKveV<<5~jN4c}Ta_5}fTv2YGN$p)$Wuxp^e%7`T(u(2jw z2v<|NG}YHgUL$C-3v^9rS+wf}T_?yUU$*F1xh8JFuRFZE!MPihn6@E8qLgx>mJ+|| zkhsaYo0P~G3NHY>9N@wtrx!Ur>-@CEwV3&Ni=bNs<%@>hZ*|<}^leVhIURRW&1tMl zB$o)v7Y9PN_Lh#4Tc+GH<<1i%*>`fwN6Fo#++E6D=#{(ca?`&pT3R8wLeOQW7W5+(E*wcism<7m)BC%k-p3>#Q|}e0 z$H_f*a=$OiJt6r-?fpT8S5=5A#Tg;V1`DNry;s!}$8yPd=vXMZZ*l|NcYoxTdaCxG zsqiZSiuRlCEL!a-+cnOu(el^SDI2~Mu};J~5jUJwY^LYwgzN?}fK6ywYYydDfWMGM z%dpth77IjS;$`ZaCohF>)!ug*jRUz-D&f4{G(#BkQ#@Me$JzfE9Lqf6Yr0`tLH%PC zzSG7`0J4CD58U00e>L!vwjiDHIr7UKQwSmrUU$T9kp zVaBCv`w-OIIyxtF5>&Glzia6vSq)l|G;FjJ)JzmN(p)eo$4P90O5bPLM4LZt@9CP^ z4E8l!M5v2CYoFRA;bog7e?UaUX8BvVXRF2+mzeAF%d~QQX#p+n&pA#MS=>fiKfWwE zSwR@4HAL+juBLohL^Fz^oHM^Odf%69`+~Mj?S|BpFKfcYm;Jo5d}(m4<+ZfFe964^ z@Qtf7U(8rrIa6#gf5_6B-9o9S;(S?34~h4s)~OG$mpVosTL(UP%J$hlvTL72z#qqi zFI$i`1Cdk>$#R7?D_SQ7A~6BtxYli{;dE7|MBB6sGcwF#u$b4bI(?}YUpA00tvm~_ zyxv)h{(0d`wy_rJ%3jD=<+ZdT{fokql>~~Z5sC7fv^@RGGA$05U*}cnUlFb>6~X|& ziFe8YO@U66DN6*Ec~p4YLW`lNIrmvh2Q*)P#sc@R0_9)BkhyO8Or*R9Qc~38&eIAS zNj)%nE3yfCrA=Tj+-P8-D)rbTs|T_hN_d4TBW0iH`i@UZiaSD8RF_M5QXG;; zcv{-Ux-ZpYydIaz>p|;%#T;O-?`mz9w0-kr-__y3D0-UL3=U7tyE#=!0To%Ad}LtCnIoPah#iPozfI;|Buj;8$VyHh@Up7gR=v7d3L zsaf<-dY9?9_%76(H`h1fx$B`6&zeMe3oj0PJv3+`c@@N+QvQ%~%Rz^iH@xVhPi7PS z#GxfV9Eyt{TOqXRasY!Ik^;;QSTNR!Kx-yQ9AX)|tU z#SFG~PXL1ZdAgBMlm0U0g}wi=d7PW>h*u z$))H+CT&M5-m&3ii)mX*iEdX1p>DBd5{QYL8~TH;3nOm_yV^9{ZKaKqAZf<6JZw(< zO))4-WF%|V!as7W)ua#?dle4Di{*Hlfe;;su#als7 zkntA1JNRAnN|H=gT(#Oj&sD9md#hIWAwbmHgo@fg&<^q$WkO?f6zPqev|(# nXL-LqsGvP#18;9ZQo=DWNxsPanvO8^CpOq`q*M~IFw^%R^*o)O