/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-04-06 14:53:44 UTC
  • Revision ID: jelmer@samba.org-20110406145344-m6s0i7q7ssjwhmwq
Support use without gtk.Spinner, which is only available in pygtk >= 2.22.

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 Gtk
 
19
try:
 
20
    import pygtk
 
21
    pygtk.require("2.0")
 
22
except:
 
23
    pass
 
24
 
 
25
import gtk
20
26
 
21
27
from bzrlib import (
22
28
    errors,
24
30
from bzrlib.branch import Branch
25
31
from bzrlib.transport import get_transport
26
32
 
 
33
 
 
34
from bzrlib.plugins.gtk import _i18n
 
35
 
27
36
from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog
28
37
from bzrlib.plugins.gtk.errors import show_bzr_error
29
 
from bzrlib.plugins.gtk.i18n import _i18n
30
38
from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
31
39
 
32
40
 
33
 
class BranchDialog(Gtk.Dialog):
 
41
class BranchDialog(gtk.Dialog):
34
42
    """ New implementation of the Branch dialog. """
35
43
 
36
44
    def __init__(self, path=None, parent=None, remote_path=None):
37
45
        """ Initialize the Branch dialog. """
38
 
        super(BranchDialog, self).__init__(
39
 
            title="Branch - Olive", parent=parent, flags=0,
40
 
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
46
        gtk.Dialog.__init__(self, title="Branch - Olive",
 
47
                                  parent=parent,
 
48
                                  flags=0,
 
49
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
41
50
 
42
51
        # Get arguments
43
52
        self.path = path
44
53
 
45
54
        # Create the widgets
46
 
        self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
 
55
        self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
47
56
        self._remote_branch = BranchSelectionBox()
48
 
        self._button_revision = Gtk.Button('')
49
 
        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
 
57
        self._button_revision = gtk.Button('')
 
58
        self._label_location = gtk.Label(_i18n("Branch location:"))
50
59
        self._label_location.set_alignment(0, 0.5)
51
 
        self._label_destination = Gtk.Label(label=_i18n("Destination:"))
52
 
        self._label_nick = Gtk.Label(label=_i18n("Branck nick:"))
53
 
        self._label_revision = Gtk.Label(label=_i18n("Revision:"))
54
 
        self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
55
 
        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
56
 
        self._hbox_revision = Gtk.HBox()
57
 
        self._entry_revision = Gtk.Entry()
58
 
        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()
59
68
 
60
69
        # Set callbacks
61
70
        self._button_branch.connect('clicked', self._on_branch_clicked)
63
72
        self._remote_branch.connect('branch-changed', self._on_branch_changed)
64
73
 
65
74
        # Create the table and pack the widgets into it
66
 
        self._table = Gtk.Table(rows=3, columns=2)
 
75
        self._table = gtk.Table(rows=3, columns=2)
67
76
        self._table.attach(self._label_location, 0, 1, 0, 1)
68
77
        self._table.attach(self._remote_branch, 1, 2, 0, 1)
69
78
        self._table.attach(self._label_destination, 0, 1, 1, 2)
74
83
        self._table.attach(self._hbox_revision, 1, 2, 3, 4)
75
84
 
76
85
        # Set properties
77
 
        self._image_browse = Gtk.Image()
78
 
        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)
79
88
        self._button_revision.set_image(self._image_browse)
80
89
        self._button_revision.set_sensitive(False)
81
90
        self._label_destination.set_alignment(0, 0.5)
83
92
        self._label_revision.set_alignment(0, 0.5)
84
93
        self._table.set_row_spacings(3)
85
94
        self._table.set_col_spacings(3)
86
 
        self.get_content_area().set_spacing(3)
 
95
        self.vbox.set_spacing(3)
87
96
        if remote_path is not None:
88
97
            self._remote_branch.set_url(remote_path)
89
98
        if self.path is not None:
90
99
            self._filechooser.set_filename(self.path)
91
100
 
92
101
        # Pack some widgets
93
 
        self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
94
 
        self._hbox_revision.pack_start(self._button_revision, False, False, 0)
95
 
        self.get_content_area().add(self._table)
96
 
        self.action_area.pack_end(self._button_branch, False, False, 0)
 
102
        self._hbox_revision.pack_start(self._entry_revision, True, True)
 
103
        self._hbox_revision.pack_start(self._button_revision, False, False)
 
104
        self.vbox.add(self._table)
 
105
        self.action_area.pack_end(self._button_branch)
97
106
 
98
107
        # Show the dialog
99
 
        self.get_content_area().show_all()
 
108
        self.vbox.show_all()
100
109
 
101
110
    def _get_last_revno(self):
102
111
        """ Get the revno of the last revision (if any). """
117
126
            return
118
127
        revb = RevisionBrowser(br, self)
119
128
        response = revb.run()
120
 
        if response != Gtk.ResponseType.NONE:
 
129
        if response != gtk.RESPONSE_NONE:
121
130
            revb.hide()
122
131
 
123
 
            if response == Gtk.ResponseType.OK:
 
132
            if response == gtk.RESPONSE_OK:
124
133
                if revb.selected_revno is not None:
125
134
                    self._entry_revision.set_text(revb.selected_revno)
126
135
 
174
183
        info_dialog(_i18n('Branching successful'),
175
184
                    _i18n('%d revision(s) branched.') % revs)
176
185
 
177
 
        self.response(Gtk.ResponseType.OK)
 
186
        self.response(gtk.RESPONSE_OK)
178
187
 
179
188
    def _on_branch_changed(self, widget, event):
180
189
        """ We try to get the last revision if focus lost. """