[Pymoul-svn] SF.net SVN: pymoul: [172] pymoul/trunk/src/moul/qt
Status: Alpha
Brought to you by:
tiran
|
From: <ti...@us...> - 2007-02-15 12:30:31
|
Revision: 172
http://pymoul.svn.sourceforge.net/pymoul/?rev=172&view=rev
Author: tiran
Date: 2007-02-15 04:30:31 -0800 (Thu, 15 Feb 2007)
Log Message:
-----------
Much better alignement of D'ni numbers
Modified Paths:
--------------
pymoul/trunk/src/moul/qt/mainwindow.py
pymoul/trunk/src/moul/qt/ui/mainwindow.py
pymoul/trunk/src/moul/qt/ui/mainwindow.ui
Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py 2007-02-15 03:14:42 UTC (rev 171)
+++ pymoul/trunk/src/moul/qt/mainwindow.py 2007-02-15 12:30:31 UTC (rev 172)
@@ -505,48 +505,51 @@
LOG.error("Ping thread is already running")
def _dninumbers_init(self):
- # XXX needs better alignment
widget = self.gridLayout_3
grid = self.gridlayout3
- alignvcr = QtCore.Qt.AlignRight | QtCore.Qt.AlignVCenter
+ alignl = QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter
+ alignc = QtCore.Qt.AlignCenter | QtCore.Qt.AlignVCenter
for i in range(0, 5):
for j in range(0, 5):
nr = QtGui.QLabel(widget)
nr.setObjectName("lb_dninumber_nr_%02i_%02i" % (i, j))
- nr.setAlignment(alignvcr)
+ nr.setAlignment(alignc)
nr.setText(str(i + j*5))
grid.addWidget(nr, j, i*2)
- dni = QtGui.QLabel(widget)
- dni.setObjectName("lb_dninumber_%02i_%02i" % (i, j))
dni_pic = QtGui.QPixmap(":/dninumbers/resources/dninumbers/%02i.png" % (i + j*5))
#dni_pic.scale(20, 20, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
dni_pic = dni_pic.scaledToHeight(30, QtCore.Qt.SmoothTransformation)
+ dni = QtGui.QLabel(widget)
+ dni.setObjectName("lb_dninumber_%02i_%02i" % (i, j))
dni.setPixmap(dni_pic)
+ dni.setAlignment(alignl)
grid.addWidget(dni, j, i*2+1)
nr = QtGui.QLabel(widget)
nr.setObjectName("lb_dninumber_nr_25")
- nr.setAlignment(alignvcr)
+ nr.setAlignment(alignc)
nr.setText("25")
- grid.addWidget(nr, 5, 3)
+ grid.addWidget(nr, 5, 2)
+ dni_pic = QtGui.QPixmap(":/dninumbers/resources/dninumbers/25.png")
+ dni_pic = dni_pic.scaledToHeight(30, QtCore.Qt.SmoothTransformation)
dni = QtGui.QLabel(widget)
dni.setObjectName("lb_dninumber_25")
- dni_pic = QtGui.QPixmap(":/dninumbers/resources/dninumbers/25.png")
- dni_pic = dni_pic.scaledToHeight(30, QtCore.Qt.SmoothTransformation)
+ dni.setAlignment(alignl)
dni.setPixmap(dni_pic)
- grid.addWidget(dni, 5, 4)
+ grid.addWidget(dni, 5, 3)
nr = QtGui.QLabel(widget)
nr.setObjectName("lb_dninumber_nr_00c")
- nr.setAlignment(alignvcr)
+ nr.setAlignment(alignc)
nr.setText("cyclic 0")
- grid.addWidget(nr, 5, 5)
+ grid.addWidget(nr, 5, 5, 1, 2)
+ dni_pic = QtGui.QPixmap(":/dninumbers/resources/dninumbers/00c.png")
+ dni_pic = dni_pic.scaledToHeight(30, QtCore.Qt.SmoothTransformation)
dni = QtGui.QLabel(widget)
dni.setObjectName("lb_dninumber_00c")
- dni_pic = QtGui.QPixmap(":/dninumbers/resources/dninumbers/00c.png")
- dni_pic = dni_pic.scaledToHeight(30, QtCore.Qt.SmoothTransformation)
+ dni.setAlignment(alignl)
dni.setPixmap(dni_pic)
- grid.addWidget(dni, 5, 6)
+ grid.addWidget(dni, 5, 7)
class PingServerThread(QtCore.QThread):
def __init__(self, parent=None):
Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-02-15 03:14:42 UTC (rev 171)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-02-15 12:30:31 UTC (rev 172)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file './src/moul/qt/ui/mainwindow.ui'
#
-# Created: Thu Feb 15 03:57:16 2007
+# Created: Thu Feb 15 13:28:03 2007
# by: PyQt4 UI code generator 4.1.1
#
# WARNING! All changes made in this file will be lost!
@@ -875,7 +875,7 @@
self.gb_dninumbers.setObjectName("gb_dninumbers")
self.gridLayout_3 = QtGui.QWidget(self.gb_dninumbers)
- self.gridLayout_3.setGeometry(QtCore.QRect(10,20,431,341))
+ self.gridLayout_3.setGeometry(QtCore.QRect(10,20,411,341))
self.gridLayout_3.setObjectName("gridLayout_3")
self.gridlayout3 = QtGui.QGridLayout(self.gridLayout_3)
@@ -930,9 +930,9 @@
self.lb_doc_status.setBuddy(self.pb_doc_loadjournals)
self.retranslateUi(MainWindow)
- self.tabwidget.setCurrentIndex(3)
+ self.tabwidget.setCurrentIndex(0)
self.tab_sub_settings.setCurrentIndex(0)
- self.tabWidget.setCurrentIndex(2)
+ self.tabWidget.setCurrentIndex(0)
self.tabwidget_about.setCurrentIndex(0)
QtCore.QObject.connect(self.main_buttonbox,QtCore.SIGNAL("rejected()"),MainWindow.close)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.ui
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-02-15 03:14:42 UTC (rev 171)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-02-15 12:30:31 UTC (rev 172)
@@ -110,7 +110,7 @@
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex" >
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab_tasks" >
<attribute name="title" >
@@ -1648,7 +1648,7 @@
</rect>
</property>
<property name="currentIndex" >
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab_sub_chatlogs" >
<attribute name="title" >
@@ -1891,7 +1891,7 @@
<rect>
<x>10</x>
<y>20</y>
- <width>431</width>
+ <width>411</width>
<height>341</height>
</rect>
</property>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|