Small fixes in olive/menu.py and olive/bookmark.py 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: 566b88ce491683487a42e6e679764e6ad9034afa # timestamp: 2008-07-21 00:36:51 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/bookmark.py' --- olive/bookmark.py 2008-07-10 12:22:16 +0000 +++ olive/bookmark.py 2008-07-20 22:36:42 +0000 @@ -22,7 +22,7 @@ import gtk -from olive import Preferences +from bzrlib.plugins.gtk.olive import Preferences from bzrlib.plugins.gtk import _i18n from bzrlib.plugins.gtk.dialog import error_dialog
=== modified file 'olive/menu.py'
--- olive/menu.py 2008-07-18 10:40:23 +0000
+++ olive/menu.py 2008-07-20 22:36:42 +0000
@@ -261,13 +261,16 @@
# TODO: how to enter a directory?
return
else:
- fullpath = self.path + os.sep + filename
+ fullpath = os.path.join(self.path, filename)
if os.path.isdir(fullpath):
# selected item is an existant directory
# TODO: how to enter a directory?
- return
+ # Jasper, 21-7-08: Let's just open the folder in a file browser
+ # instead of ignoring the explicit open (when double
+ # clicking suffices for browsing)
+ launch.launch(fullpath)
else:
- launch(fullpath)
+ launch.launch(fullpath)
def revert(self, action):
""" Right context menu -> Revert """
@@ -357,7 +360,7 @@
path = self.selected
if path != None:
- launch(path)
+ launch.launch(path)
def diff_selected(self, action):
""" Diff toolbutton -> Selected... """
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWctM+iMAAl7fgABUWef//3OU
QAC////wUATs9jmJHLu1tTdjrnCSJTaI1T0n7QmSZkp5TyahptIGg8pk2oJJEniYjUk2p7Sm01Ho
ybUmg9QGgaAMSE1T0PRTynqekybJHqAAyDJoAHMAmAEwAAmAAJgACSQRkJhT0GJomKnomaDQhgJm
kC26/Dn2EWgfrQfI1OauXOjJQmTL2t64bI5ZopLJKjZJ1GZPlG+onGiQIk7sSynUIhJJAu9SYfMG
0ycJIUIZkyG9GqZg9yjstu55UDND3meH8aFSu3cN22A25JUylV0tfW05HsqgFjH0YGk4q4b+Psfm
Wn9HKHAjxdC8B4XwEu5c92jtHax9UDR7HvbfX5jQJxwpoZIlcWgbbF65qt5xKKJ9c4UoV+nGbpYT
MMr1HsstIfVFUUi5pMWyB64Jkg0J3RawDaQcyKdhjDaSAzC5ygNEZIcXITHPAooTO+p+8JFkF7VZ
nl8bEKEMC4v4Euo4wtdJ+uhb6LJdJfpo8iWJo0ONV3ZgXDx9avHjKJmp7TaBZS9IGVAwGJabpPc5
1KDUeBDeMdBg7hlQUpaFE4tVOqaaYxWOIFCntrKiIDjI3nYYizRkTLGkniMnD0dAqW9CxLyQxDAn
rPCugzMamSptKX1K8SgHQ+xNPe2o0CcKNzk4YcBSz202hGZiPMg2nkUgNU20uGm4ZFp3OSIXF2hd
WWhkegyX/lN+rV7i1JWD40HpIlxIpN5caGZDAzJudsUyYxuAlmdlu2XuN+I6BIqAYtOpastaSsvD
iTP1GFRBM/uZlSB2I2kQ5Bh4i5E60M9+gRFLKxtCXYEHuY27DKToMIpnb2cgyeggkFuVNMUYTlUB
ENiwfkRoEUBgxEWJ5rmYIWJttJGIFpQjx4IT8Avj2qA+QeYydLvS4U1GBsJFFpwJG43gfDHc2NSE
7nTOPuEYTC5WNfAySVALjeS3DW25SHAOHMY/LPzMYjgYhHKnvN+60x2A8IjpJQAwMDZb3WUmqkrs
wPbE4MN39mxxcdCe18jccTpgvA2QoxMuQ+vcV3YHXjyy25WpnsYsTCqDLHBmsqmlGIVHjeRX+pQX
aaURu4YeAe45hqVAaDgLzFTvXg+75HYcvd4lj0Q+v9OEyvxLzGtKVVlfTy13AweQ7stY20UCXdgd
6903AzAdvr5udk0vNLqUmi5TAeOFZ80WNZh/dHPtS+KDr8fUgy7bVf+pD3mmt1kzHAPSBwRDcGaF
YhbAvovucooXMBqdoHduLey0VmJZhHSuTdZKJvCan5SrEbNWtY2wrGQaZT3GAqCL2ZJiA2MqsCZG
BIwwAeHhohehd/ko800kMwhl16xMi7x8rg5IUrczScbGYD29AhYME7UVXvWagqNnKRA0itddQ5Hr
a04yVhtGDyjEiXc7LBqAH8sVqVt3sqxjehZENptuAxUOPWjMBV8+0rZQzxoecMHWfrjG4JHKcqGY
ZMfttz9EJy4QsGbiefP4dAuTs0DikOt+4oelsZo2NzISKWlsM+EShqCODnWxCMROG8+A8m0UTWk5
OUGCzj8jwoT7b39YYJP91NHGqmtSD7CzyELwn6CCiNNdrCgIBzFnOvHoK5zqny2D/F3JFOFCQy0z
6Iw=
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
