[Uludag-commits] r15283 - in trunk/staj-projeleri/Pakito: gui/pspecWgt gui/pspecWgt/dialogs uis/pspecWidget uis/pspecWidget/dialogs/historyDialog
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
4 Eyl 2007 Sal 16:52:43 EEST
Author: gokcen.eraslan
Date: Tue Sep 4 16:52:43 2007
New Revision: 15283
Removed:
trunk/staj-projeleri/Pakito/uis/pspecWidget/dialogs/historyDialog/
Modified:
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/additionalFileDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/comarDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/dependencyDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/fileDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/historyDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/patchDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryDialogUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryWidgetUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidgetUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidget.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidgetUI.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidget.py
trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidgetUI.py
trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui
trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui
Log:
brrrr
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/additionalFileDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/additionalFileDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/additionalFileDialogUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/additionalFileDialog/additionalFileDialogUI.ui'
#
-# Created: Sal Eyl 4 10:57:53 2007
+# Created: Sal Eyl 4 15:38:14 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/comarDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/comarDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/comarDialogUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/COMARDialog/comarDialogUI.ui'
#
-# Created: Sal Eyl 4 12:07:29 2007
+# Created: Sal Eyl 4 15:38:44 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/dependencyDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/dependencyDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/dependencyDialogUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/dependencyDialog/dependencyDialogUI.ui'
#
-# Created: Paz Eyl 2 21:36:27 2007
+# Created: Sal Eyl 4 15:38:53 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/fileDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/fileDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/fileDialogUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/fileDialog/fileDialogUI.ui'
#
-# Created: Pzt Eyl 3 10:47:28 2007
+# Created: Sal Eyl 4 15:39:05 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
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 Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/historyDialog/historyDialogUI.ui'
#
-# Created: Pzt Eyl 3 16:14:10 2007
+# Created: Sal Eyl 4 15:39:10 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
@@ -78,6 +78,7 @@
self.niRelease.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Fixed,0,0,self.niRelease.sizePolicy().hasHeightForWidth()))
self.niRelease.setValue(1)
self.niRelease.setMinValue(1)
+ self.niRelease.setMaxValue(1000)
groupBox2Layout.addWidget(self.niRelease,0,1)
spacer19 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
@@ -132,7 +133,8 @@
self.clearWState(Qt.WState_Polished)
self.setTabOrder(self.niRelease,self.leVersion)
- self.setTabOrder(self.leVersion,self.teComment)
+ self.setTabOrder(self.leVersion,self.cbType)
+ self.setTabOrder(self.cbType,self.teComment)
self.setTabOrder(self.teComment,self.leName)
self.setTabOrder(self.leName,self.leEmail)
self.setTabOrder(self.leEmail,self.btnHelp)
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/patchDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/patchDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/patchDialogUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/patchDialog/patchDialogUI.ui'
#
-# Created: Pzt Eyl 3 20:25:23 2007
+# Created: Sal Eyl 4 15:39:21 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
@@ -84,6 +84,13 @@
self.resize(QSize(374,112).expandedTo(self.minimumSizeHint()))
self.clearWState(Qt.WState_Polished)
+ self.setTabOrder(self.niLevel,self.cbType)
+ self.setTabOrder(self.cbType,self.lePatch)
+ self.setTabOrder(self.lePatch,self.pbPatch)
+ self.setTabOrder(self.pbPatch,self.btnHelp)
+ self.setTabOrder(self.btnHelp,self.btnOk)
+ self.setTabOrder(self.btnOk,self.btnCancel)
+
def languageChange(self):
self.setCaption(self.__tr("Patch"))
@@ -93,7 +100,7 @@
self.cbType.clear()
self.cbType.insertItem(QString.null)
self.cbType.insertItem(self.__tr("bz2"))
- self.cbType.insertItem(self.__tr("gzip"))
+ self.cbType.insertItem(self.__tr("gz"))
self.cbType.insertItem(self.__tr("targz"))
self.cbType.insertItem(self.__tr("tarbz2"))
self.cbType.insertItem(self.__tr("zip"))
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryDialogUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryDialogUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryDialogUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/summaryDialog/summaryDialogUI.ui'
#
-# Created: Paz Eyl 2 17:53:54 2007
+# Created: Sal Eyl 4 15:39:37 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryWidgetUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryWidgetUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/summaryWidgetUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../../uis/dialogs/summaryDialog/summaryWidgetUI.ui'
#
-# Created: Paz Eyl 2 17:54:02 2007
+# Created: Sal Eyl 4 15:39:44 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
@@ -60,6 +60,9 @@
self.resize(QSize(675,343).expandedTo(self.minimumSizeHint()))
self.clearWState(Qt.WState_Polished)
+ self.setTabOrder(self.leLanguage,self.leSummary)
+ self.setTabOrder(self.leSummary,self.teDescription)
+
def languageChange(self):
self.setCaption(self.__tr("Form1"))
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidgetUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidgetUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/historyWidgetUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../uis/pspecWidget/historyWidgetUI.ui'
#
-# Created: Pzt Eyl 3 19:09:07 2007
+# Created: Sal Eyl 4 15:37:51 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidget.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidget.py Tue Sep 4 16:52:43 2007
@@ -80,6 +80,24 @@
self.connect(self.pbBrowseCOMAR, SIGNAL("clicked()"), self.slotBrowseCOMAR)
self.connect(self.lvCOMAR, SIGNAL("executed(QListViewItem *)"), self.slotBrowseCOMAR)
+ self.isAPopup = QPopupMenu(self)
+ isAList = ["app", "app:console", "app:gui", "app:web", "|", "library", "service", "|", "data", "data:doc", "data:font", "|", "kernel", "driver", "|", "locale"]
+
+ for isa in isAList:
+ if isa == "|":
+ self.isAPopup.insertSeparator()
+ else:
+ self.isAPopup.insertItem(isa)
+ self.connect(self.pbIsA, SIGNAL("clicked()"), self.slotIsAPopup)
+ self.connect(self.isAPopup, SIGNAL("activated(int)"), self.slotIsAHandle)
+
+ self.licensePopup = QPopupMenu(self)
+ for l in ["GPL", "GPL-2", "GPL-3", "as-is", "LGPL-2", "LGPL-2.1", "BSD", "MIT", "LGPL"]:
+ self.licensePopup.insertItem(l)
+
+ self.connect(self.pbLicense, SIGNAL("clicked()"), self.slotLicensePopup)
+ self.connect(self.licensePopup, SIGNAL("activated(int)"), self.slotLicenseHandle)
+
self.lvSummary.setSorting(-1)
self.lvRuntimeDep.setSorting(-1)
self.lvReplaces.setSorting(-1)
@@ -88,6 +106,28 @@
self.lvConflicts.setSorting(-1)
self.lvCOMAR.setSorting(-1)
+ def slotLicensePopup(self):
+ self.licensePopup.exec_loop(self.pbLicense.mapToGlobal(QPoint(0,0 + self.pbLicense.height())))
+
+ def slotLicenseHandle(self, id):
+ text = str(self.licensePopup.text(id)).replace("&", "")
+ curText = str(self.leLicense.text())
+ if curText.strip() == "":
+ self.leLicense.setText(text)
+ else:
+ self.leLicense.setText("%s, %s" % (curText, text))
+
+ def slotIsAPopup(self):
+ self.isAPopup.exec_loop(self.pbIsA.mapToGlobal(QPoint(0,0 + self.pbIsA.height())))
+
+ def slotIsAHandle(self, id):
+ text = str(self.isAPopup.text(id)).replace("&", "")
+ curText = str(self.leIsA.text())
+ if curText.strip() == "":
+ self.leIsA.setText(text)
+ else:
+ self.leIsA.setText("%s, %s" % (curText, text))
+
def slotBrowseSummary(self):
lvi = self.lvSummary.selectedItem()
if not lvi:
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidgetUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidgetUI.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/packageWidgetUI.py Tue Sep 4 16:52:43 2007
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file '../../uis/pspecWidget/packageWidgetUI.ui'
#
-# Created: Pzt Eyl 3 22:16:58 2007
+# Created: Sal Eyl 4 16:44:33 2007
# by: The PyQt User Interface Compiler (pyuic) 3.17.3
#
# WARNING! All changes made in this file will be lost!
@@ -29,62 +29,10 @@
self.gbPackage.setColumnLayout(0,Qt.Vertical)
self.gbPackage.layout().setSpacing(6)
self.gbPackage.layout().setMargin(11)
- gbPackageLayout = QVBoxLayout(self.gbPackage.layout())
+ gbPackageLayout = QGridLayout(self.gbPackage.layout())
gbPackageLayout.setAlignment(Qt.AlignTop)
-
- layout30 = QGridLayout(None,1,1,0,6,"layout30")
-
- self.lblName = QLabel(self.gbPackage,"lblName")
-
- layout30.addWidget(self.lblName,0,0)
-
- self.lblsA = QLabel(self.gbPackage,"lblsA")
-
- layout30.addWidget(self.lblsA,0,3)
-
- self.lblLicense = QLabel(self.gbPackage,"lblLicense")
-
- layout30.addWidget(self.lblLicense,1,0)
-
- self.leName = KLineEdit(self.gbPackage,"leName")
-
- layout30.addWidget(self.leName,0,1)
-
- layout12 = QHBoxLayout(None,0,6,"layout12")
-
- self.leLicense = KLineEdit(self.gbPackage,"leLicense")
- layout12.addWidget(self.leLicense)
-
- self.pbLicense = KPushButton(self.gbPackage,"pbLicense")
- layout12.addWidget(self.pbLicense)
-
- layout30.addLayout(layout12,1,1)
- spacer1_2 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
- layout30.addItem(spacer1_2,1,2)
-
- self.lblPartOf = QLabel(self.gbPackage,"lblPartOf")
-
- layout30.addWidget(self.lblPartOf,1,3)
-
- layout11 = QHBoxLayout(None,0,6,"layout11")
-
- self.leIsA = KLineEdit(self.gbPackage,"leIsA")
- layout11.addWidget(self.leIsA)
-
- self.pbIsA = KPushButton(self.gbPackage,"pbIsA")
- self.pbIsA.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.pbIsA.sizePolicy().hasHeightForWidth()))
- layout11.addWidget(self.pbIsA)
-
- layout30.addLayout(layout11,0,4)
- spacer1 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
- layout30.addItem(spacer1,0,2)
-
- self.lePartOf = KLineEdit(self.gbPackage,"lePartOf")
-
- layout30.addWidget(self.lePartOf,1,4)
- gbPackageLayout.addLayout(layout30)
- spacer4 = QSpacerItem(20,2,QSizePolicy.Minimum,QSizePolicy.Fixed)
- gbPackageLayout.addItem(spacer4)
+ spacer4 = QSpacerItem(20,16,QSizePolicy.Minimum,QSizePolicy.Fixed)
+ gbPackageLayout.addItem(spacer4,2,3)
self.twPackage = QTabWidget(self.gbPackage,"twPackage")
@@ -292,24 +240,64 @@
TabPageLayout_7.addLayout(layout28,0,1)
self.twPackage.insertTab(self.TabPage_7,QString.fromLatin1(""))
- gbPackageLayout.addWidget(self.twPackage)
+
+ gbPackageLayout.addMultiCellWidget(self.twPackage,3,3,0,6)
+
+ self.lblName = QLabel(self.gbPackage,"lblName")
+
+ gbPackageLayout.addWidget(self.lblName,0,0)
+
+ self.lblsA = QLabel(self.gbPackage,"lblsA")
+
+ gbPackageLayout.addWidget(self.lblsA,0,4)
+
+ self.lblLicense = QLabel(self.gbPackage,"lblLicense")
+
+ gbPackageLayout.addWidget(self.lblLicense,1,0)
+
+ self.leName = KLineEdit(self.gbPackage,"leName")
+
+ gbPackageLayout.addMultiCellWidget(self.leName,0,0,1,2)
+ spacer1_2 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
+ gbPackageLayout.addItem(spacer1_2,1,3)
+
+ self.lblPartOf = QLabel(self.gbPackage,"lblPartOf")
+
+ gbPackageLayout.addWidget(self.lblPartOf,1,4)
+ spacer1 = QSpacerItem(20,20,QSizePolicy.Fixed,QSizePolicy.Minimum)
+ gbPackageLayout.addItem(spacer1,0,3)
+
+ self.lePartOf = KLineEdit(self.gbPackage,"lePartOf")
+
+ gbPackageLayout.addMultiCellWidget(self.lePartOf,1,1,5,6)
+
+ self.leIsA = KLineEdit(self.gbPackage,"leIsA")
+
+ gbPackageLayout.addWidget(self.leIsA,0,5)
+
+ self.pbIsA = KPushButton(self.gbPackage,"pbIsA")
+ self.pbIsA.setSizePolicy(QSizePolicy(QSizePolicy.Minimum,QSizePolicy.Minimum,0,0,self.pbIsA.sizePolicy().hasHeightForWidth()))
+
+ gbPackageLayout.addWidget(self.pbIsA,0,6)
+
+ self.leLicense = KLineEdit(self.gbPackage,"leLicense")
+
+ gbPackageLayout.addWidget(self.leLicense,1,1)
+
+ self.pbLicense = KPushButton(self.gbPackage,"pbLicense")
+
+ gbPackageLayout.addWidget(self.pbLicense,1,2)
PackageWidgetUILayout.addWidget(self.gbPackage)
self.languageChange()
- self.resize(QSize(689,440).expandedTo(self.minimumSizeHint()))
+ self.resize(QSize(602,280).expandedTo(self.minimumSizeHint()))
self.clearWState(Qt.WState_Polished)
def languageChange(self):
self.setCaption(self.__tr("Form1"))
self.gbPackage.setTitle(self.__tr("General"))
- self.lblName.setText(self.__tr("Name:"))
- self.lblsA.setText(self.__tr("Is A:"))
- self.lblLicense.setText(self.__tr("License:"))
- self.pbLicense.setText(QString.null)
- self.lblPartOf.setText(self.__tr("Part Of:"))
- self.pbIsA.setText(QString.null)
self.lvSummary.header().setLabel(0,self.__tr("Language"))
self.lvSummary.header().setLabel(1,self.__tr("Summary"))
self.lvSummary.header().setLabel(2,self.__tr("Description"))
@@ -358,6 +346,12 @@
self.pbViewCOMAR.setText(QString.null)
self.pbBrowseCOMAR.setText(QString.null)
self.twPackage.changeTab(self.TabPage_7,self.__tr("COMAR Scripts"))
+ self.lblName.setText(self.__tr("Name:"))
+ self.lblsA.setText(self.__tr("Is A:"))
+ self.lblLicense.setText(self.__tr("License:"))
+ self.lblPartOf.setText(self.__tr("Part Of:"))
+ self.pbIsA.setText(QString.null)
+ self.pbLicense.setText(QString.null)
def __tr(self,s,c = None):
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidget.py (original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidget.py Tue Sep 4 16:52:43 2007
@@ -47,8 +47,6 @@
for w in [self.pbLicense, self.pbIsA, self.pbAddSummary, self.pbAddBuildDep, self.pbAddPatch]:
w.setIconSet(il.loadIconSet("edit_add", KIcon.Toolbar))
- self.pbPackager.setIconSet(il.loadIconSet("edit_user", KIcon.Toolbar))
-
for w in [self.pbRemoveSummary, self.pbRemoveBuildDep, self.pbRemovePatch]:
w.setIconSet(il.loadIconSet("edit_remove", KIcon.Toolbar))
@@ -58,7 +56,6 @@
self.pbViewPatch.setIconSet(il.loadIconSet("filefind", KIcon.Toolbar))
self.isAPopup = QPopupMenu(self)
-
isAList = ["app", "app:console", "app:gui", "app:web", "|", "library", "service", "|", "data", "data:doc", "data:font", "|", "kernel", "driver", "|", "locale"]
for isa in isAList:
@@ -66,7 +63,6 @@
self.isAPopup.insertSeparator()
else:
self.isAPopup.insertItem(isa)
-
self.connect(self.pbIsA, SIGNAL("clicked()"), self.slotIsAPopup)
self.connect(self.isAPopup, SIGNAL("activated(int)"), self.slotIsAHandle)
Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidgetUI.py
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi