[Uludag-commits] r16301 - in trunk/tasma/package-manager: . src
uludag-commits at pardus.org.tr
uludag-commits at pardus.org.tr
12 Ara 2007 Çar 14:03:52 EET
Author: gokcen.eraslan
Date: Wed Dec 12 14:03:52 2007
New Revision: 16301
Added:
trunk/tasma/package-manager/src/Debug.py
Modified:
trunk/tasma/package-manager/setup.py
trunk/tasma/package-manager/src/Commander.py
trunk/tasma/package-manager/src/MainWidget.py
trunk/tasma/package-manager/src/PackageCache.py
trunk/tasma/package-manager/src/SpecialList.py
Log:
Reorganization continued...
* setup.py updated
* MainWidget constructor divided
Modified: trunk/tasma/package-manager/setup.py
=================================================================
--- trunk/tasma/package-manager/setup.py (original)
+++ trunk/tasma/package-manager/setup.py Wed Dec 12 14:03:52 2007
@@ -41,6 +41,10 @@
'src/CustomEventListener.py',
'src/Basket.py',
'src/PackageCache.py',
+ 'src/MainWidget.py',
+ 'src/Globals.py',
+ 'src/Debug.py',
+ 'src/SpecialList.py',
# ui files
'src/ProgressDialog.ui',
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 12 14:03:52 2007
@@ -64,6 +64,7 @@
return
if reply.command == "notify":
+ print "Comar notify received"
(notification, script, data) = (reply.notify, reply.script, reply.data)
data = unicode(data)
if notification == "System.Manager.error":
@@ -85,14 +86,17 @@
# This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If
# some misbehaviour is seen, comar.log is always there to look.
elif reply.command == "error":
+ print "Comar error received"
self.comar.com_lock.unlock()
self.parent.finished("System.Manager.cancelled")
return
elif reply.command == "denied":
+ print "Comar denied received"
self.comar.com_lock.unlock()
self.parent.finished("System.Manager.cancelled")
self.parent.showErrorMessage(i18n("You do not have permission to do this operation."))
elif reply.command == "fail":
+ print "Comar fail received"
if reply.data == "System.Manager.cancelled":
self.comar.com_lock.unlock()
self.parent.finished(reply.data)
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 12 14:03:52 2007
@@ -47,15 +47,45 @@
def __init__(self, parent=None):
QWidget.__init__(self, parent)
self.parent = parent
- self.progressDialog = Progress.Progress(self)
+ self.progressDialog = Progress.Progress(self)
self.componentDict = {}
self.lastSelectedComponent = None
self.command = None
self.state = install_state
self.basket = Basket.Basket()
self.packageCache = PackageCache.PackageCache()
+ self.command = Commander.Commander(self)
+ self.settings = Settings.Settings(Globals.config())
+
+ # set up timers
+ self.timer = QTimer(self)
+ self.delayTimer = QTimer(self)
+
+ self.setupInterface()
+ self.setupConnections()
+ self.delayTimer.start(500, True)
+
+ # inform user for the delay...
+ item = KListViewItem(self.componentsList)
+ item.setText(0,i18n("Loading Package List..."))
+ self.componentsList.setSelected(self.componentsList.firstChild(),True)
+ self.tipper = ComponentTipper(self)
+
+ self.show()
+
+ def packageClicked(self, itemName, checked):
+ if checked:
+ if itemName not in self.basket.packages:
+ self.basket.add(itemName)
+ else:
+ self.basket.remove(itemName)
+
+ self.updateButtons()
+ self.updateStatusBar()
+
+ def setupInterface(self):
self.layout = QGridLayout(self)
self.leftLayout = QVBox(self)
self.rightLayout = QVBox(self)
@@ -81,8 +111,6 @@
self.operateAction.setIconSet(loadIconSet("ok"))
self.operateAction.setEnabled(False)
- self.timer = QTimer(self)
-
# list of packages on the right side
self.specialList = SpecialList(self.rightLayout)
@@ -100,40 +128,15 @@
self.layout.setColStretch(1,2)
self.layout.setColStretch(2,6)
+ def setupConnections(self):
self.connect(self.componentsList,SIGNAL("selectionChanged(QListViewItem *)"),self.refreshComponentList)
self.connect(self.searchLine, SIGNAL("textChanged(const QString&)"),self.searchStringChanged)
self.connect(self.timer, SIGNAL("timeout()"), self.searchPackage)
self.connect(self.clearButton, SIGNAL("clicked()"),self.searchLine, SLOT("clear()"))
self.connect(self.basketAction, SIGNAL("clicked()"),self.showBasket)
self.connect(self.operateAction, SIGNAL("clicked()"),self.takeAction)
-
self.connect(self.specialList, PYSIGNAL("checkboxClicked"), self.packageClicked)
-
- self.command = Commander.Commander(self)
-
- self.delayTimer = QTimer(self)
self.connect(self.delayTimer, SIGNAL("timeout()"), self.lazyLoadComponentList)
- self.delayTimer.start(500, True)
-
- # inform user for the delay...
- item = KListViewItem(self.componentsList)
- item.setText(0,i18n("Loading Package List..."))
- self.componentsList.setSelected(self.componentsList.firstChild(),True)
-
- self.tipper = ComponentTipper(self)
- self.show()
-
- self.settings = Settings.Settings(Globals.config())
-
- def packageClicked(self, itemName, checked):
- if checked:
- if itemName not in self.basket.packages:
- self.basket.add(itemName)
- else:
- self.basket.remove(itemName)
-
- self.updateButtons()
- self.updateStatusBar()
def lazyLoadComponentList(self):
self.parent.tray.updateTrayIcon()
@@ -164,6 +167,7 @@
KMessageBox.error(self, i18n("Package-manager needs to update package database. You need a network connection to update."),
i18n("Package database is empty"))
+ # clear cache, basket, search line...
def resetState(self):
self.basket.empty()
self.basketAction.setEnabled(False)
@@ -484,7 +488,6 @@
#create a component list from given package list
def createComponentList(self, packages, allComponent=False):
-
# filter for selecting only apps with gui
def appGuiFilter(pkg_name):
if self.state == remove_state:
Modified: trunk/tasma/package-manager/src/PackageCache.py
=================================================================
--- trunk/tasma/package-manager/src/PackageCache.py (original)
+++ trunk/tasma/package-manager/src/PackageCache.py Wed Dec 12 14:03:52 2007
@@ -84,7 +84,7 @@
return True
found = []
- for pkg in self.packages:
+ for pkg in self.packages.values():
if terms == filter(lambda x:search(pkg, x), terms):
found.append(pkg.name)
Modified: trunk/tasma/package-manager/src/SpecialList.py
=================================================================
--- trunk/tasma/package-manager/src/SpecialList.py (original)
+++ trunk/tasma/package-manager/src/SpecialList.py Wed Dec 12 14:03:52 2007
@@ -60,6 +60,8 @@
if reverse or not element.checked():
element.click()
self.selectingAll = False
+
+ #TODO: Fix this
#self.parent.updateStatusBar()
def clear(self):
Uludag-commits mesaj listesiyle ilgili
daha fazla bilgi