Rev 578: Merge nautilus improvements. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 578
revision-id: jelmer at samba.org-20080727120106-7u0y6lxt7j6wm7su
parent: colbrac at xs4all.nl-20080727114514-7x546ayrtreulp5u
parent: jelmer at samba.org-20080725222951-9x51jo0tc1q39vo1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-07-27 14:01:06 +0200
message:
  Merge nautilus improvements.
modified:
  __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
  nautilus-bzr.py                __init__.py-20060412205316-7a81eb8ae29ffc79
    ------------------------------------------------------------
    revno: 576.2.1
    revision-id: jelmer at samba.org-20080725222951-9x51jo0tc1q39vo1
    parent: jelmer at samba.org-20080725213623-44iq5k34vc0v6z7y
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2008-07-26 00:29:51 +0200
    message:
      Use ... notation for options that lead to dialogs, fix some nautilus-bzr menu items that had regressed.
    modified:
      __init__.py                    __init__.py-20060519165329-a1fd52c8a829fcd5
      nautilus-bzr.py                __init__.py-20060412205316-7a81eb8ae29ffc79
=== modified file '__init__.py'
--- a/__init__.py	2008-07-25 15:42:45 +0000
+++ b/__init__.py	2008-07-25 22:29:51 +0000
@@ -234,7 +234,7 @@
     
     :return: The viz window object.
     """
-    from viz import BranchWindow
+    from bzrlib.plugins.gtk.viz import BranchWindow
     return BranchWindow(branch, revisions, limit)
 
 

=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py	2008-05-05 18:16:46 +0000
+++ b/nautilus-bzr.py	2008-07-27 12:01:06 +0000
@@ -19,7 +19,10 @@
 from bzrlib.plugin import load_plugins
 load_plugins()
 
-from bzrlib.plugins.gtk import _i18n, cmd_visualise, cmd_gannotate
+from bzrlib.plugins.gtk import _i18n, cmd_gannotate, start_viz_window
+
+print "Bazaar nautilus module initialized"
+
 
 class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
     def __init__(self):
@@ -174,14 +177,13 @@
 
         # We only want to continue here if we get a NotBranchError
         try:
-            tree, path = WorkingTree.open_containing(file)
+            branch, path = Branch.open_containing(file)
         except NotBranchError:
             return
 
-        vis = cmd_visualise()
-        vis.run(file)
-
-        return
+        pp = start_viz_window(branch, [branch.last_revision()])
+        pp.show()
+        gtk.main()
 
     def pull_cb(self, menu, vfs_file):
         # We can only cope with local files
@@ -216,8 +218,8 @@
 
         from bzrlib.plugins.gtk.merge import MergeDialog
         dialog = MergeDialog(tree, path)
-        dialog.display()
-        gtk.main()
+        dialog.run()
+        dialog.destroy()
 
     def get_background_items(self, window, vfs_file):
         items = []
@@ -237,7 +239,7 @@
             items.append(item)
 
             item = nautilus.MenuItem('BzrNautilus::clone',
-                                 'Checkout Bazaar branch',
+                                 'Checkout Bazaar branch ...',
                                  'Checkout Existing Bazaar Branch')
             item.connect('activate', self.clone_cb, vfs_file)
             items.append(item)
@@ -254,31 +256,31 @@
             return item,
         else:
             item = nautilus.MenuItem('BzrNautilus::disable',
-                                      'Disable Bazaar Plugin for the Branch',
+                                      'Disable Bazaar Plugin this Branch',
                                       'Disable Bazaar plugin for nautilus')
             item.connect('activate', self.toggle_integration, 'False', vfs_file)
             items.append(item)
 
         item = nautilus.MenuItem('BzrNautilus::log',
-                             'Log',
+                             'History ...',
                              'Show Bazaar history')
         item.connect('activate', self.log_cb, vfs_file)
         items.append(item)
 
         item = nautilus.MenuItem('BzrNautilus::pull',
-                             'Pull',
+                             'Pull ...',
                              'Pull from another branch')
         item.connect('activate', self.pull_cb, vfs_file)
         items.append(item)
 
         item = nautilus.MenuItem('BzrNautilus::merge',
-                             'Merge',
+                             'Merge ...',
                              'Merge from another branch')
         item.connect('activate', self.merge_cb, vfs_file)
         items.append(item)
 
         item = nautilus.MenuItem('BzrNautilus::commit',
-                             'Commit',
+                             'Commit ...',
                              'Commit Changes')
         item.connect('activate', self.commit_cb, vfs_file)
         items.append(item)
@@ -341,13 +343,13 @@
                 items.append(item)
             elif wtfiles[path] == 'V':
                 item = nautilus.MenuItem('BzrNautilus::log',
-                                 'Log',
+                                 'History ...',
                                  'List changes')
                 item.connect('activate', self.log_cb, vfs_file)
                 items.append(item)
 
                 item = nautilus.MenuItem('BzrNautilus::diff',
-                                 'Diff',
+                                 'View Changes ...',
                                  'Show differences')
                 item.connect('activate', self.diff_cb, vfs_file)
                 items.append(item)
@@ -359,13 +361,13 @@
                 items.append(item)
 
                 item = nautilus.MenuItem('BzrNautilus::annotate',
-                             'Annotate',
+                             'Annotate ...',
                              'Annotate File Data')
                 item.connect('activate', self.annotate_cb, vfs_file)
                 items.append(item)
 
                 item = nautilus.MenuItem('BzrNautilus::commit',
-                             'Commit',
+                             'Commit ...',
                              'Commit Changes')
                 item.connect('activate', self.commit_cb, vfs_file)
                 items.append(item)