/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: Andrew Bennetts
  • Date: 2008-04-29 08:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 476.
  • Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
50
50
        
51
51
        # Create the widgets
52
52
        self._label_location = gtk.Label(_("Location:"))
53
 
        self._label_test = gtk.Label(_("(click the Test button to check write access)"))
54
53
        self._combo = gtk.ComboBoxEntry()
55
 
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
56
54
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
57
55
        self._hbox_location = gtk.HBox()
58
 
        self._hbox_test = gtk.HBox()
59
 
        self._image_test = gtk.Image()
60
56
        
61
57
        # Set callbacks
62
 
        self._button_test.connect('clicked', self._on_test_clicked)
63
58
        self._button_push.connect('clicked', self._on_push_clicked)
64
59
        
65
60
        # Set properties
66
 
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
67
61
        self._label_location.set_alignment(0, 0.5)
68
 
        self._label_test.set_alignment(0, 0.5)
69
62
        self._hbox_location.set_spacing(3)
70
 
        self._hbox_test.set_spacing(3)
71
63
        self.vbox.set_spacing(3)
72
64
        
73
65
        # Pack widgets
74
66
        self._hbox_location.pack_start(self._label_location, False, False)
75
67
        self._hbox_location.pack_start(self._combo, True, True)
76
 
        self._hbox_test.pack_start(self._image_test, False, False)
77
 
        self._hbox_test.pack_start(self._label_test, True, True)
78
68
        self.vbox.pack_start(self._hbox_location)
79
 
        self.vbox.pack_start(self._hbox_test)
80
 
        self.action_area.pack_start(self._button_test)
81
69
        self.action_area.pack_end(self._button_push)
82
70
        
83
71
        # Show the dialog
100
88
            if location is not None:
101
89
                self._combo.get_child().set_text(location)
102
90
    
103
 
    def _on_test_clicked(self, widget):
104
 
        """ Test button clicked handler. """
105
 
        import re
106
 
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
107
 
        
108
 
        url = self._combo.get_child().get_text()
109
 
        
110
 
        m = _urlRE.match(url)
111
 
        if m:
112
 
            proto = m.groupdict()['proto']
113
 
            # FIXME: This should ask the transport or branch rather than 
114
 
            # guessing using regular expressions. JRV 20070714
115
 
            if proto in ('sftp', 'file', 'ftp'):
116
 
                # have write access (most probably)
117
 
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
118
 
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
119
 
            else:
120
 
                # no write access
121
 
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
122
 
                self._label_test.set_markup(_('<b>No write access</b>'))
123
 
        else:
124
 
            # couldn't determine
125
 
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
126
 
            self._label_test.set_markup(_('<b>Could not determine</b>'))
127
 
    
128
91
    @show_bzr_error
129
92
    def _on_push_clicked(self, widget):
130
93
        """ Push button clicked handler. """
133
96
        if self.branch is not None and self.branch.get_push_location() is None:
134
97
            response = question_dialog(_('Set default push location'),
135
98
                                       _('There is no default push location set.\nSet %r as default now?') % location)
136
 
            if response == gtk.REPONSE_OK:
 
99
            if response == gtk.RESPONSE_OK:
137
100
                self.branch.set_push_location(location)
138
101
 
139
102
        try:
141
104
        except errors.DivergedBranches:
142
105
            response = question_dialog(_('Branches have been diverged'),
143
106
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
144
 
            if response == gtk.RESPONSE_OK:
 
107
            if response == gtk.RESPONSE_YES:
145
108
                revs = do_push(self.branch, location=location, overwrite=True)
146
 
            return
147
109
        
148
110
        self._history.add_entry(location)
149
111
        info_dialog(_('Push successful'),