Add i18n support Add icon STOCK_FIND Add label to search box Add signal handling on double-clicking/pressing enter on search result
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: 92335b290c10331b67c6de8ce85663377e8d7c1e # timestamp: 2008-07-20 13:26:14 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'search.py' --- search.py 2008-07-17 12:30:39 +0000 +++ search.py 2008-07-20 11:26:08 +0000 @@ -20,9 +20,11 @@ except: pass -import gobject, gtk +import gobject +import gtk + from bzrlib.plugins.search import index as _mod_index - +from bzrlib.plugins.gtk import _i18n class SearchDialog(gtk.Dialog): """Search dialog.""" @@ -32,11 +34,15 @@ flags=gtk.DIALOG_MODAL, buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) - + pixbuf = self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU) + self.set_icon(pixbuf) + # Get arguments self.index = index self.searchbar = gtk.HBox() + searchbar_label = gtk.Label(_i18n("Search for:")) + self.searchbar.pack_start(searchbar_label, False, False, 0) self.searchentry = gtk.Entry() self.searchentry.connect('activate', self._searchentry_activate) # TODO: Completion using the bzr-search suggests functionality @@ -45,11 +51,12 @@ self.results_model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT) self.results_treeview = gtk.TreeView(self.results_model) + self.results_treeview.connect("row-activated", self._searchresult_row_activated) - documentname_column = gtk.TreeViewColumn("Document", gtk.CellRendererText(), text=0) + documentname_column = gtk.TreeViewColumn(_i18n("Document"), gtk.CellRendererText(), text=0) self.results_treeview.append_column(documentname_column) - summary_column = gtk.TreeViewColumn("Summary", gtk.CellRendererText(), text=1) + summary_column = gtk.TreeViewColumn(_i18n("Summary"), gtk.CellRendererText(), text=1) self.results_treeview.append_column(summary_column) results_scrolledwindow = gtk.ScrolledWindow() @@ -84,3 +91,6 @@ self.results_model.append([result.document_name(), result.summary(), revid]) finally: self.index._branch.unlock() + + def _searchresult_row_activated(self, treeview, path, view_column): + self.emit("response", gtk.RESPONSE_OK) # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdxAgnAAAfzfgEQQUWf//3+/ 3xC////wUATbReEN2ndmy6UxQlFKe01HoENRhNNGmg0YT0TQeiHqaZGmgEkkaYhoFJ5NqnslGQyN AAAAA9QCU0hAJiCfqSeUPJPQmnqaAaaADE0aNDjJkyYjEwAmTBMgBowjAEMAkkmmRPQgZJ6NTI0n k1BoxHpAAA0NIMx9Z146yr8VyD85+AnO+iULdUIiuZCa5du7+xo10QGToGtbqWuMqZ23667UAVpG yzlPbUwzJb3/MV9lsJCyFGWBBURbGEE4mwfGMOq4+952wvj1dkTr648U/9WWtvSMnYUqlUvZeVWR vRuvldZCBILnJ8O/Q+CfV2KHHoo4L8GanVPmihMIRjtztaCgiChX01ur58f44+Fry3KXQOmr+tQV 6fg2nYkgmKWitjvG7XJDMCcm42CLubhJQDAuzZO0zstmaILM2xt4kbyCguR5oBcBUpKBs4dckqGD NNolZtkJ7EdjGSoWtr7spxHmIoyWYu3DOiQ6gtCJaajvE+oqy16ATILTIQYZzreDM8mE0RwaT/Cq U6kFKbHRjLbo3kiM3nK1aNSPKsFQTGOcfK6gImTFY8lYROZmMy05xG4ifwTavHUzMTdY8xdFtjXj zFqrBQIP4DZEDasSgovlcQa9kG4UkcpE3i3izOSuQsWSWMzKwyJ4S6is/1CNk68SLTZDxiI4tHkR xJVrp7OBVURkzGSfYZQlY3rORDexGYNOQ1UiwXBuQ6iauk5tsKHKU8KmAQkkRiqKq6thThMJsIW7 Pnfu/C4jto/Vj2jGyD8q8SnjCUfKY1Sm+0gbSgh1i73kinYP67rPcq9dFBFA7Shg2R5y6YOkzYiq GcxmcxE+Q5DeswhkNHMOLWUsDQt0RCC9Yx9LUE3jZSEElQg1m9U1I/YShsquNBUiSg1nsIB9vDat 3KI6qPwP7hHIayQjeS1BgyuZE7mWnrv+x8x2W5sKW36yxpmsghNn5jFnageoNB3B2yYlkmvncj+6 vkErtIL2FFHXy697GWPqKS3PjV4fhYHZH5KITn9DHEmusF9bxwqDkTSOwStpLk11cyMQ5a0tx6Cc erIB0D5xmYH6RwD0XfEpRHzRGwS2LiPGNxSXmwuP15dGCB+eBlU7RsmNlfctSY+SOJsqG0hB2vRg MS55Jsc83zPKQ1BrO8VRdNpFNougHlZDZkvhGIEgMDEtY+XRbvFC5mYBsqzg7Vg2hhkFYixMVXto I33MRSzsttSKTRnflMa0qbclqMhNaVKgIEey/GV0QKWRRoILui6JEHg4cM1QwsLi/FQFKdC+Z4dX OInzPdOJzIZc1Mu++gu0gvGNQxLAcOS6HZvRopzDByeihYTgoeoWp1dAs8J8OGtPnNtgdm+l+aCb abKiobcUK0VS6ynmNow9kONAiYGcCbymk6cU6InGm7sIZPI/KymsplzzLps8NsLAwcpDHkaZcRQo pLTxDEbhI1nfKszH8yaFPZsyipgk22SJEbuUCF7ZsWIUg4V1Q5OWl2y2RzkegTb9BUSLoDmAotZh kCislNyJc1oxVCwHZ8Xait1ZweYt3iI8sgrOLnoYz9q6RVqxXGVgKzmHY2kJDi0NvedMrD3DbRih m4KbXQnR5gtqKJ/8XckU4UJDcQIJwA==
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
