/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 branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-23 09:49:44 UTC
  • mfrom: (723.1.1 isearch)
  • Revision ID: jelmer@samba.org-20110323094944-7n5h1vif3xpbze3p
Merge support for interactive substring search in bzr viz and annotate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
16
16
 
17
17
import os
18
18
 
19
 
from gi.repository import GObject
20
 
from gi.repository import Gtk
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
 
 
25
import gtk
21
26
 
22
27
from bzrlib import (
23
28
    errors,
25
30
from bzrlib.branch import Branch
26
31
from bzrlib.transport import get_transport
27
32
 
 
33
 
 
34
from bzrlib.plugins.gtk import _i18n
 
35
 
28
36
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog
29
37
from bzrlib.plugins.gtk.errors import show_bzr_error
30
 
from bzrlib.plugins.gtk.i18n import _i18n
31
38
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
32
39
 
33
40
 
34
 
class BranchDialog(Gtk.Dialog):
 
41
class BranchDialog(gtk.Dialog):
35
42
    """ New implementation of the Branch dialog. """
36
43
 
37
44
    def __init__(self, path=None, parent=None, remote_path=None):
38
45
        """ Initialize the Branch dialog. """
39
 
        GObject.GObject.__init__(self, title="Branch - Olive",
 
46
        gtk.Dialog.__init__(self, title="Branch - Olive",
40
47
                                  parent=parent,
41
48
                                  flags=0,
42
 
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
49
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
43
50
 
44
51
        # Get arguments
45
52
        self.path = path
46
53
 
47
54
        # Create the widgets
48
 
        self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
 
55
        self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
49
56
        self._remote_branch = BranchSelectionBox()
50
 
        self._button_revision = Gtk.Button('')
51
 
        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
 
57
        self._button_revision = gtk.Button('')
 
58
        self._label_location = gtk.Label(_i18n("Branch location:"))
52
59
        self._label_location.set_alignment(0, 0.5)
53
 
        self._label_destination = Gtk.Label(label=_i18n("Destination:"))
54
 
        self._label_nick = Gtk.Label(label=_i18n("Branck nick:"))
55
 
        self._label_revision = Gtk.Label(label=_i18n("Revision:"))
56
 
        self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
57
 
        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
58
 
        self._hbox_revision = Gtk.HBox()
59
 
        self._entry_revision = Gtk.Entry()
60
 
        self._entry_nick = Gtk.Entry()
 
60
        self._label_destination = gtk.Label(_i18n("Destination:"))
 
61
        self._label_nick = gtk.Label(_i18n("Branck nick:"))
 
62
        self._label_revision = gtk.Label(_i18n("Revision:"))
 
63
        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
 
64
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
 
65
        self._hbox_revision = gtk.HBox()
 
66
        self._entry_revision = gtk.Entry()
 
67
        self._entry_nick = gtk.Entry()
61
68
 
62
69
        # Set callbacks
63
70
        self._button_branch.connect('clicked', self._on_branch_clicked)
65
72
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
66
73
 
67
74
        # Create the table and pack the widgets into it
68
 
        self._table = Gtk.Table(rows=3, columns=2)
 
75
        self._table = gtk.Table(rows=3, columns=2)
69
76
        self._table.attach(self._label_location, 0, 1, 0, 1)
70
77
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
71
78
        self._table.attach(self._label_destination, 0, 1, 1, 2)
76
83
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
77
84
 
78
85
        # Set properties
79
 
        self._image_browse = Gtk.Image()
80
 
        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
 
86
        self._image_browse = gtk.Image()
 
87
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
81
88
        self._button_revision.set_image(self._image_browse)
82
89
        self._button_revision.set_sensitive(False)
83
90
        self._label_destination.set_alignment(0, 0.5)
119
126
            return
120
127
        revb = RevisionBrowser(br, self)
121
128
        response = revb.run()
122
 
        if response != Gtk.ResponseType.NONE:
 
129
        if response != gtk.RESPONSE_NONE:
123
130
            revb.hide()
124
131
 
125
 
            if response == Gtk.ResponseType.OK:
 
132
            if response == gtk.RESPONSE_OK:
126
133
                if revb.selected_revno is not None:
127
134
                    self._entry_revision.set_text(revb.selected_revno)
128
135
 
176
183
        info_dialog(_i18n('Branching successful'),
177
184
                    _i18n('%d revision(s) branched.') % revs)
178
185
 
179
 
        self.response(Gtk.ResponseType.OK)
 
186
        self.response(gtk.RESPONSE_OK)
180
187
 
181
188
    def _on_branch_changed(self, widget, event):
182
189
        """ We try to get the last revision if focus lost. """