meld r1038 - in trunk: . glade2

[stevek svn gnome org]

Author: stevek
Date: Thu Sep  4 08:22:23 2008
New Revision: 1038
URL: http://svn.gnome.org/viewvc/meld?rev=1038&view=rev

Log:
Remove 'Edit' item for folders. Bug 384420 Kai Willadsen


Modified:
   trunk/dirdiff.py
   trunk/filediff.py
   trunk/glade2/dirdiff-ui.xml
   trunk/glade2/filediff-ui.xml
   trunk/glade2/vcview-ui.xml
   trunk/melddoc.py
   trunk/vcview.py

Modified: trunk/dirdiff.py
==============================================================================
--- trunk/dirdiff.py	(original)
+++ trunk/dirdiff.py	Thu Sep  4 08:22:23 2008
@@ -199,7 +199,7 @@
             ("DirDelete",    gtk.STOCK_DELETE,        None,         None, _("Delete selected"), self.on_button_delete_clicked),
             ("Hide",         gtk.STOCK_NO,           _("Hide..."),  None, _("Hide selected"), self.on_filter_hide_current_clicked),
 
-            ("DirEditFile",  gtk.STOCK_FIND_AND_REPLACE, _("Edit"), None, _("Edit selected"), self.on_button_edit_clicked),
+            ("DirOpen",      gtk.STOCK_OPEN,          None,         None, _("Open selected"), self.on_button_open_clicked),
         )
 
         toggleactions = (
@@ -693,12 +693,12 @@
         self.copy_selected(1)
     def on_button_delete_clicked(self, button):
         self.delete_selected()
-    def on_button_edit_clicked(self, button):
+    def on_button_open_clicked(self, button):
         pane = self._get_focused_pane()
         if pane != None:
             m = self.model
             files = [ m.value_path( m.get_iter(p), pane ) for p in self._get_selected_paths(pane) ]
-            self._edit_files( [f for f in files if os.path.isfile(f)] )
+            self._open_files(files)
 
     def on_button_ignore_case_toggled(self, button):
         self.refresh()

Modified: trunk/filediff.py
==============================================================================
--- trunk/filediff.py	(original)
+++ trunk/filediff.py	Thu Sep  4 08:22:23 2008
@@ -137,7 +137,7 @@
             ("FilePopupCut",      gtk.STOCK_CUT,        None,            None, _("Cut the selection"), self.on_cut_activate),
             ("FilePopupCopy",     gtk.STOCK_COPY,       None,            None, _("Copy the selection"), self.on_copy_activate),
             ("FilePopupPaste",    gtk.STOCK_PASTE,      None,            None, _("Paste the clipboard"), self.on_paste_activate),
-            ("FilePopupEditFile", gtk.STOCK_EDIT,       None,            None, _("Edit the selected file"), self.on_edit_activate),
+            ("FileOpen",          gtk.STOCK_OPEN,       None,            None, _("Open selected"), self.on_open_activate),
             ("CreatePatch",       None,                 _("Create Patch"),  None, _("Create a patch"), self.make_patch),
             ("CopyAllLeft",       gtk.STOCK_GOTO_FIRST, _("Copy To Left"),  None, _("Copy all changes from right pane to left pane"), lambda x: self.copy_selected(-1)),
             ("CopyAllRight",      gtk.STOCK_GOTO_LAST,  _("Copy To Right"), None, _("Copy all changes from left pane to right pane"), lambda x: self.copy_selected(1)),
@@ -410,11 +410,11 @@
                 return t
         return None
 
-    def on_edit_activate(self, *args):
+    def on_open_activate(self, *args):
         pane = self._get_focused_pane()
         if pane >= 0:
             if self.bufferdata[pane].filename:
-                self._edit_files( [self.bufferdata[pane].filename] )
+                self._open_files([self.bufferdata[pane].filename])
 
     def on_find_activate(self, *args):
         self.keymask = 0

Modified: trunk/glade2/dirdiff-ui.xml
==============================================================================
--- trunk/glade2/dirdiff-ui.xml	(original)
+++ trunk/glade2/dirdiff-ui.xml	Thu Sep  4 08:22:23 2008
@@ -22,7 +22,7 @@
     <menuitem action="DirCopyLeft" />
     <menuitem action="DirCopyRight" />
     <separator/>
-    <menuitem action="DirEditFile" />
+    <menuitem action="DirOpen" />
     <separator/>
     <menuitem action="DirDelete" />
   </popup>

Modified: trunk/glade2/filediff-ui.xml
==============================================================================
--- trunk/glade2/filediff-ui.xml	(original)
+++ trunk/glade2/filediff-ui.xml	Thu Sep  4 08:22:23 2008
@@ -13,7 +13,7 @@
     <menuitem action="CopyAllLeft" />
     <menuitem action="CopyAllRight" />
     <separator/>
-    <menuitem action="FilePopupEditFile" />
+    <menuitem action="FileOpen" />
   </popup>
 
 </ui>

Modified: trunk/glade2/vcview-ui.xml
==============================================================================
--- trunk/glade2/vcview-ui.xml	(original)
+++ trunk/glade2/vcview-ui.xml	Thu Sep  4 08:22:23 2008
@@ -22,7 +22,7 @@
     <menuitem action="VcUpdate" />
     <menuitem action="VcCommit" />
     <separator/>
-    <menuitem action="VcEditFile" />
+    <menuitem action="VcOpen" />
     <separator/>
     <menuitem action="VcAdd" />
     <menuitem action="VcAddBinary" />

Modified: trunk/melddoc.py
==============================================================================
--- trunk/melddoc.py	(original)
+++ trunk/melddoc.py	Thu Sep  4 08:22:23 2008
@@ -55,7 +55,9 @@
         if len(self.scheduler.tasks):
             del self.scheduler.tasks[0]
 
-    def _edit_files(self, files):
+    def _open_files(self, selected):
+        files = [f for f in selected if os.path.isfile(f)]
+        dirs =  [d for d in selected if os.path.isdir(d)]
         if len(files):
             if self.prefs.edit_command_type == "internal":
                 for f in files:
@@ -66,6 +68,9 @@
             elif self.prefs.edit_command_type == "custom":
                 cmd = self.prefs.get_custom_editor_command(files)
                 os.spawnvp(os.P_NOWAIT, cmd[0], cmd)
+        for d in dirs:
+            cmd = ["xdg-open", d]
+            os.spawnvp(os.P_NOWAIT, cmd[0], cmd)
 
     def on_undo_activate(self):
         if self.undosequence.can_undo():

Modified: trunk/vcview.py
==============================================================================
--- trunk/vcview.py	(original)
+++ trunk/vcview.py	Thu Sep  4 08:22:23 2008
@@ -118,7 +118,7 @@
 
         actions = (
             ("VcCompare",       gtk.STOCK_DIALOG_INFO,      _("_Compare"),      None, _("Compare selected"), self.on_button_diff_clicked),
-            ("VcEditFile",      gtk.STOCK_FIND_AND_REPLACE, _("_Edit"),         None, _("Edit files"), self.on_button_edit_clicked),
+            ("VcOpen",          gtk.STOCK_OPEN,             None,               None, _("Open selected"), self.on_button_open_clicked),
             ("VcCommit",        "vc-commit-24",             _("_Commit"),       None, _("Commit"), self.on_button_commit_clicked), # FIXME: popup used to use gtk.STOCK_GO_BACK
             ("VcUpdate",        "vc-update-24",             _("_Update"),       None, _("Update"), self.on_button_update_clicked), # FIXME: popup used to use gtk.STOCK_GO_FORWARD
             ("VcAdd",           "vc-add-24",                _("_Add"),          None, _("Add to VC"), self.on_button_add_clicked), # FIXME: popup used to use gtk.STOCK_ADD
@@ -428,8 +428,8 @@
         if len(files):
             self.run_diff(files, empty_patch_ok=1)
 
-    def on_button_edit_clicked(self, object):
-        self._edit_files(self._get_selected_files())
+    def on_button_open_clicked(self, object):
+        self._open_files(self._get_selected_files())
 
     def show_patch(self, prefix, patch):
         if not patch: return