[meld] filediff: Remove the lock button from its prime position above the diffmap



commit d6847c2348bb02eb22625d3da843236cf32bc3fd
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Dec 18 05:54:08 2013 +1000

    filediff: Remove the lock button from its prime position above the diffmap

 data/ui/filediff.ui |   22 ----------------------
 meld/filediff.py    |    6 ------
 2 files changed, 0 insertions(+), 28 deletions(-)
---
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index c5b7aee..a401ff8 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -461,28 +461,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton" id="lock_button">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Lock scrolling of all panes</property>
-                <property name="relief">none</property>
-                <signal name="toggled" handler="on_lock_button_toggled" swapped="no"/>
-                <child>
-                  <object class="GtkImage" id="lock_button_image">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">meld-locked</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">6</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
               <object class="LinkMap" id="linkmap0">
                 <property name="width_request">50</property>
                 <property name="visible">True</property>
diff --git a/meld/filediff.py b/meld/filediff.py
index 2e1b048..a638df1 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1766,13 +1766,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
     def on_action_lock_scrolling_toggled(self, action):
         self.toggle_scroll_lock(action.get_active())
 
-    def on_lock_button_toggled(self, button):
-        self.toggle_scroll_lock(not button.get_active())
-
     def toggle_scroll_lock(self, locked):
-        icon_name = "meld-locked" if locked else "meld-unlocked"
-        self.lock_button_image.props.icon_name = icon_name
-        self.lock_button.set_active(not locked)
         self.actiongroup.get_action("LockScrolling").set_active(locked)
         self._scroll_lock = not locked
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]