patches/virt-manager-12-storage-browse.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 15942 40ffef79e81f
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15942
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     1
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/create.py virt-manager-0.6.1/src/virtManager/create.py
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     2
--- virt-manager-0.6.1.old/src/virtManager/create.py	2009-04-20 11:58:04.417378049 +0100
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     3
+++ virt-manager-0.6.1/src/virtManager/create.py	2009-04-21 11:13:42.577866506 +0100
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     4
@@ -790,7 +790,12 @@ class vmmCreate(gobject.GObject):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     5
                                           gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT),
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     6
                                          None)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     7
         fcdialog.set_default_response(gtk.RESPONSE_ACCEPT)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     8
-        fcdialog.set_current_folder(self.config.get_default_image_dir(self.connection))
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
     9
+        f = None
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    10
+        f = self.window.get_widget("storage-file-address").get_text()
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    11
+        if f != None and os.path.exists(f):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    12
+            fcdialog.set_current_folder(f)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    13
+        else:
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    14
+            fcdialog.set_current_folder(self.config.get_default_image_dir(self.connection))
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    15
         fcdialog.set_do_overwrite_confirmation(True)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    16
         fcdialog.connect("confirm-overwrite", self.confirm_overwrite_callback)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    17
         response = fcdialog.run()
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    18
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/addhardware.py virt-manager-0.6.1/src/virtManager/addhardware.py
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    19
--- virt-manager-0.6.1.old/src/virtManager/addhardware.py	2009-04-20 11:58:04.419675457 +0100
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    20
+++ virt-manager-0.6.1/src/virtManager/addhardware.py	2009-04-21 11:27:28.534588320 +0100
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    21
@@ -650,7 +650,10 @@ class vmmAddHardware(gobject.GObject):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    22
             self.window.get_widget("storage-partition-address").set_text(part)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    23
 
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    24
     def browse_storage_file_address(self, src, ignore=None):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    25
-        folder = self.config.get_default_image_dir(self.vm.get_connection())
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    26
+        folder = None
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    27
+        folder = self.window.get_widget("storage-file-address").get_text()
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    28
+        if folder == None or not os.path.exists(folder):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    29
+            folder = self.config.get_default_image_dir(self.vm.get_connection())
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    30
         filename = self._browse_file(_("Locate or Create New Storage File"), \
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    31
                                        folder=folder, confirm_overwrite=True)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    32
         if filename != None:
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    33
/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/createpool.py virt-manager-0.6.1/src/virtManager/createpool.py
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    34
--- virt-manager-0.6.1.old/src/virtManager/createpool.py	2009-04-20 11:58:04.390149915 +0100
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    35
+++ virt-manager-0.6.1/src/virtManager/createpool.py	2009-04-21 11:28:56.057511151 +0100
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    36
@@ -20,6 +20,7 @@
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    37
 
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    38
 import gobject
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    39
 import gtk.glade
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    40
+import os
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    41
 
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    42
 import traceback
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    43
 import logging
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    44
@@ -249,8 +250,12 @@ class vmmCreatePool(gobject.GObject):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    45
             self.window.get_widget("pool-source-path").set_text(source)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    46
 
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    47
     def browse_target_path(self, ignore1=None):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    48
+        folder = None
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    49
+        folder = self.window.get_widget("pool-target-path").get_text()
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    50
+        if folder == None or not os.path.exists(folder):
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    51
+            folder = "/var/lib/libvirt"
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    52
         target = self._browse_file(_("Choose target directory"),
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    53
-                                   startfolder="/var/lib/libvirt",
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    54
+                                   startfolder=folder,
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    55
                                    foldermode=True)
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    56
         if target:
40ffef79e81f * SUNWvirt-manager.spec : Integrate virt-manager-0.6.1 to nevada_118
mattman
parents:
diff changeset
    57
             self.window.get_widget("pool-target-path").set_text(target)