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

  • Committer: Curtis Hovey
  • Date: 2012-02-09 03:43:01 UTC
  • mto: This revision was merged to the branch mainline in revision 776.
  • Revision ID: sinzui.is@verizon.net-20120209034301-0uwkobbb0d64ugrw
Switched from Gtk.VPaned to Gtk.Paned.new(Gtk.Orientation.VERTICAL).

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkout.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
26
 
 
27
 
from bzrlib.plugins.gtk import _i18n
 
19
from gi.repository import GObject
 
20
from gi.repository import Gtk
28
21
 
29
22
from bzrlib.branch import Branch
30
23
from bzrlib.config import GlobalConfig
32
25
from bzrlib.plugins.gtk.dialog import error_dialog
33
26
from bzrlib.plugins.gtk.errors import show_bzr_error
34
27
from bzrlib.plugins.gtk.history import UrlHistory
35
 
 
36
 
 
37
 
class CheckoutDialog(gtk.Dialog):
 
28
from bzrlib.plugins.gtk.i18n import _i18n
 
29
 
 
30
 
 
31
class CheckoutDialog(Gtk.Dialog):
38
32
    """ New implementation of the Checkout dialog. """
39
33
 
40
34
    def __init__(self, path=None, parent=None, remote_path=None):
41
35
        """ Initialize the Checkout dialog. """
42
 
        gtk.Dialog.__init__(self, title="Checkout - Olive",
43
 
                                  parent=parent,
44
 
                                  flags=0,
45
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
36
        super(CheckoutDialog, self).__init__(
 
37
            title="Checkout - Olive", parent=parent, flags=0,
 
38
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
46
39
 
47
40
        # Get arguments
48
41
        self.path = path
49
42
 
50
43
        # Create the widgets
51
 
        self._button_checkout = gtk.Button(_i18n("Check_out"), use_underline=True)
52
 
        self._button_revision = gtk.Button('')
53
 
        self._image_browse = gtk.Image()
54
 
        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
55
 
        self._combo = gtk.ComboBoxEntry()
56
 
        self._label_location = gtk.Label(_i18n("Branch location:"))
57
 
        self._label_destination = gtk.Label(_i18n("Destination:"))
58
 
        self._label_nick = gtk.Label(_i18n("Branch nick:"))
59
 
        self._label_revision = gtk.Label(_i18n("Revision:"))
60
 
        self._hbox_revision = gtk.HBox()
61
 
        self._entry_revision = gtk.Entry()
62
 
        self._entry_nick = gtk.Entry()
63
 
        self._check_lightweight = gtk.CheckButton(_i18n("_Lightweight checkout"),
 
44
        self._button_checkout = Gtk.Button(_i18n("Check_out"), use_underline=True)
 
45
        self._button_revision = Gtk.Button('')
 
46
        self._image_browse = Gtk.Image()
 
47
        self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
 
48
        self._combo = Gtk.ComboBox.new_with_entry()
 
49
        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
 
50
        self._label_destination = Gtk.Label(label=_i18n("Destination:"))
 
51
        self._label_nick = Gtk.Label(label=_i18n("Branch nick:"))
 
52
        self._label_revision = Gtk.Label(label=_i18n("Revision:"))
 
53
        self._hbox_revision = Gtk.HBox()
 
54
        self._entry_revision = Gtk.Entry()
 
55
        self._entry_nick = Gtk.Entry()
 
56
        self._check_lightweight = Gtk.CheckButton(_i18n("_Lightweight checkout"),
64
57
                                                  use_underline=True)
65
58
 
66
59
        # Set callbacks
67
60
        self._button_checkout.connect('clicked', self._on_checkout_clicked)
68
61
        self._button_revision.connect('clicked', self._on_revision_clicked)
69
 
        self._combo.child.connect('focus-out-event', self._on_combo_changed)
 
62
        self._combo.get_child().connect('focus-out-event', self._on_combo_changed)
70
63
 
71
64
        # Create the table and pack the widgets into it
72
 
        self._table = gtk.Table(rows=3, columns=2)
 
65
        self._table = Gtk.Table(rows=3, columns=2)
73
66
        self._table.attach(self._label_location, 0, 1, 0, 1)
74
67
        self._table.attach(self._label_destination, 0, 1, 1, 2)
75
68
        self._table.attach(self._label_nick, 0, 1, 2, 3)
81
74
        self._table.attach(self._check_lightweight, 1, 2, 4, 5)
82
75
 
83
76
        # Set properties
84
 
        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
 
77
        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
85
78
        self._button_revision.set_image(self._image_browse)
86
79
        self._button_revision.set_sensitive(False)
87
 
        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
 
80
        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
88
81
        self._label_location.set_alignment(0, 0.5)
89
82
        self._label_destination.set_alignment(0, 0.5)
90
83
        self._label_nick.set_alignment(0, 0.5)
91
84
        self._label_revision.set_alignment(0, 0.5)
92
85
        self._table.set_row_spacings(3)
93
86
        self._table.set_col_spacings(3)
94
 
        self.vbox.set_spacing(3)
 
87
        self.get_content_area().set_spacing(3)
95
88
        if self.path is not None:
96
89
            self._filechooser.set_filename(self.path)
97
90
        if remote_path is not None:
98
 
            self._combo.child.set_text(remote_path)
 
91
            self._combo.get_child().set_text(remote_path)
99
92
 
100
93
        # Pack some widgets
101
 
        self._hbox_revision.pack_start(self._entry_revision, True, True)
102
 
        self._hbox_revision.pack_start(self._button_revision, False, False)
103
 
        self.vbox.add(self._table)
104
 
        self.action_area.pack_end(self._button_checkout)
 
94
        self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
 
95
        self._hbox_revision.pack_start(self._button_revision, False, False, 0)
 
96
        self.get_content_area().add(self._table)
 
97
        self.action_area.pack_end(self._button_checkout, False, False, 0)
105
98
 
106
99
        # Show the dialog
107
 
        self.vbox.show_all()
 
100
        self.get_content_area().show_all()
108
101
 
109
102
        # Build checkout history
110
103
        self._history = UrlHistory(GlobalConfig(), 'branch_history')
112
105
 
113
106
    def _build_history(self):
114
107
        """ Build up the checkout history. """
115
 
        self._combo_model = gtk.ListStore(str)
 
108
        self._combo_model = Gtk.ListStore(str)
116
109
 
117
110
        for item in self._history.get_entries():
118
111
            self._combo_model.append([ item ])
119
112
 
120
113
        self._combo.set_model(self._combo_model)
121
 
        self._combo.set_text_column(0)
 
114
        self._combo.set_entry_text_column(0)
122
115
 
123
116
    def _get_last_revno(self):
124
117
        """ Get the revno of the last revision (if any). """
143
136
        else:
144
137
            revb = RevisionBrowser(br, self)
145
138
            response = revb.run()
146
 
            if response != gtk.RESPONSE_NONE:
 
139
            if response != Gtk.ResponseType.NONE:
147
140
                revb.hide()
148
141
 
149
 
                if response == gtk.RESPONSE_OK:
 
142
                if response == Gtk.ResponseType.OK:
150
143
                    if revb.selected_revno is not None:
151
144
                        self._entry_revision.set_text(revb.selected_revno)
152
145
 
183
176
 
184
177
        self._history.add_entry(location)
185
178
 
186
 
        self.response(gtk.RESPONSE_OK)
 
179
        self.response(Gtk.ResponseType.OK)
187
180
 
188
181
    def _on_combo_changed(self, widget, event):
189
182
        """ We try to get the last revision if focus lost. """