/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-08-27 18:35:08 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827183508-ugqbp58na4mtt1no
Updated the pixbuf calls to gtk3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
from bzrlib.plugins.gtk import _i18n
28
 
 
29
 
class SearchDialog(gtk.Dialog):
 
21
 
 
22
from bzrlib.plugins.gtk.i18n import _i18n
 
23
 
 
24
class SearchDialog(Gtk.Dialog):
30
25
    """Search dialog."""
31
26
    def __init__(self, index, parent=None):
32
 
        gtk.Dialog.__init__(self, title="Search Revisions",
 
27
        GObject.GObject.__init__(self, title="Search Revisions",
33
28
                                  parent=parent,
34
 
                                  flags=gtk.DIALOG_MODAL,
35
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
36
 
                                           gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
37
 
        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)
38
33
        self.set_icon(pixbuf)
39
34
        
40
35
        # Get arguments
41
36
        self.index = index
42
37
 
43
 
        self.searchbar = gtk.HBox()
44
 
        searchbar_label = gtk.Label(_i18n("Search for:"))
 
38
        self.searchbar = Gtk.HBox()
 
39
        searchbar_label = Gtk.Label(label=_i18n("Search for:"))
45
40
        self.searchbar.pack_start(searchbar_label, False, False, 0)
46
 
        self.searchentry = gtk.Entry()
 
41
        self.searchentry = Gtk.Entry()
47
42
        self.searchentry.connect('activate', self._searchentry_activate)
48
43
        # TODO: Completion using the bzr-search suggests functionality
49
44
        self.searchbar.add(self.searchentry)
50
45
        self.vbox.pack_start(self.searchbar, expand=False, fill=False)
51
46
 
52
 
        self.results_model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
53
 
        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)
54
49
        self.results_treeview.connect("row-activated", self._searchresult_row_activated)
55
50
 
56
 
        documentname_column = gtk.TreeViewColumn(_i18n("Document"), gtk.CellRendererText(), text=0)
 
51
        documentname_column = Gtk.TreeViewColumn(_i18n("Document"), Gtk.CellRendererText(), text=0)
57
52
        self.results_treeview.append_column(documentname_column)
58
53
 
59
 
        summary_column = gtk.TreeViewColumn(_i18n("Summary"), gtk.CellRendererText(), text=1)
 
54
        summary_column = Gtk.TreeViewColumn(_i18n("Summary"), Gtk.CellRendererText(), text=1)
60
55
        self.results_treeview.append_column(summary_column)
61
56
 
62
 
        results_scrolledwindow = gtk.ScrolledWindow()
63
 
        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)
64
59
        results_scrolledwindow.add(self.results_treeview)
65
60
 
66
61
        self.vbox.pack_start(results_scrolledwindow, expand=True, fill=True)
93
88
            self.index._branch.unlock()
94
89
    
95
90
    def _searchresult_row_activated(self, treeview, path, view_column):
96
 
        self.response(gtk.RESPONSE_OK)
 
91
        self.response(Gtk.ResponseType.OK)