meld r1274 - in trunk: . glade2

[vincele svn gnome org]

Author: vincele
Date: Fri Mar 20 00:06:01 2009
New Revision: 1274
URL: http://svn.gnome.org/viewvc/meld?rev=1274&view=rev

Log:
Remove buttonjump, as this was not finished and not activated


Modified:
   trunk/glade2/vcview.glade
   trunk/vcview.py

Modified: trunk/glade2/vcview.glade
==============================================================================
--- trunk/glade2/vcview.glade	(original)
+++ trunk/glade2/vcview.glade	Fri Mar 20 00:06:01 2009
@@ -45,32 +45,6 @@
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkButton" id="button_jump">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="button_press_event" handler="on_button_jump_press_event" last_modification_time="Thu, 22 May 2003 18:32:48 GMT"/>
-
-	      <child>
-		<widget class="GtkImage" id="image1">
-		  <property name="visible">True</property>
-		  <property name="stock">gtk-jump-to</property>
-		  <property name="icon_size">4</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>

Modified: trunk/vcview.py
==============================================================================
--- trunk/vcview.py	(original)
+++ trunk/vcview.py	Fri Mar 20 00:06:01 2009
@@ -187,8 +187,6 @@
         self.treeview_column_location.set_visible(self.actiongroup.get_action("VcFlatten").get_active())
         self.fileentry.show() #TODO: remove once bug 97503 is fixed
         size = self.fileentry.size_request()[1]
-        self.button_jump.set_size_request(size, size)
-        self.button_jump.hide()
         if not self.prefs.vc_console_visible:
             self.on_console_view_toggle(self.console_hide_box)
 
@@ -504,36 +502,6 @@
         else: # XXX fixme
             self.refresh()
 
-    def on_button_jump_press_event(self, button, event):
-        class MyMenu(gtk.Menu):
-            def __init__(self, parent, where, showup=1):
-                gtk.Menu.__init__(self)
-                self.vcview = parent
-                self.map_id = self.connect("map", lambda item: self.on_map(item,where,showup) )
-            def add_item(self, name, submenu, showup):
-                item = gtk.MenuItem(name)
-                if submenu:
-                    item.set_submenu( MyMenu(self.vcview, submenu, showup ) )
-                self.append( item )
-            def on_map(self, item, where, showup):
-                if showup:
-                    self.add_item("..", os.path.dirname(where), 1 )
-                self.populate( where, self.listdir(where) )
-                self.show_all()
-                self.disconnect(self.map_id)
-                del self.map_id
-            def listdir(self, d):
-                try:
-                    return [p for p in os.listdir(d) if os.path.isdir( os.path.join(d,p))]
-                except OSError:
-                    return []
-            def populate(self, where, children):
-                for child in children:
-                    cc = self.listdir( os.path.join(where, child) )
-                    self.add_item( child, len(cc) and os.path.join(where,child), 0 )
-        menu = MyMenu( self, os.path.abspath(self.location) )
-        menu.popup(None, None, None, event.button, event.time)
-
     def _update_item_state(self, it, vcentry, location):
         e = vcentry
         self.model.set_state( it, 0, e.state, e.isdir )