[Uludag-commits] r17538 - in branches/yali4/yali4: . gui gui/Ui gui/pics

[uludag-commits at pardus.org.tr]

Author: gokmen.goksel
Date: Tue Apr  1 15:28:45 2008
New Revision: 17538

Added:
   branches/yali4/yali4/gui/pics/backardus.png   (contents, props changed)
Modified:
   branches/yali4/yali4/data.qrc
   branches/yali4/yali4/gui/ScrInstall.py
   branches/yali4/yali4/gui/Ui/main.ui
   branches/yali4/yali4/gui/pics/welcome.png
   branches/yali4/yali4/gui/runner.py
   branches/yali4/yali4/pisiiface.py
Log:
* Go on 2008

Modified: branches/yali4/yali4/data.qrc
=================================================================
--- branches/yali4/yali4/data.qrc	(original)
+++ branches/yali4/yali4/data.qrc	Tue Apr  1 15:28:45 2008
@@ -2,6 +2,7 @@
   <qresource prefix="/" >
     <file>gui/pics/admin.png</file>
     <file>gui/pics/background.png</file>
+    <file>gui/pics/backardus.png</file>
     <file>gui/pics/background2.png</file>
     <file>gui/pics/background3.jpg</file>
     <file>gui/pics/backgroundtile.png</file>

Modified: branches/yali4/yali4/gui/ScrInstall.py
=================================================================
--- branches/yali4/yali4/gui/ScrInstall.py	(original)
+++ branches/yali4/yali4/gui/ScrInstall.py	Tue Apr  1 15:28:45 2008
@@ -145,7 +145,6 @@
 
     def packageInstallFinished(self):
 
-        yali4.pisiiface.finalize()
         self.cur = 0
 
         # fill fstab
@@ -200,8 +199,6 @@
         if self.hasErrors:
             return
 
-        yali4.pisiiface.finalize()
-
         # trigger next screen. will activate execute()
         ctx.mainScreen.slotNext()
 
@@ -296,7 +293,6 @@
 
         # Remove cd repository and install add real
         yali4.pisiiface.switch_to_pardus_repo()
-        yali4.pisiiface.finalize()
 
         qevent = PisiEvent(QEvent.User, EventAllFinished)
         QCoreApplication.postEvent(self._widget, qevent)

Modified: branches/yali4/yali4/gui/Ui/main.ui
=================================================================
--- branches/yali4/yali4/gui/Ui/main.ui	(original)
+++ branches/yali4/yali4/gui/Ui/main.ui	Tue Apr  1 15:28:45 2008
@@ -14,7 +14,7 @@
   </property>
   <property name="styleSheet" >
    <string>#YaliMain {
-       background-image:url(':/gui/pics/background.png')
+       background-image:url(':/gui/pics/backardus.png')
 }
 
 QStackedWidget#mainStack {

Modified: branches/yali4/yali4/gui/pics/welcome.png
=================================================================
Binary files. No diff available.

Modified: branches/yali4/yali4/gui/runner.py
=================================================================
--- branches/yali4/yali4/gui/runner.py	(original)
+++ branches/yali4/yali4/gui/runner.py	Tue Apr  1 15:28:45 2008
@@ -124,6 +124,8 @@
         w = ErrorWidget(tb)
     else:
         w = ExceptionWidget(tb)
+
+    print "BACKTRACE: ",tb
     d = Dialog(title, w, None)
     d.resize(500,400)
     d.exec_()

Modified: branches/yali4/yali4/pisiiface.py
=================================================================
--- branches/yali4/yali4/pisiiface.py	(original)
+++ branches/yali4/yali4/pisiiface.py	Tue Apr  1 15:28:45 2008
@@ -20,23 +20,25 @@
 import yali4.postinstall
 from yali4.constants import consts
 
+repodb = pisi.db.repodb.RepoDB()
+
 def initialize(ui, with_comar=False):
     options = pisi.config.Options()
     options.destdir = consts.target_dir
     options.yes_all = True
-    # giving "comar = false" isn't enough for pisi 
-    if with_comar:
-        # wait for chroot_dbus to initialize
-        # generally we don't need this but I think this is safer
-        for i in range(20):
-            try:
-                bus = dbus.SystemBus()
-                break
-            except dbus.DBusException:
-                time.sleep(1)
-        pisi.api.pisi.api.set_dbus_sockname("%s/var/run/dbus/system_bus_socket" % options.destdir)
-    else:
-        options.ignore_comar = True
+    # wait for chroot_dbus to initialize
+    # generally we don't need this but I think this is safer
+    for i in range(20):
+        try:
+            bus = dbus.SystemBus()
+            break
+        except dbus.DBusException:
+            time.sleep(1)
+    pisi.api.set_dbus_sockname("%s/var/run/dbus/system_bus_socket" % options.destdir)
+    pisi.api.set_userinterface(ui)
+    pisi.api.set_options(options)
+    pisi.api.set_comar(with_comar)
+    pisi.api.set_signalhandling(False)
 
 def add_repo(name, uri):
     pisi.api.add_repo(name, uri)
@@ -44,12 +46,12 @@
 def add_cd_repo():
     cd_repo_name = consts.cd_repo_name
     cd_repo_uri = consts.cd_repo_uri
-    if not pisi.context.repodb.has_repo(cd_repo_name):
+    if not repodb.has_repo(cd_repo_name):
         add_repo(cd_repo_name, cd_repo_uri)
         update_repo(cd_repo_name)
 
 def add_remote_repo(name, uri):
-    if not pisi.context.repodb.has_repo(name):
+    if not repodb.has_repo(name):
         add_repo(name, uri)
         update_repo(name)
 
@@ -68,7 +70,7 @@
     pisi.api.remove_repo(name)
 
 def finalize():
-    pisi.api.finalize()
+    pass
 
 def install(pkg_name_list):
     pisi.api.install(pkg_name_list)
@@ -77,15 +79,13 @@
     install(get_available())
 
 def get_available():
-    l = pisi.context.packagedb.list_packages()
-    return l
+    return pisi.api.list_available()
 
 def get_available_len():
     return len(get_available())
 
 def get_pending():
-    l = pisi.context.installdb.list_pending()
-    return l
+    return pisi.db.installdb.InstallDB().list_pending()
 
 def get_pending_len():
     return len(get_pending())
@@ -99,7 +99,7 @@
 def check_package_hash(pkg_name):
     repo_path = os.path.dirname(consts.cd_repo_uri)
 
-    pkg = pisi.context.packagedb.get_package(pkg_name)
+    pkg = pisi.db.packagedb.PackageDB().get_package(pkg_name)
     file_name = pisi.util.package_name(pkg.name,
                                        pkg.version,
                                        pkg.release,