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

[svn-uludag at uludag.org.tr]

Author: faik
Date: Thu Nov  2 15:15:02 2006
New Revision: 10108

Modified:
   trunk/tasma/package-manager/src/Progress.py
   trunk/tasma/package-manager/src/ProgressDialog.ui
   trunk/tasma/package-manager/src/package-manager.py
Log:
* change dialog layout


Modified: trunk/tasma/package-manager/src/Progress.py
=================================================================
--- trunk/tasma/package-manager/src/Progress.py	(original)
+++ trunk/tasma/package-manager/src/Progress.py	Thu Nov  2 15:15:02 2006
@@ -33,10 +33,7 @@
     def setOperationDescription(self, text):
         self.operationDescription.setText(text)
 
-    def setStatus(self, rate=None, symbol=None):
-        if rate and symbol:
-            self.rateInfo.setText(i18n("Speed: %1 %2  ").arg(round(int(rate), 1)).arg(symbol))
-
+    def updateStatus(self):
         completed, total = self.getCurrentDownloadedSize()
         self.completedInfo.setText(completed)
         self.totalInfo.setText(i18n("downloaded ( total: %1 )").arg(total))
@@ -44,7 +41,6 @@
 
     def showStatus(self):
         self.packageInfo.show()
-        self.rateInfo.show()
         self.completedInfo.show()
         self.totalInfo.show()
 
@@ -55,7 +51,6 @@
         if hidepackage:
             self.packageInfo.hide()
 
-        self.rateInfo.hide()
         self.completedInfo.hide()
         self.totalInfo.hide()
 
@@ -71,7 +66,6 @@
         self.completedInfo.setText(i18n("--"))
         self.totalInfo.setText(i18n("downloaded (total: -- )"))
         self.packageInfo.setText(i18n("-- / --  package"))
-        self.rateInfo.setText(i18n("Speed: -- KB/s"))
 
         self.hideOperationDescription()
         self.hideStatus()
@@ -118,14 +112,14 @@
 
         self.setOperationDescription(i18n('Now %1 <b>%2</b> package').arg(operation).arg(package))
 
-    def updateDownloadingInfo(self, operation, file, percent, rate, symbol):
+    def updateDownloadingInfo(self, operation, file):
         self.packageName = pisi.util.parse_package_name(file)[0]
         self.setOperationDescription(i18n('Now %1 <b>%2</b> package').arg(operation).arg(self.packageName))
-        self.setStatus(rate, symbol)
+        self.updateStatus()
         self.showOperationDescription()
 
-    def updateUpgradingInfo(self, percent, rate, symbol):
-        self.setStatus(rate, symbol)
+    def updateUpgradingInfo(self):
+        self.updateStatus()
         self.showOperationDescription()
 
     def updatePackageInfo(self):
@@ -172,4 +166,5 @@
             percent = (self.packageNo * 100) / self.totalPackages
         except ZeroDivisionError:
             percent = 0
+
         self.updateProgressBar(percent)

Modified: trunk/tasma/package-manager/src/ProgressDialog.ui
=================================================================
Suppressed!
	Too long (more than 250 lines) diff output suppressed...
Modified: trunk/tasma/package-manager/src/package-manager.py
=================================================================
--- trunk/tasma/package-manager/src/package-manager.py	(original)
+++ trunk/tasma/package-manager/src/package-manager.py	Thu Nov  2 15:15:02 2006
@@ -579,7 +579,7 @@
 
         elif operation == "fetching":
             if "pisi-index.xml" in data[1]:
-                self.progressDialog.updateUpgradingInfo(percent=data[2], rate=data[3], symbol=data[4])
+                self.progressDialog.updateUpgradingInfo()
                 self.progressDialog.updateProgressBar(progress=data[2])
 
             else:
@@ -588,7 +588,7 @@
                 elif self.state == upgrade_state:
                     self.progressDialog.setCurrentOperation(i18n("<b>Upgrading Package(s)</b>"))
 
-                self.progressDialog.updateDownloadingInfo(i18n("downloading"), file=data[1], percent=data[2], rate=data[3], symbol=data[4])
+                self.progressDialog.updateDownloadingInfo(i18n("downloading"), file=data[1])
                 self.progressDialog.updateTotalDownloaded(pkgDownSize=data[5], pkgTotalSize=data[6])
                 self.progressDialog.updateTotalOperationPercent()
 
@@ -615,7 +615,7 @@
             # totalSize is the to be downloaded size. And that is totalSize - cachedSize.
             self.progressDialog.totalSize = int(data[1]) - int(data[2])
             self.progressDialog.updateTotalOperationPercent()
-            self.progressDialog.setStatus()
+            self.progressDialog.updateStatus()
             
         elif operation in ["installing"]:
             self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1])