/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to search.py

  • Committer: Curtis Hovey
  • Date: 2011-09-03 01:25:04 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110903012504-0jr4diz9033g5df2
Menu fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
search.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
try:
18
 
    import pygtk
19
 
    pygtk.require("2.0")
20
 
except:
21
 
    pass
22
 
 
23
 
import gobject
24
 
import gtk
 
17
from gi.repository import GObject
 
18
from gi.repository import Gtk
25
19
 
26
20
from bzrlib.plugins.search import index as _mod_index
27
21
 
28
22
from bzrlib.plugins.gtk.i18n import _i18n
29
23
 
30
 
class SearchDialog(gtk.Dialog):
 
24
class SearchDialog(Gtk.Dialog):
31
25
    """Search dialog."""
32
26
    def __init__(self, index, parent=None):
33
 
        gtk.Dialog.__init__(self, title="Search Revisions",
 
27
        GObject.GObject.__init__(self, title="Search Revisions",
34
28
                                  parent=parent,
35
 
                                  flags=gtk.DIALOG_MODAL,
36
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
37
 
                                           gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
38
 
        pixbuf = self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_MENU)
 
29
                                  flags=Gtk.DialogFlags.MODAL,
 
30
                                  buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
 
31
                                           Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
32
        pixbuf = self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.MENU)
39
33
        self.set_icon(pixbuf)
40
34
        
41
35
        # Get arguments
42
36
        self.index = index
43
37
 
44
 
        self.searchbar = gtk.HBox()
45
 
        searchbar_label = gtk.Label(_i18n("Search for:"))
 
38
        self.searchbar = Gtk.HBox()
 
39
        searchbar_label = Gtk.Label(label=_i18n("Search for:"))
46
40
        self.searchbar.pack_start(searchbar_label, False, False, 0)
47
 
        self.searchentry = gtk.Entry()
 
41
        self.searchentry = Gtk.Entry()
48
42
        self.searchentry.connect('activate', self._searchentry_activate)
49
43
        # TODO: Completion using the bzr-search suggests functionality
50
44
        self.searchbar.add(self.searchentry)
51
45
        self.vbox.pack_start(self.searchbar, expand=False, fill=False)
52
46
 
53
 
        self.results_model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
54
 
        self.results_treeview = gtk.TreeView(self.results_model)
 
47
        self.results_model = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_PYOBJECT)
 
48
        self.results_treeview = Gtk.TreeView(self.results_model)
55
49
        self.results_treeview.connect("row-activated", self._searchresult_row_activated)
56
50
 
57
 
        documentname_column = gtk.TreeViewColumn(_i18n("Document"), gtk.CellRendererText(), text=0)
 
51
        documentname_column = Gtk.TreeViewColumn(_i18n("Document"), Gtk.CellRendererText(), text=0)
58
52
        self.results_treeview.append_column(documentname_column)
59
53
 
60
 
        summary_column = gtk.TreeViewColumn(_i18n("Summary"), gtk.CellRendererText(), text=1)
 
54
        summary_column = Gtk.TreeViewColumn(_i18n("Summary"), Gtk.CellRendererText(), text=1)
61
55
        self.results_treeview.append_column(summary_column)
62
56
 
63
 
        results_scrolledwindow = gtk.ScrolledWindow()
64
 
        results_scrolledwindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
57
        results_scrolledwindow = Gtk.ScrolledWindow()
 
58
        results_scrolledwindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
65
59
        results_scrolledwindow.add(self.results_treeview)
66
60
 
67
61
        self.vbox.pack_start(results_scrolledwindow, expand=True, fill=True)
94
88
            self.index._branch.unlock()
95
89
    
96
90
    def _searchresult_row_activated(self, treeview, path, view_column):
97
 
        self.response(gtk.RESPONSE_OK)
 
91
        self.response(Gtk.ResponseType.OK)