/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

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