Change locationbar bits (event signals, handling) Change key-press-event's to activate's Automatically switch to selected history view (fixes LP:144963)
Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: 97bf10830ef5431e64a544294fe32039d8e82733 # timestamp: 2008-07-20 20:55:00 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/__init__.py' --- olive/__init__.py 2008-07-20 16:29:18 +0000 +++ olive/__init__.py 2008-07-20 18:53:25 +0000 @@ -312,6 +312,7 @@ if response == gtk.RESPONSE_OK: if revb.selected_revno is not None: self.entry_history.set_text(revb.selected_revno) + self.on_entry_history_revno_activate() revb.destroy() @@ -342,6 +343,8 @@ # History Mode activated self.entry_history.set_sensitive(True) self.button_history.set_sensitive(True) + if self.entry_history.get_text() != "": + self.on_entry_history_revno_activate() else: # History Mode deactivated self.entry_history.set_sensitive(False) @@ -351,27 +354,18 @@ self.on_button_location_jump_clicked(widget) @show_bzr_error - def on_entry_history_revno_key_press_event(self, widget, event): + def on_entry_history_revno_activate(self, widget=None): """ Key pressed handler for the history entry. """ - if event.keyval == gtk.gdk.keyval_from_name('Return') or event.keyval == gtk.gdk.keyval_from_name('KP_Enter'): - # Return was hit, so we have to load that specific revision - # Emulate being remote, so inventory should be used - path = self.get_path() - if not self.remote: - self.remote = True - self.remote_branch = self.wt.branch - - revno = int(self.entry_history.get_text()) - self.remote_revision = self.remote_branch.get_rev_id(revno) - if self.set_path(path, True): - self.refresh_right() - - def on_entry_location_key_press_event(self, widget, event): - """ Key pressed handler for the location entry. """ - if event.keyval == gtk.gdk.keyval_from_name('Return') or event.keyval == gtk.gdk.keyval_from_name('KP_Enter'): - # Return was hit, so we have to jump - self.on_button_location_jump_clicked(widget) - + path = self.get_path() + if not self.remote: + self.remote = True + self.remote_branch = self.wt.branch + + revno = int(self.entry_history.get_text()) + self.remote_revision = self.remote_branch.get_rev_id(revno) + if self.set_path(path, True): + self.refresh_right() + def on_menuitem_add_files_activate(self, widget): """ Add file(s)... menu handler. """ from bzrlib.plugins.gtk.olive.add import AddDialog === modified file 'olive/window.py' --- olive/window.py 2008-07-20 16:02:18 +0000 +++ olive/window.py 2008-07-20 18:53:25 +0000 @@ -335,7 +335,7 @@ self.locationbar.pack_start(self.button_location_up, False, False, 0) self.entry_location = gtk.Entry() - self.entry_location.connect("key-press-event", self.signal.on_entry_location_key_press_event) + self.entry_location.connect("activate", self.signal.on_button_location_jump_clicked) self.locationbar.pack_start(self.entry_location, True, True, 0) self.image_location_error = gtk.Image() @@ -356,7 +356,7 @@ self.entry_history_revno = gtk.Entry() self.entry_history_revno.set_property("width-request", 75) self.entry_history_revno.set_sensitive(False) - self.entry_history_revno.connect("key-press-event", self.signal.on_entry_history_revno_key_press_event) + self.entry_history_revno.connect("activate", self.signal.on_entry_history_revno_activate) self.locationbar.pack_start(self.entry_history_revno, False, False, 0) self.button_history_browse = gtk.Button() # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb5RtBAAApD/gERUQABx5/// epVEAL////BQBbh4ClNmGiqtmtLUJKRMqe9UflPUKeR6n6p6aGU3qp6nqfpDRD1MAg0OYTAJgBMJ hNMAAAmTTQMJEgiZGmk0aaMpkGE2o00DQGRppoOYTAJgBMJhNMAAAmTTQMJJCNAmTATKYmmg0mnq ajJpkBoekKoWXh16uWa2u6R+NfF3EHbYbM8yVbj5Oc7lCYXv9Z8K+h0qAYk80cruo5+ecaUkiiSy c3dh43bV2lw220q/dLL4Usnj0w8aGhyZDbpEVJRbKJatnHlfho3ues62Gvv3/K38l07B0H3F0BDL 4rqcZCJWVFmwlXZv+bi6+LlunHGsOZ/ErqKcS4C2Tsu3SL3jAv6nnyBjJw9O1hCI9ntp3b8PtISk 9dpv/0nMSUiaBahVbgN5VLkppZuRCbDlhtRPMY1pKA3f9kw8R026Lfs2U3Hy/IUuXduypSWQNCCz g9IORuHIWkxJEYHkUk5JMOIqfYZnT5edaUrKpmhRKQiz+LrPCeSms+im0qLSQ/pZSXkkji4cGGB+ eL5CQD3lKsPQyMCcejVRNLtzJqnJAyFnsbGwyvqMAKyw3Ek6HEpSd5lTEiWUrAhXAUUCuGFSr5SV thQ3y4ymBkJnIQQySMqeh5NkTykgOhRKcwiuQlIaHgW0ZEgF7G+QnOIE5WpSBI/g6eaBWbS08AJy rGFZYwMFLTGuPgHDgMt5KQTNZvHnrYr3GfRmDM0K0qqVvH5pwWmSoNDOI8wPYc8a5U1pJxAg4BqX SFZuJS45anar78aGZZ2ECniPNCExichwONQOX3if2IG46bNGL99MzQZqsDnCfIs6KLjtWrRMlwYu MUXZ9OQiDY7mPcMmyTpwdSzapViTtcpm0SwJNtp97xeer9/hB2LBUwfWF5hpYYpeU5K0jIpQikTG z3ot6kHshwsDxGGPef9uEtxXtLrAfWqyKLDrwEtXotkC1bfhSB7dFkk8HUL164FZzMxx4luh1N1A l+OmrdDi/thzSL7TiTJhg9T1A1Eu2pOLzEoPXE5MTNFxZ9PiXsXjgYyxL1OkxOzuplwN53FTn0F5 kDQNCZz0t485Row8IU2pskxNAr+5GPcfQclGHkpDA295aTPo5GBzIkvobOYWEfFSqsgh3usMyJOR ls+vz7jfQbdOg2NIHVIHot10HjLwXmDPFw41a4UwFd2kx2LOwiyh9eDkBGVwFCW6eTUYzCCRuMBp NgxMKVxJH1WOEyyDduBXJT1RDUOR0P58c2GXQcTgZHY9hbf8Nve/mcWQyjh880Ff6nhsLcDI5HAS oKfLzZWm51faLCY80kOWWEFRrtonccjEmZupcIrQXqry6RSrLSgdZotjkfIpEpBLyIg44WCWwVt4 DBBYYq6TkSUmQMc0oG/SsLVSENuJw1xRXDnVYnFBBzLOEWBWiIakajqtmUOiFASlOC4pUeioVBMy GYSZcH8Rj4DBZmsizUS+JM6hK1Vs4IMffjKTpSIrVbgVeaMJdVIQNmLEYxDbYSwq14nkLKnOTDDD dUK4DfnXMWGsYVjx3kJXIYO5ZVCmAnvgXeepgyfppKjQCxxYsvu/KluKlWHkQKwBi8YnHR0Xx8RL jV9lo3U0Z28R3t7fEezQYPDWhywTyHEQ8qDs8gJgmRKgaPr1I53nuPdkP8avQ01oIWKI5TAxpCqV LzdKy2X4FwZbQq9xMhWJQbrcqMGmxPpJQgwZkYRXTMKbKpycl8ecH/FPM9BlmIK8yzoDwIE1K4qa jhex+k/QHq7DSUyAYn+EoS5gNe05I2CpC4FdFRiV8ie4i5awG4jGf8XckU4UJC+UbQQA
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
