/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 push.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:
push.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
 
try:
19
 
    import pygtk
20
 
    pygtk.require("2.0")
21
 
except:
22
 
    pass
23
 
 
24
 
import gtk
 
18
from gi.repository import GObject
 
19
from gi.repository import Gtk
25
20
 
26
21
from errors import show_bzr_error
27
22
 
28
23
import bzrlib.errors as errors
29
24
 
30
 
from bzrlib.plugins.gtk import _i18n
31
25
from bzrlib.plugins.gtk.dialog import (
32
26
    info_dialog,
33
27
    question_dialog,
34
28
    )
35
29
 
36
30
from bzrlib.plugins.gtk.history import UrlHistory
37
 
 
38
 
class PushDialog(gtk.Dialog):
39
 
    """ New implementation of the Push dialog. """
 
31
from bzrlib.plugins.gtk.i18n import _i18n
 
32
 
 
33
 
 
34
class PushDialog(Gtk.Dialog):
 
35
    """New implementation of the Push dialog."""
40
36
 
41
37
    def __init__(self, repository, revid, branch=None, parent=None):
42
 
        """ Initialize the Push dialog. """
43
 
        gtk.Dialog.__init__(self, title="Push - Olive",
44
 
                                  parent=parent,
45
 
                                  flags=0,
46
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
38
        """Initialize the Push dialog. """
 
39
        super(PushDialog, self).__init__(
 
40
            title="Push", parent=parent, flags=0,
 
41
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
42
 
47
43
 
48
44
        # Get arguments
49
45
        self.repository = repository
51
47
        self.branch = branch
52
48
 
53
49
        # Create the widgets
54
 
        self._label_location = gtk.Label(_i18n("Location:"))
55
 
        self._combo = gtk.ComboBoxEntry()
56
 
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
57
 
        self._hbox_location = gtk.HBox()
 
50
        self._label_location = Gtk.Label(label=_i18n("Location:"))
 
51
        self._combo = Gtk.ComboBox.new_with_entry()
 
52
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
 
53
        self._hbox_location = Gtk.HBox()
58
54
 
59
55
        # Set callbacks
60
56
        self._button_push.connect('clicked', self._on_push_clicked)
62
58
        # Set properties
63
59
        self._label_location.set_alignment(0, 0.5)
64
60
        self._hbox_location.set_spacing(3)
65
 
        self.vbox.set_spacing(3)
 
61
        self.get_content_area().set_spacing(3)
66
62
 
67
63
        # Pack widgets
68
 
        self._hbox_location.pack_start(self._label_location, False, False)
69
 
        self._hbox_location.pack_start(self._combo, True, True)
70
 
        self.vbox.pack_start(self._hbox_location)
71
 
        self.action_area.pack_end(self._button_push)
 
64
        self._hbox_location.pack_start(
 
65
            self._label_location, False, False, 0)
 
66
        self._hbox_location.pack_start(self._combo, True, True, 0)
 
67
        self.get_content_area().pack_start(self._hbox_location, True, True, 0)
 
68
        # XXX sinzui 2011-08-12: maybe False, False, 0
 
69
        self.get_action_area().pack_end(self._button_push, True, True, 0)
72
70
 
73
71
        # Show the dialog
74
 
        self.vbox.show_all()
 
72
        self.get_content_area().show_all()
75
73
 
76
74
        # Build location history
77
75
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
78
76
        self._build_history()
79
77
 
80
78
    def _build_history(self):
81
 
        """ Build up the location history. """
82
 
        self._combo_model = gtk.ListStore(str)
 
79
        """Build up the location history. """
 
80
        self._combo_model = Gtk.ListStore(str)
83
81
        for item in self._history.get_entries():
84
82
            self._combo_model.append([ item ])
85
83
        self._combo.set_model(self._combo_model)
86
 
        self._combo.set_text_column(0)
 
84
        self._combo.set_entry_text_column(0)
87
85
 
88
86
        if self.branch is not None:
89
87
            location = self.branch.get_push_location()
92
90
 
93
91
    @show_bzr_error
94
92
    def _on_push_clicked(self, widget):
95
 
        """ Push button clicked handler. """
 
93
        """Push button clicked handler. """
96
94
        location = self._combo.get_child().get_text()
97
95
        revs = 0
98
96
 
101
99
        except errors.DivergedBranches:
102
100
            response = question_dialog(_i18n('Branches have been diverged'),
103
101
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
104
 
            if response == gtk.RESPONSE_YES:
 
102
            if response == Gtk.ResponseType.YES:
105
103
                revs = do_push(self.branch, location=location, overwrite=True)
106
104
 
107
105
        if self.branch is not None and self.branch.get_push_location() is None:
111
109
        info_dialog(_i18n('Push successful'),
112
110
                    _i18n("%d revision(s) pushed.") % revs)
113
111
 
114
 
        self.response(gtk.RESPONSE_OK)
 
112
        self.response(Gtk.ResponseType.OK)
115
113
 
116
114
 
117
115
def do_push(br_from, location, overwrite):
118
 
    """ Update a mirror of a branch.
 
116
    """Update a mirror of a branch.
119
117
 
120
118
    :param br_from: the source branch
121
119
    :param location: the location of the branch that you'd like to update
142
140
        except errors.NoSuchFile:
143
141
            response = question_dialog(_i18n('Non existing parent directory'),
144
142
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
145
 
            if response == gtk.RESPONSE_OK:
 
143
            if response == Gtk.ResponseType.OK:
146
144
                transport.create_prefix()
147
145
            else:
148
146
                return