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