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

[uludag-commits at pardus.org.tr]

Author: gokcen.eraslan
Date: Tue Feb  5 19:15:38 2008
New Revision: 16991

Modified:
   trunk/tasma/package-manager/src/Debug.py
   trunk/tasma/package-manager/src/Globals.py
   trunk/tasma/package-manager/src/LocaleData.py
   trunk/tasma/package-manager/src/package-manager.py
Log:
debug support is coming

Modified: trunk/tasma/package-manager/src/Debug.py
=================================================================
--- trunk/tasma/package-manager/src/Debug.py	(original)
+++ trunk/tasma/package-manager/src/Debug.py	Tue Feb  5 19:15:38 2008
@@ -1,10 +1,15 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Class responsible for debug output and logging
+import sys
+
+# Class responsible for debug output
 class Debug:
     def __init__(self):
-        pass
+        self.writeFunc = sys.stderr.write
 
     def write(self, msg):
-        print "DEBUG: " + msg
+        self.writeFunc("DEBUG: %s\n" % msg)
+
+    def setWriteFunc(self, func):
+        self.writeFunc = func

Modified: trunk/tasma/package-manager/src/Globals.py
=================================================================
--- trunk/tasma/package-manager/src/Globals.py	(original)
+++ trunk/tasma/package-manager/src/Globals.py	Tue Feb  5 19:15:38 2008
@@ -4,12 +4,22 @@
 from qt import QEventLoop
 from kdeui import KCursor
 
+from Debug import Debug
+
 # global KApplication reference for setting cursor type
 app = None
+debugger = None
 
-def init(application):
+def init(application, debug = False):
     global app
     app = application
+    if debug:
+        global debugger
+        debugger = Debug()
+
+def debug(msg):
+    if debugger:
+        debugger.write(msg)
 
 def setWaitCursor():
     if app:

Modified: trunk/tasma/package-manager/src/LocaleData.py
=================================================================
--- trunk/tasma/package-manager/src/LocaleData.py	(original)
+++ trunk/tasma/package-manager/src/LocaleData.py	Tue Feb  5 19:15:38 2008
@@ -11,7 +11,9 @@
 # Please read the COPYING file
 
 import locale
-from kdecore import KGlobal
+import Globals
+
+from kdecore import KGlobal, i18n
 
 locales = {
     "tr" : "tr_TR.UTF8",
@@ -36,4 +38,5 @@
     else:
         systemlocale = "en_US.UTF-8"
 
+    Globals.debug(i18n("Setting system locale to '%s' to let PiSi work in this KDE locale." % systemlocale))
     locale.setlocale(locale.LC_ALL, systemlocale)

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	Tue Feb  5 19:15:38 2008
@@ -70,7 +70,9 @@
         self.tray = Tray.Tray(self)
         if self.mainwidget.settings.getBoolValue(Settings.general, "SystemTray"):
             if self.mainwidget.settings.getBoolValue(Settings.general, "UpdateCheck"):
+                Globals.debug(i18n("Update check option is set." % interval))
                 interval = self.mainwidget.settings.getNumValue(Settings.general, "UpdateCheckInterval")
+                Globals.debug(i18n("Update check will start in %s minute(s)" % interval))
                 self.tray.updateInterval(interval)
             self.tray.show()
 
@@ -83,6 +85,7 @@
 
     def closeEvent(self, closeEvent):
         if self.mainwidget.settings.getBoolValue(Settings.general, "SystemTray"):
+            Globals.debug(i18n("Minimizing to system tray."))
             self.hide()
         else:
             self.slotQuit()
@@ -90,6 +93,7 @@
     def slotQuit(self):
         # Don't know why but without this, after exiting package-manager, crash occurs. This may be a workaround or a PyQt bug.
         self.mainwidget.deleteLater()
+        Globals.debug(i18n("package-manager is quiting."))
         kapp.quit()
 
     def setupMenu(self):
@@ -137,16 +141,16 @@
 
     about_data = AboutData()
     KCmdLineArgs.init(sys.argv,about_data)
-    KCmdLineArgs.addCmdLineOptions ([("install <package>", I18N_NOOP("Package to install")), ("show-mainwindow", I18N_NOOP("Show main window on startup"))])
+    KCmdLineArgs.addCmdLineOptions ([("install <package>", I18N_NOOP("Package to install")),
+                                     ("show-mainwindow", I18N_NOOP("Show main window on startup")),
+                                     ("debug", I18N_NOOP("Show debug output"))])
 
     if not KUniqueApplication.start():
         print i18n("Package Manager is already running!")
         return
 
     kapp = KUniqueApplication(True, True, True)
-
-    # pass reference to Globals module, so KApplication can be reached when needed
-    Globals.init(kapp)
+    debug = False
 
     args = KCmdLineArgs.parsedArgs()
     if args.isSet("install"):
@@ -154,11 +158,20 @@
     else:
         packageToInstall = None
 
+    if args.isSet("debug"):
+         debug = True
+
+    # pass reference to Globals module, so KApplication can be reached when needed
+    Globals.init(kapp, debug)
+    Globals.debug(i18n("package-manager started."))
+
     myapp = MainApplication()
     if not myapp.mainwidget.settings.getBoolValue(Settings.general, "SystemTray"):
+        Globals.debug(i18n("SystemTray option is not set, showing main window."))
         myapp.show()
     else:
         if args.isSet("show-mainwindow"):
+            Globals.debug(i18n("--show-mainwindow option is set. Showing main window."))
             myapp.show()
 
     kapp.setMainWidget(myapp)