[Uludag-commits] r15270 - in trunk/staj-projeleri/Pakito: gui/pspecWgt gui/pspecWgt/dialogs uis/dialogs/historyDialog
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
3 Eyl 2007 Pzt 16:14:31 EEST
Author: gokcen.eraslan
Date: Mon Sep 3 16:14:31 2007
New Revision: 15270
Modified:
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py
trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui
Log:
history dialog
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialog.py Mon Sep 3 16:14:31 2007
@@ -5,12 +5,28 @@
from historyDialogUI import HistoryDialogUI
class HistoryDialog(HistoryDialogUI):
- def __init__(self, parent = None, release = None, name = None):
+ def __init__(self, parent = None, release = None, relValue = 1, name = None):
HistoryDialogUI.__init__(self, parent, name)
+ self.dwDate.setDate(QDate.currentDate())
+ self.niRelease.setValue(relValue)
self.connect(self.btnOk, SIGNAL("clicked()"), self, SLOT("accept()"))
self.connect(self.btnCancel, SIGNAL("clicked()"), self, SLOT("reject()"))
if release:
self.niRelease.setValue(int(release[0]))
+ self.dwDate.setDate(QDate.fromString(release[1], Qt.ISODate))
+ self.leVersion.setText(release[2])
+ self.cbType.setCurrentText(release[3])
+ self.teComment.setText(release[4])
+ self.leName.setText(release[5])
+ self.leEmail.setText(release[6])
def getResult(self):
- pass
+ res = []
+ res.append(str(self.niRelease.value()))
+ res.append(str(self.dwDate.date().toString("yyyy-MM-dd")))
+ res.append(str(self.leVersion.text()))
+ res.append(str(self.cbType.currentText()))
+ res.append(unicode(self.teComment.text()))
+ res.append(unicode(self.leName.text()))
+ res.append(str(self.leEmail.text()))
+ return res
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py Mon Sep 3 16:14:31 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/historyDialog/historyDialogUI.ui'
#
-# Created: Pzt Eyl 3 00:50:25 2007
+# Created: Pzt Eyl 3 16:14:10 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
@@ -44,10 +44,6 @@
groupBox2Layout.addWidget(self.textLabel8,1,0)
- self.leType = KLineEdit(self.groupBox2,"leType")
-
- groupBox2Layout.addWidget(self.leType,1,4)
-
layout22 = QVBoxLayout(None,0,6,"layout22")
self.textLabel9 = QLabel(self.groupBox2,"textLabel9")
@@ -61,27 +57,31 @@
groupBox2Layout.addWidget(self.leVersion,1,1)
- self.niRelease = KIntNumInput(self.groupBox2,"niRelease")
- self.niRelease.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.niRelease.sizePolicy().hasHeightForWidth()))
- self.niRelease.setValue(1)
- self.niRelease.setMinValue(1)
-
- groupBox2Layout.addWidget(self.niRelease,0,1)
-
self.dwDate = KDateWidget(self.groupBox2,"dwDate")
self.dwDate.setDate(QDate(2006,1,1))
groupBox2Layout.addWidget(self.dwDate,0,4)
- spacer19 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
- groupBox2Layout.addItem(spacer19,0,2)
self.teComment = KTextEdit(self.groupBox2,"teComment")
groupBox2Layout.addMultiCellWidget(self.teComment,2,2,1,4)
+ self.cbType = KComboBox(0,self.groupBox2,"cbType")
+
+ groupBox2Layout.addWidget(self.cbType,1,4)
+
self.textLabel6 = QLabel(self.groupBox2,"textLabel6")
groupBox2Layout.addWidget(self.textLabel6,0,0)
+
+ self.niRelease = KIntNumInput(self.groupBox2,"niRelease")
+ self.niRelease.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.niRelease.sizePolicy().hasHeightForWidth()))
+ self.niRelease.setValue(1)
+ self.niRelease.setMinValue(1)
+
+ groupBox2Layout.addWidget(self.niRelease,0,1)
+ spacer19 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
+ groupBox2Layout.addItem(spacer19,0,2)
HistoryDialogUILayout.addWidget(self.groupBox2)
self.groupBox3 = QGroupBox(self,"groupBox3")
@@ -105,7 +105,7 @@
self.leEmail = KLineEdit(self.groupBox3,"leEmail")
groupBox3Layout.addWidget(self.leEmail)
HistoryDialogUILayout.addWidget(self.groupBox3)
- spacer25 = QSpacerItem(20,40,QSizePolicy.Minimum,QSizePolicy.Expanding)
+ spacer25 = QSpacerItem(20,10,QSizePolicy.Minimum,QSizePolicy.Fixed)
HistoryDialogUILayout.addItem(spacer25)
Layout1 = QHBoxLayout(None,0,6,"Layout1")
@@ -128,12 +128,11 @@
self.languageChange()
- self.resize(QSize(550,377).expandedTo(self.minimumSizeHint()))
+ self.resize(QSize(550,421).expandedTo(self.minimumSizeHint()))
self.clearWState(Qt.WState_Polished)
self.setTabOrder(self.niRelease,self.leVersion)
- self.setTabOrder(self.leVersion,self.leType)
- self.setTabOrder(self.leType,self.teComment)
+ self.setTabOrder(self.leVersion,self.teComment)
self.setTabOrder(self.teComment,self.leName)
self.setTabOrder(self.leName,self.leEmail)
self.setTabOrder(self.leEmail,self.btnHelp)
@@ -148,6 +147,10 @@
self.textLabel7.setText(self.__tr("Date:"))
self.textLabel8.setText(self.__tr("Version:"))
self.textLabel9.setText(self.__tr("Comment:"))
+ self.cbType.clear()
+ self.cbType.insertItem(QString.null)
+ self.cbType.insertItem(self.__tr("bug"))
+ self.cbType.insertItem(self.__tr("security"))
self.textLabel6.setText(self.__tr("Release:"))
self.groupBox3.setTitle(self.__tr("Updater"))
self.textLabel10.setText(self.__tr("Name:"))
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidget.py Mon Sep 3 16:14:31 2007
@@ -10,6 +10,7 @@
from pisi.replace import Replace
from historyWidgetUI import HistoryWidgetUI
+from dialogs.historyDialog import HistoryDialog
class historyWidget(HistoryWidgetUI):
def __init__(self, parent):
@@ -30,20 +31,38 @@
rel.type = ""
lvi = KListViewItem(self.lvHistory, rel.release,
rel.date, rel.version,
- rel.comment, rel.name,
+ unicode(rel.comment), rel.name,
rel.email, rel.type)
if reverse:
lvi.moveItem(self.lvHistory.lastItem())
def slotAddHistory(self):
- pass
+ dia = HistoryDialog(self, relValue = self.lvHistory.childCount() + 1)
+ if dia.exec_loop() == QDialog.Accepted:
+ res = dia.getResult()
+ lvi = QListViewItem(self.lvHistory, res[0], res[1], res[2], res[4], res[5], res[6], res[3])
def slotRemoveHistory(self):
- pass
+ lvi = self.lvHistory.selectedItem()
+ if lvi:
+ self.lvHistory.takeItem(lvi)
def slotBrowseHistory(self):
- pass
-
+ lvi = self.lvHistory.selectedItem()
+ if not lvi:
+ return
+ dia = HistoryDialog(self, [str(lvi.text(0)), str(lvi.text(1)), str(lvi.text(2)), str(lvi.text(6)), unicode(lvi.text(3)), unicode(lvi.text(4)), str(lvi.text(5))])
+ if dia.exec_loop() == QDialog.Rejected:
+ return
+ res = dia.getResult()
+ lvi.setText(0, res[0])
+ lvi.setText(1, res[1])
+ lvi.setText(2, res[2])
+ lvi.setText(3, res[4])
+ lvi.setText(4, res[5])
+ lvi.setText(5, res[6])
+ lvi.setText(6, res[3])
+
def fill(self, history):
self.lvHistory.clear()
for rel in history:
Modified: trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui
=================================================================
--- trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui (original)
+++ trunk/staj-projeleri/Pakito/uis/dialogs/historyDialog/historyDialogUI.ui Mon Sep 3 16:14:31 2007
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>550</width>
- <height>377</height>
+ <height>421</height>
</rect>
</property>
<property name="caption">
@@ -71,11 +71,6 @@
<string>Version:</string>
</property>
</widget>
- <widget class="KLineEdit" row="1" column="4">
- <property name="name">
- <cstring>leType</cstring>
- </property>
- </widget>
<widget class="QLayoutWidget" row="2" column="0">
<property name="name">
<cstring>layout22</cstring>
@@ -116,6 +111,51 @@
<cstring>leVersion</cstring>
</property>
</widget>
+ <widget class="KDateWidget" row="0" column="4">
+ <property name="name">
+ <cstring>dwDate</cstring>
+ </property>
+ <property name="date">
+ <date>
+ <year>2006</year>
+ <month>1</month>
+ <day>1</day>
+ </date>
+ </property>
+ </widget>
+ <widget class="KTextEdit" row="2" column="1" rowspan="1" colspan="4">
+ <property name="name">
+ <cstring>teComment</cstring>
+ </property>
+ </widget>
+ <widget class="KComboBox" row="1" column="4">
+ <item>
+ <property name="text">
+ <string></string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>bug</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>security</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>cbType</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+ <cstring>textLabel6</cstring>
+ </property>
+ <property name="text">
+ <string>Release:</string>
+ </property>
+ </widget>
<widget class="KIntNumInput" row="0" column="1">
<property name="name">
<cstring>niRelease</cstring>
@@ -135,18 +175,6 @@
<number>1</number>
</property>
</widget>
- <widget class="KDateWidget" row="0" column="4">
- <property name="name">
- <cstring>dwDate</cstring>
- </property>
- <property name="date">
- <date>
- <year>2006</year>
- <month>1</month>
- <day>1</day>
- </date>
- </property>
- </widget>
<spacer row="0" column="2">
<property name="name">
<cstring>spacer19</cstring>
@@ -164,19 +192,6 @@
</size>
</property>
</spacer>
- <widget class="KTextEdit" row="2" column="1" rowspan="1" colspan="4">
- <property name="name">
- <cstring>teComment</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>textLabel6</cstring>
- </property>
- <property name="text">
- <string>Release:</string>
- </property>
- </widget>
</grid>
</widget>
<widget class="QGroupBox">
@@ -243,12 +258,12 @@
<enum>Vertical</enum>
</property>
<property name="sizeType">
- <enum>Expanding</enum>
+ <enum>Fixed</enum>
</property>
<property name="sizeHint">
<size>
<width>20</width>
- <height>40</height>
+ <height>10</height>
</size>
</property>
</spacer>
@@ -332,10 +347,11 @@
</widget>
</vbox>
</widget>
+<customwidgets>
+</customwidgets>
<tabstops>
<tabstop>niRelease</tabstop>
<tabstop>leVersion</tabstop>
- <tabstop>leType</tabstop>
<tabstop>teComment</tabstop>
<tabstop>leName</tabstop>
<tabstop>leEmail</tabstop>
@@ -347,11 +363,11 @@
<includehints>
<includehint>kdialog.h</includehint>
<includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>knuminput.h</includehint>
- <includehint>knuminput.h</includehint>
<includehint>kdatewidget.h</includehint>
<includehint>ktextedit.h</includehint>
+ <includehint>kcombobox.h</includehint>
+ <includehint>knuminput.h</includehint>
+ <includehint>knuminput.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi