[Uludag-commits] r16242 - trunk/tasma/package-manager/src

[uludag-commits at pardus.org.tr]

Author: gokcen.eraslan
Date: Wed Dec  5 12:05:20 2007
New Revision: 16242

Added:
   trunk/tasma/package-manager/src/SpecialList.py
Modified:
   trunk/tasma/package-manager/src/BasketDialog.py
   trunk/tasma/package-manager/src/Commander.py
   trunk/tasma/package-manager/src/HelpDialog.py
   trunk/tasma/package-manager/src/MainWidget.py
Log:
pisi-db conflict fix, KDialogs and some comments


Modified: trunk/tasma/package-manager/src/BasketDialog.py
=================================================================
--- trunk/tasma/package-manager/src/BasketDialog.py	(original)
+++ trunk/tasma/package-manager/src/BasketDialog.py	Wed Dec  5 12:05:20 2007
@@ -15,6 +15,7 @@
 from sets import Set as set
 from qt import *
 from kdecore import *
+from kdeui import KCursor
 from khtml import *
 
 import pisi
@@ -45,9 +46,9 @@
         except Exception, e:
             print e
 
-class BasketDialog(QDialog):
+class BasketDialog(KDialog):
     def __init__(self, parent, basket):
-        QDialog.__init__(self,parent,str(i18n("Basket")),True)
+        KDialog.__init__(self,parent,str(i18n("Basket")),True)
         self.parent = parent
         self.basket = basket
         self.totalSize = 0
@@ -133,9 +134,9 @@
         node.addEventListener(DOM.DOMString("click"),self.eventListener,True)
 
     def updateTotals(self):
-        self.setCursor(Qt.waitCursor)
+        self.setCursor(KCursor.waitCursor)
         self.createExtraPackagesList()
-        self.setCursor(Qt.arrowCursor)
+        self.setCursor(KCursor.arrowCursor)
 
     def createSelectedPackagesList(self):
         self.createHTML(self.basket.packages, self.pkgHtmlPart, True)

Modified: trunk/tasma/package-manager/src/Commander.py
=================================================================
--- trunk/tasma/package-manager/src/Commander.py	(original)
+++ trunk/tasma/package-manager/src/Commander.py	Wed Dec  5 12:05:20 2007
@@ -170,7 +170,7 @@
         self.comar.cancel()
 
     def checkConflicts(self, packages):
-        return pisi.api.generate_conflicts(packages)
+        return pisi.api.get_conflicts(packages)
 
     def inProgress(self):
         return self.comar.com_lock.locked()

Modified: trunk/tasma/package-manager/src/HelpDialog.py
=================================================================
--- trunk/tasma/package-manager/src/HelpDialog.py	(original)
+++ trunk/tasma/package-manager/src/HelpDialog.py	Wed Dec  5 12:05:20 2007
@@ -22,9 +22,9 @@
     PREFERENCES:"preferences_help.html"
     }
 
-class HelpDialog(QDialog):
+class HelpDialog(KDialog):
     def __init__(self, parent, help):
-        QDialog.__init__(self, parent)
+        KDialog.__init__(self, parent)
         self.setCaption(i18n("Package Manager Help"))
         self.layout = QGridLayout(self)
         self.htmlPart = KHTMLPart(self)

Modified: trunk/tasma/package-manager/src/MainWidget.py
=================================================================
--- trunk/tasma/package-manager/src/MainWidget.py	(original)
+++ trunk/tasma/package-manager/src/MainWidget.py	Wed Dec  5 12:05:20 2007
@@ -139,14 +139,13 @@
 
         self.settings = Settings.Settings(kapp.config())
 
-        #self.lazyLoadComponentList()
-
     def lazyLoadComponentList(self):
         self.parent.tray.updateTrayIcon()
  
         if self.componentsReady():
             self.installState()
 
+            #TODO: Fix this
             #global packageToInstall
             #if packageToInstall:
             #    self.installPackage(unicode(packageToInstall))
@@ -182,18 +181,33 @@
         self.parent.showUpgradeAction.setChecked(False)
 
     def installState(self, reset=True):
+        # set mouse to waiting icon
         kapp.setOverrideCursor(KCursor.waitCursor)
+
+        # uncheck buttons, clear search line, empty cache
         if reset:
             self.resetState()
+
+        # check the "Show New Packages" button
         self.parent.showNewAction.setChecked(True)
         self.processEvents()
+
+        # ask pisi to get available packages
         packages = self.command.listNewPackages()
+
         self.state = install_state
+
+        # prepare components' listview on the left side
         self.createComponentList(packages)
+
         self.operateAction.setText(i18n("Install Package(s)"))
         self.operateAction.setIconSet(loadIconSet("ok"))
         self.basket.setState(self.state)
+
+        # set last selected component and so, trigger HTML creator to create right side (packages)
+        # (selects first component if it is the first time)
         self.setLastSelected()
+
         self.updateStatusBar()
         kapp.restoreOverrideCursor()