[Uludag-commits] r15656 - in trunk/staj-projeleri/Pakito/pakito: . gui/pspecWidget gui/pspecWidget/dialogs
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
5 Eki 2007 Cum 14:56:22 EEST
Author: gokcen.eraslan
Date: Fri Oct 5 14:56:21 2007
New Revision: 15656
Modified:
trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/dialogs/dependencyDialogUI.ui
trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/packageWidgetUI.ui
trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/pspecWidget.py
trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidget.py
trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidgetUI.ui
trunk/staj-projeleri/Pakito/pakito/xmlUtil.py
Log:
xmlutil read method, update fix code->design switch
Modified: trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/dialogs/dependencyDialogUI.ui
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/dialogs/dependencyDialogUI.ui (original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/dialogs/dependencyDialogUI.ui Fri Oct 5 14:56:21 2007
@@ -218,12 +218,12 @@
</grid>
</widget>
<tabstops>
- <tabstop>cbRelease</tabstop>
- <tabstop>cbToFrom</tabstop>
- <tabstop>leCondition</tabstop>
<tabstop>leDependency</tabstop>
<tabstop>btnOk</tabstop>
<tabstop>btnCancel</tabstop>
+ <tabstop>cbRelease</tabstop>
+ <tabstop>cbToFrom</tabstop>
+ <tabstop>leCondition</tabstop>
<tabstop>btnHelp</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
Modified: trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/packageWidgetUI.ui
=================================================================
Suppressed!
Too long (more than 250 lines) diff output suppressed...
Modified: trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/pspecWidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/pspecWidget.py (original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/pspecWidget.py Fri Oct 5 14:56:21 2007
@@ -136,6 +136,7 @@
def syncFromCode(self):
self.editor.save()
self.pspec.read(self.editor.editedFile)
+ self.xmlUtil.read() #parse new changes made by editor
def syncFromDesign(self):
self.xmlUtil.write()
Modified: trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidget.py (original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidget.py Fri Oct 5 14:56:21 2007
@@ -27,8 +27,7 @@
self.lePackager.setPaletteForegroundColor(QColor("black"))
self.lePackager.setPaletteBackgroundColor(QColor("white"))
- #self.lePackager.setValidator(QRegExpValidator(QRegExp(r"^[A-Za-z0-9._%+-]+@[A-Za-z0-9-]+\.[A-Za-z]{2,4}$"), self))
-
+
self.connect(self.pbAddSummary, SIGNAL("clicked()"), self.slotAddSummary)
self.connect(self.pbRemoveSummary, SIGNAL("clicked()"), self.slotRemoveSummary)
self.connect(self.pbBrowseSummary, SIGNAL("clicked()"), self.slotBrowseSummary)
Modified: trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidgetUI.ui
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidgetUI.ui (original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/pspecWidget/sourceWidgetUI.ui Fri Oct 5 14:56:21 2007
@@ -177,6 +177,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Add a common license</string>
+ </property>
</widget>
<widget class="KPushButton" row="0" column="6">
<property name="name">
@@ -193,6 +196,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Choose a category</string>
+ </property>
</widget>
<widget class="KLineEdit" row="0" column="5">
<property name="name">
@@ -492,6 +498,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Add new summary/description</string>
+ </property>
</widget>
<widget class="KPushButton">
<property name="name">
@@ -500,6 +509,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Remove selected summary/description</string>
+ </property>
</widget>
<spacer>
<property name="name">
@@ -525,6 +537,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Edit summary/description</string>
+ </property>
</widget>
</vbox>
</widget>
@@ -597,6 +612,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Add build dependency</string>
+ </property>
</widget>
<widget class="KPushButton">
<property name="name">
@@ -605,6 +623,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Remove build dependency</string>
+ </property>
</widget>
<spacer>
<property name="name">
@@ -630,6 +651,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Edit build dependency</string>
+ </property>
</widget>
</vbox>
</widget>
@@ -713,6 +737,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Add patch</string>
+ </property>
</widget>
<widget class="KPushButton">
<property name="name">
@@ -721,6 +748,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Remove patch</string>
+ </property>
</widget>
<spacer>
<property name="name">
@@ -746,6 +776,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Open patch file</string>
+ </property>
</widget>
<widget class="KPushButton">
<property name="name">
@@ -754,6 +787,9 @@
<property name="text">
<string></string>
</property>
+ <property name="toolTip" stdset="0">
+ <string>Edit patch entry</string>
+ </property>
</widget>
</vbox>
</widget>
@@ -764,8 +800,6 @@
</widget>
</hbox>
</widget>
-<customwidgets>
-</customwidgets>
<tabstops>
<tabstop>leName</tabstop>
<tabstop>leHomepage</tabstop>
Modified: trunk/staj-projeleri/Pakito/pakito/xmlUtil.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/xmlUtil.py (original)
+++ trunk/staj-projeleri/Pakito/pakito/xmlUtil.py Fri Oct 5 14:56:21 2007
@@ -8,20 +8,7 @@
class XmlUtil:
""" class with comment support and some utilities"""
def __init__(self, xmlFileName):
- global commentString
-
- self.xmlFile = xmlFileName
- xmlFile = open(xmlFileName)
-
- exp = re.compile("<!--(.*?)-->", re.S)
- newPspec = re.sub(exp, r"<%s>\1</%s>" % (commentString, commentString), xmlFile.read())
- newPspec = newPspec.replace("&", "&")
-
- #TODO: escape all html chars. inside new comment tag
- # and don't forget to revert before write
-
- xmlFile.close()
- self.doc = piksemel.parseString(newPspec)
+ self.read(xmlFileName)
def getTagByPath(self, *path):
""" get tag by path. e.g getTagByPath("Source", "Packager", "Name") give the Name tag """
@@ -93,10 +80,20 @@
f = open(self.xmlFile, "w")
f.write(newPspec)
f.close()
-
-
-
-
-
-
+
+ def read(self, xmlFileName = None):
+ if xmlFileName:
+ self.xmlFile = xmlFileName
+
+ xmlFile = open(self.xmlFile)
+
+ exp = re.compile("<!--(.*?)-->", re.S)
+ newPspec = re.sub(exp, r"<%s>\1</%s>" % (commentString, commentString), xmlFile.read())
+ newPspec = newPspec.replace("&", "&")
+
+ #TODO: escape all html chars. inside new comment tag
+ # and don't forget to revert before write
+
+ xmlFile.close()
+ self.doc = piksemel.parseString(newPspec)
\ No newline at end of file
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi