[Uludag-commits] r15276 - in trunk/staj-projeleri/Pakito: gui gui/pspecWgt gui/pspecWgt/dialogs uis/dialogs/patchDialog uis/pspecWidget

uludag-commits at pardus.org.tr uludag-commits at pardus.org.tr
4 Eyl 2007 Sal 09:07:17 EEST


Author: gokcen.eraslan
Date: Tue Sep  4 09:07:17 2007
New Revision: 15276

Added:
   trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/patchDialog.py
   trunk/staj-projeleri/Pakito/gui/pspecWgt/dialogs/patchDialogUI.py
   trunk/staj-projeleri/Pakito/uis/dialogs/patchDialog/
   trunk/staj-projeleri/Pakito/uis/dialogs/patchDialog/patchDialogUI.ui
Modified:
   trunk/staj-projeleri/Pakito/gui/mainwindow.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/gui/pspecWidget.py
   trunk/staj-projeleri/Pakito/uis/pspecWidget/historyWidgetUI.ui
   trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui
   trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui
Log:
filedialog fix and patch gui

Modified: trunk/staj-projeleri/Pakito/gui/mainwindow.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/mainwindow.py	(original)
+++ trunk/staj-projeleri/Pakito/gui/mainwindow.py	Tue Sep  4 09:07:17 2007
@@ -11,6 +11,7 @@
 from kdeui import *
 from kdecore import *
 from kparts import KParts
+from kfile import KFileDialog
 
 # System imports
 import os
@@ -263,26 +264,25 @@
         self.enableOperations()
         
     def open(self):
-    
 	    # ask for directory of package - TODO: değiştirmeli mi?
-        fileDialog = QFileDialog(self, "dialog", True)
-        fileDialog.setMode(QFileDialog.DirectoryOnly)
-        fileDialog.setCaption(i18n("Select PiSi Source Package"))
-        if not fileDialog.exec_loop():
-            return
-        packageDir = str(fileDialog.selectedFile())
+        packageDir = KFileDialog.getExistingDirectory(QString.null, self, i18n("Select PiSi Source Package"))
         
+        if not packageDir or packageDir == "":
+            return
+        else:
+            packageDir = unicode(packageDir) + "/"
+
         try: 
             self.pspecFile = open(packageDir + "pspec.xml", "r") 
         except:
-            QMessageBox.warning(self, i18n("Error"), i18n("No pspec.xml found."), QMessageBox.Ok)
+            KMessageBox.sorry(self, i18n("No pspec.xml found."), i18n("Error"))
             return
         self.pspecFile.close()
         
         try: 
             self.actionspyFile = open(packageDir + "actions.py", "r")
         except:
-            QMessageBox.warning(self, i18n("Error"), i18n("No actions.py found."), QMessageBox.Ok)
+            KMessageBox.sorry(self, i18n("Error"), i18n("No pspec.xml found."))
             return
         self.actionspyFile.close()
         
@@ -295,8 +295,7 @@
         if not os.path.isdir(tempDir):
             os.mkdir(tempDir)
         
-        hede, packageName = os.path.split(packageDir[:-1])
-        del hede
+        packageName = os.path.split(packageDir[:-1])[1]
         self.tempDir = tempDir + packageName
         if os.path.isdir(self.tempDir):
             shutil.rmtree(self.tempDir)
@@ -307,7 +306,7 @@
         self.pspecTab = PspecWidget(self.twTabs, os.path.join(self.tempDir, "pspec.xml"))
         
         if self.pspecTab == None: 
-            QMessageBox.critical(self, i18n("Invalid file"), i18n("pspec.xml is not valid or well-formed."))
+            KMessageBox.sorry(self, i18n("Invalid File"), i18n("pspec.xml is not valid or well-formed"))
             return
         
         self.actionsTab = ActionsWidget(self.twTabs, os.path.join(self.tempDir, "actions.py"))
@@ -327,12 +326,10 @@
             return
         
         if self.realDir == None:
-            fileDialog = QFileDialog(self, "dialog", True)
-            fileDialog.setMode(QFileDialog.DirectoryOnly)
-            fileDialog.setCaption(i18n("Select PiSi Source Package Directory"))
-            if not fileDialog.exec_loop():
+            packageDir = KFileDialog.getExistingDirectory(QString.null, self, i18n("Select PiSi Source Package Directory"))
+            if not packageDir or str(packageDir) == "":
                 return
-            self.realDir = unicode(fileDialog.selectedFile())
+            self.realDir = unicode(packageDir)
             
         if all == True:
             self.changePspecTab(False)        

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 09:07:17 2007
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '../../uis/pspecWidget/historyWidgetUI.ui'
 #
-# Created: Paz Eyl 2 20:08:30 2007
+# Created: Pzt Eyl 3 19:09:07 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.17.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -58,7 +58,7 @@
 
         self.languageChange()
 
-        self.resize(QSize(640,395).expandedTo(self.minimumSizeHint()))
+        self.resize(QSize(485,533).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
 

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 09:07:17 2007
@@ -30,6 +30,9 @@
             for w in [self.pbBrowseRuntimeDep, self.pbBrowseSummary, self.pbBrowseReplaces, self.pbBrowseFile, self.pbBrowseAdditional, self.pbBrowseConflict, self.pbBrowseCOMAR]:
                 w.setIconSet(il.loadIconSet("fileopen", KIcon.Toolbar))
 
+            self.pbViewCOMAR.setIconSet(il.loadIconSet("filefind", KIcon.Toolbar))
+            self.pbViewAdditional.setIconSet(il.loadIconSet("filefind", KIcon.Toolbar))
+
             self.connect(self.pbAddSummary, SIGNAL("clicked()"), self.slotAddSummary)
             self.connect(self.pbRemoveSummary, SIGNAL("clicked()"), self.slotRemoveSummary)
             self.connect(self.pbBrowseSummary, SIGNAL("clicked()"), self.slotBrowseSummary)
@@ -329,7 +332,7 @@
                 package.providesComar.insert(0,comar)
                 iterator += 1
 
-    def __init__(self, parent):
+    def __init__(self, parent, fileLoc = None):
         QWidget.__init__(self, parent)
         pageLayout = QVBoxLayout(self, 6, 11)
         topLayout = QHBoxLayout(pageLayout, 5)

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 09:07:17 2007
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '../../uis/pspecWidget/packageWidgetUI.ui'
 #
-# Created: Paz Eyl 2 20:37:39 2007
+# Created: Pzt Eyl 3 22:16:58 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.17.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -208,27 +208,30 @@
         self.lvAdditionalFiles.header().setClickEnabled(0,self.lvAdditionalFiles.header().count() - 1)
         self.lvAdditionalFiles.addColumn(self.__tr("Permission"))
         self.lvAdditionalFiles.header().setClickEnabled(0,self.lvAdditionalFiles.header().count() - 1)
-        self.lvAdditionalFiles.addColumn(self.__tr("File"))
-        self.lvAdditionalFiles.header().setClickEnabled(0,self.lvAdditionalFiles.header().count() - 1)
         self.lvAdditionalFiles.addColumn(self.__tr("Target"))
         self.lvAdditionalFiles.header().setClickEnabled(0,self.lvAdditionalFiles.header().count() - 1)
+        self.lvAdditionalFiles.addColumn(self.__tr("File"))
+        self.lvAdditionalFiles.header().setClickEnabled(0,self.lvAdditionalFiles.header().count() - 1)
         self.lvAdditionalFiles.setAllColumnsShowFocus(1)
         self.lvAdditionalFiles.setResizeMode(KListView.LastColumn)
         TabPageLayout_5.addWidget(self.lvAdditionalFiles)
 
-        layout15_2_2 = QVBoxLayout(None,0,6,"layout15_2_2")
+        layout27 = QVBoxLayout(None,0,6,"layout27")
 
         self.pbAddAdditional = KPushButton(self.TabPage_5,"pbAddAdditional")
-        layout15_2_2.addWidget(self.pbAddAdditional)
+        layout27.addWidget(self.pbAddAdditional)
 
         self.pbRemoveAdditional = KPushButton(self.TabPage_5,"pbRemoveAdditional")
-        layout15_2_2.addWidget(self.pbRemoveAdditional)
-        spacer9_3_2_2 = QSpacerItem(20,40,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        layout15_2_2.addItem(spacer9_3_2_2)
+        layout27.addWidget(self.pbRemoveAdditional)
+        spacer9_3_2_2 = QSpacerItem(20,160,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout27.addItem(spacer9_3_2_2)
+
+        self.pbViewAdditional = KPushButton(self.TabPage_5,"pbViewAdditional")
+        layout27.addWidget(self.pbViewAdditional)
 
         self.pbBrowseAdditional = KPushButton(self.TabPage_5,"pbBrowseAdditional")
-        layout15_2_2.addWidget(self.pbBrowseAdditional)
-        TabPageLayout_5.addLayout(layout15_2_2)
+        layout27.addWidget(self.pbBrowseAdditional)
+        TabPageLayout_5.addLayout(layout27)
         self.twPackage.insertTab(self.TabPage_5,QString.fromLatin1(""))
 
         self.TabPage_6 = QWidget(self.twPackage,"TabPage_6")
@@ -259,29 +262,35 @@
         self.twPackage.insertTab(self.TabPage_6,QString.fromLatin1(""))
 
         self.TabPage_7 = QWidget(self.twPackage,"TabPage_7")
-        TabPageLayout_7 = QHBoxLayout(self.TabPage_7,11,6,"TabPageLayout_7")
+        TabPageLayout_7 = QGridLayout(self.TabPage_7,1,1,11,6,"TabPageLayout_7")
 
         self.lvCOMAR = KListView(self.TabPage_7,"lvCOMAR")
         self.lvCOMAR.addColumn(self.__tr("Provides"))
         self.lvCOMAR.header().setClickEnabled(0,self.lvCOMAR.header().count() - 1)
         self.lvCOMAR.addColumn(self.__tr("Script"))
         self.lvCOMAR.header().setClickEnabled(0,self.lvCOMAR.header().count() - 1)
+        self.lvCOMAR.setAllColumnsShowFocus(1)
         self.lvCOMAR.setResizeMode(KListView.LastColumn)
-        TabPageLayout_7.addWidget(self.lvCOMAR)
 
-        layout15_2_2_2 = QVBoxLayout(None,0,6,"layout15_2_2_2")
+        TabPageLayout_7.addWidget(self.lvCOMAR,0,0)
+
+        layout28 = QVBoxLayout(None,0,6,"layout28")
 
         self.pbAddCOMAR = KPushButton(self.TabPage_7,"pbAddCOMAR")
-        layout15_2_2_2.addWidget(self.pbAddCOMAR)
+        layout28.addWidget(self.pbAddCOMAR)
 
         self.pbRemoveCOMAR = KPushButton(self.TabPage_7,"pbRemoveCOMAR")
-        layout15_2_2_2.addWidget(self.pbRemoveCOMAR)
-        spacer9_3_2_2_2 = QSpacerItem(20,40,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        layout15_2_2_2.addItem(spacer9_3_2_2_2)
+        layout28.addWidget(self.pbRemoveCOMAR)
+        spacer9_3_2_2_2 = QSpacerItem(20,170,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout28.addItem(spacer9_3_2_2_2)
+
+        self.pbViewCOMAR = KPushButton(self.TabPage_7,"pbViewCOMAR")
+        layout28.addWidget(self.pbViewCOMAR)
 
         self.pbBrowseCOMAR = KPushButton(self.TabPage_7,"pbBrowseCOMAR")
-        layout15_2_2_2.addWidget(self.pbBrowseCOMAR)
-        TabPageLayout_7.addLayout(layout15_2_2_2)
+        layout28.addWidget(self.pbBrowseCOMAR)
+
+        TabPageLayout_7.addLayout(layout28,0,1)
         self.twPackage.insertTab(self.TabPage_7,QString.fromLatin1(""))
         gbPackageLayout.addWidget(self.twPackage)
         PackageWidgetUILayout.addWidget(self.gbPackage)
@@ -329,10 +338,11 @@
         self.twPackage.changeTab(self.TabPage_4,self.__tr("Files"))
         self.lvAdditionalFiles.header().setLabel(0,self.__tr("Owner"))
         self.lvAdditionalFiles.header().setLabel(1,self.__tr("Permission"))
-        self.lvAdditionalFiles.header().setLabel(2,self.__tr("File"))
-        self.lvAdditionalFiles.header().setLabel(3,self.__tr("Target"))
+        self.lvAdditionalFiles.header().setLabel(2,self.__tr("Target"))
+        self.lvAdditionalFiles.header().setLabel(3,self.__tr("File"))
         self.pbAddAdditional.setText(QString.null)
         self.pbRemoveAdditional.setText(QString.null)
+        self.pbViewAdditional.setText(QString.null)
         self.pbBrowseAdditional.setText(QString.null)
         self.twPackage.changeTab(self.TabPage_5,self.__tr("Additional Files"))
         self.lvConflicts.header().setLabel(0,self.__tr("Condition"))
@@ -345,6 +355,7 @@
         self.lvCOMAR.header().setLabel(1,self.__tr("Script"))
         self.pbAddCOMAR.setText(QString.null)
         self.pbRemoveCOMAR.setText(QString.null)
+        self.pbViewCOMAR.setText(QString.null)
         self.pbBrowseCOMAR.setText(QString.null)
         self.twPackage.changeTab(self.TabPage_7,self.__tr("COMAR Scripts"))
 

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 09:07:17 2007
@@ -7,13 +7,24 @@
 from pisi import specfile as spec
 from pisi.dependency import Dependency
 
+import os.path
+import os
+import shutil
+
 from sourceWidgetUI import SourceWidgetUI
 from dialogs.summaryDialog import SummaryDialog
 from dialogs.dependencyDialog import DependencyDialog
+from dialogs.patchDialog import PatchDialog
 
 class sourceWidget(SourceWidgetUI):
-    def __init__(self, parent):
+    def __init__(self, parent, fileLoc = None):
         SourceWidgetUI.__init__(self, parent)
+
+        if fileLoc:
+            self.tempDir = os.path.split(fileLoc)[0]
+            self.filesDir = self.tempDir + "/files"
+            self.comarDir = self.tempDir + "/comar"
+
         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))
@@ -28,6 +39,12 @@
         self.connect(self.pbBrowseBuildDep, SIGNAL("clicked()"), self.slotBrowseBuildDep)
         self.connect(self.lvBuildDep, SIGNAL("executed(QListViewItem *)"), self.slotBrowseBuildDep)
         
+        self.connect(self.pbAddPatch, SIGNAL("clicked()"), self.slotAddPatch)
+        self.connect(self.pbRemovePatch, SIGNAL("clicked()"), self.slotRemovePatch)
+        self.connect(self.pbBrowsePatch, SIGNAL("clicked()"), self.slotBrowsePatch)
+        self.connect(self.pbViewPatch, SIGNAL("clicked()"), self.slotViewPatch)
+        self.connect(self.lvPatches, SIGNAL("executed(QListViewItem *)"), self.slotBrowsePatch)
+        
         il = KGlobal.iconLoader()
         for w in [self.pbLicense, self.pbIsA, self.pbAddSummary, self.pbAddBuildDep, self.pbAddPatch]:
             w.setIconSet(il.loadIconSet("edit_add", KIcon.Toolbar))
@@ -39,6 +56,8 @@
        
         for w in [self.pbBrowseSummary, self.pbBrowseBuildDep, self.pbBrowsePatch]:
             w.setIconSet(il.loadIconSet("fileopen", KIcon.Toolbar))
+        
+        self.pbViewPatch.setIconSet(il.loadIconSet("filefind", KIcon.Toolbar))
 
         self.isAPopup = QPopupMenu(self)
    
@@ -164,6 +183,51 @@
             lvi.setText(0, cond)
             lvi.setText(1, dep)
 
+    def slotAddPatch(self):
+        dia = PatchDialog(self)
+        if dia.exec_loop() == QDialog.Accepted:
+            res = dia.getResult()
+            lvi = KListViewItem(self.lvPatches, res[0], res[1], res[2])
+            if not os.path.isdir(self.filesDir):
+                os.mkdir(self.filesDir)
+            shutil.copyfile(res[3], self.filesDir + "/" + res[2])
+
+    def slotRemovePatch(self):
+        lvi = self.lvPatches.selectedItem()
+        if not lvi:
+            return
+        patch = str(lvi.text(2))
+        patchPath = self.filesDir + "/" + patch
+        if lvi:
+            self.lvPatches.takeItem(lvi)
+        if os.path.isdir(self.filesDir) and os.path.isfile(patchPath):
+            os.unlink(patchPath)
+
+    def slotBrowsePatch(self):
+        lvi = self.lvPatches.selectedItem()
+        if not lvi:
+            return
+        if not lvi.text(0) or str(lvi.text(0)).strip() == "":
+            level = "0"
+        else:
+            level = str(lvi.text(0))
+        if not lvi.text(1) or str(lvi.text(1)).strip() == "":
+            comp = ""
+        else:
+            comp = str(lvi.text(1))
+        dia = PatchDialog(self, [level, comp, str(lvi.text(2))])
+        if dia.exec_loop() == QDialog.Accepted:
+            res = dia.getResult()
+            lvi.setText(0, res[0])
+            lvi.setText(1, res[1])
+            lvi.setText(2, res[2])
+
+    def slotViewPatch(self):
+        lvi = self.lvPatches.selectedItem()
+        if not lvi:
+            return
+        os.system("kfmclient exec %s" % self.filesDir + "/" + str(lvi.text(2)))
+
     def fill(self, source):
         self.leName.setText(source.name)
         self.leHomepage.setText(source.homepage)

Modified: trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidgetUI.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidgetUI.py	(original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWgt/sourceWidgetUI.py	Tue Sep  4 09:07:17 2007
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '../../uis/pspecWidget/sourceWidgetUI.ui'
 #
-# Created: Paz Eyl 2 20:18:58 2007
+# Created: Pzt Eyl 3 17:41:34 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.17.3
 #
 # WARNING! All changes made in this file will be lost!
@@ -229,19 +229,22 @@
         self.lvPatches.setResizeMode(KListView.LastColumn)
         TabPageLayout_3.addWidget(self.lvPatches)
 
-        layout15 = QVBoxLayout(None,0,6,"layout15")
+        layout21 = QVBoxLayout(None,0,6,"layout21")
 
         self.pbAddPatch = KPushButton(self.TabPage_3,"pbAddPatch")
-        layout15.addWidget(self.pbAddPatch)
+        layout21.addWidget(self.pbAddPatch)
 
         self.pbRemovePatch = KPushButton(self.TabPage_3,"pbRemovePatch")
-        layout15.addWidget(self.pbRemovePatch)
-        spacer9_3 = QSpacerItem(20,40,QSizePolicy.Minimum,QSizePolicy.Expanding)
-        layout15.addItem(spacer9_3)
+        layout21.addWidget(self.pbRemovePatch)
+        spacer9_3 = QSpacerItem(20,20,QSizePolicy.Minimum,QSizePolicy.Expanding)
+        layout21.addItem(spacer9_3)
+
+        self.pbViewPatch = KPushButton(self.TabPage_3,"pbViewPatch")
+        layout21.addWidget(self.pbViewPatch)
 
         self.pbBrowsePatch = KPushButton(self.TabPage_3,"pbBrowsePatch")
-        layout15.addWidget(self.pbBrowsePatch)
-        TabPageLayout_3.addLayout(layout15)
+        layout21.addWidget(self.pbBrowsePatch)
+        TabPageLayout_3.addLayout(layout21)
         self.twSource.insertTab(self.TabPage_3,QString.fromLatin1(""))
         layout30.addWidget(self.twSource)
         gbGeneralLayout.addLayout(layout30)
@@ -317,6 +320,7 @@
         self.lvPatches.header().setLabel(2,self.__tr("Patch"))
         self.pbAddPatch.setText(QString.null)
         self.pbRemovePatch.setText(QString.null)
+        self.pbViewPatch.setText(QString.null)
         self.pbBrowsePatch.setText(QString.null)
         self.twSource.changeTab(self.TabPage_3,self.__tr("Patches"))
 

Modified: trunk/staj-projeleri/Pakito/gui/pspecWidget.py
=================================================================
--- trunk/staj-projeleri/Pakito/gui/pspecWidget.py	(original)
+++ trunk/staj-projeleri/Pakito/gui/pspecWidget.py	Tue Sep  4 09:07:17 2007
@@ -49,10 +49,10 @@
         self.toolBox.setSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.MinimumExpanding)
         
         # source section of toolbox
-        self.sourcePage = sourceWidget(self.toolBox)
+        self.sourcePage = sourceWidget(self.toolBox, self.fileLocation)
         
         # packages section of toolbox
-        self.packagePage = packageWidget(self.toolBox)
+        self.packagePage = packageWidget(self.toolBox, self.fileLocation)
         
         # history section of toolbox
         self.historyPage = historyWidget(self.toolBox)

Modified: trunk/staj-projeleri/Pakito/uis/pspecWidget/historyWidgetUI.ui
=================================================================
--- trunk/staj-projeleri/Pakito/uis/pspecWidget/historyWidgetUI.ui	(original)
+++ trunk/staj-projeleri/Pakito/uis/pspecWidget/historyWidgetUI.ui	Tue Sep  4 09:07:17 2007
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>640</width>
-            <height>395</height>
+            <width>485</width>
+            <height>533</height>
         </rect>
     </property>
     <property name="caption">
@@ -160,6 +160,8 @@
         </widget>
     </hbox>
 </widget>
+<customwidgets>
+</customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>

Modified: trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui
=================================================================
--- trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui	(original)
+++ trunk/staj-projeleri/Pakito/uis/pspecWidget/packageWidgetUI.ui	Tue Sep  4 09:07:17 2007
@@ -643,7 +643,7 @@
                                 </column>
                                 <column>
                                     <property name="text">
-                                        <string>File</string>
+                                        <string>Target</string>
                                     </property>
                                     <property name="clickable">
                                         <bool>false</bool>
@@ -654,7 +654,7 @@
                                 </column>
                                 <column>
                                     <property name="text">
-                                        <string>Target</string>
+                                        <string>File</string>
                                     </property>
                                     <property name="clickable">
                                         <bool>false</bool>
@@ -675,7 +675,7 @@
                             </widget>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout15_2_2</cstring>
+                                    <cstring>layout27</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -710,12 +710,20 @@
                                         <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
-                                                <height>40</height>
+                                                <height>160</height>
                                             </size>
                                         </property>
                                     </spacer>
                                     <widget class="KPushButton">
                                         <property name="name">
+                                            <cstring>pbViewAdditional</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string></string>
+                                        </property>
+                                    </widget>
+                                    <widget class="KPushButton">
+                                        <property name="name">
                                             <cstring>pbBrowseAdditional</cstring>
                                         </property>
                                         <property name="text">
@@ -830,11 +838,11 @@
                         <attribute name="title">
                             <string>COMAR Scripts</string>
                         </attribute>
-                        <hbox>
+                        <grid>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="KListView">
+                            <widget class="KListView" row="0" column="0">
                                 <column>
                                     <property name="text">
                                         <string>Provides</string>
@@ -860,13 +868,16 @@
                                 <property name="name">
                                     <cstring>lvCOMAR</cstring>
                                 </property>
+                                <property name="allColumnsShowFocus">
+                                    <bool>true</bool>
+                                </property>
                                 <property name="resizeMode">
                                     <enum>LastColumn</enum>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="QLayoutWidget" row="0" column="1">
                                 <property name="name">
-                                    <cstring>layout15_2_2_2</cstring>
+                                    <cstring>layout28</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -901,12 +912,20 @@
                                         <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
-                                                <height>40</height>
+                                                <height>170</height>
                                             </size>
                                         </property>
                                     </spacer>
                                     <widget class="KPushButton">
                                         <property name="name">
+                                            <cstring>pbViewCOMAR</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string></string>
+                                        </property>
+                                    </widget>
+                                    <widget class="KPushButton">
+                                        <property name="name">
                                             <cstring>pbBrowseCOMAR</cstring>
                                         </property>
                                         <property name="text">
@@ -915,13 +934,15 @@
                                     </widget>
                                 </vbox>
                             </widget>
-                        </hbox>
+                        </grid>
                     </widget>
                 </widget>
             </vbox>
         </widget>
     </hbox>
 </widget>
+<customwidgets>
+</customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
@@ -950,6 +971,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
+    <includehint>kpushbutton.h</includehint>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
@@ -958,5 +980,6 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
+    <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>

Modified: trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui
=================================================================
--- trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui	(original)
+++ trunk/staj-projeleri/Pakito/uis/pspecWidget/sourceWidgetUI.ui	Tue Sep  4 09:07:17 2007
@@ -724,7 +724,7 @@
                                     </widget>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout15</cstring>
+                                            <cstring>layout21</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -759,12 +759,20 @@
                                                 <property name="sizeHint">
                                                     <size>
                                                         <width>20</width>
-                                                        <height>40</height>
+                                                        <height>20</height>
                                                     </size>
                                                 </property>
                                             </spacer>
                                             <widget class="KPushButton">
                                                 <property name="name">
+                                                    <cstring>pbViewPatch</cstring>
+                                                </property>
+                                                <property name="text">
+                                                    <string></string>
+                                                </property>
+                                            </widget>
+                                            <widget class="KPushButton">
+                                                <property name="name">
                                                     <cstring>pbBrowsePatch</cstring>
                                                 </property>
                                                 <property name="text">
@@ -782,6 +790,8 @@
         </widget>
     </grid>
 </widget>
+<customwidgets>
+</customwidgets>
 <tabstops>
     <tabstop>leName</tabstop>
     <tabstop>leIsA</tabstop>
@@ -831,5 +841,6 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
+    <includehint>kpushbutton.h</includehint>
 </includehints>
 </UI>


Uludag-commits mesaj listesiyle ilgili daha fazla bilgi