/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 olive/add.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-27 17:56:26 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927175626-4462e9dc20d422b1
Bunch of random cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import os
 
17
import sys
18
18
 
19
19
try:
20
20
    import pygtk
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
 
25
 
import gtk
 
24
try:
 
25
    import gtk
 
26
    import gtk.glade
 
27
except:
 
28
    sys.exit(1)
26
29
 
27
30
import bzrlib.add
28
31
import bzrlib.errors as errors
29
32
 
30
 
from bzrlib.plugins.gtk import _i18n
31
 
from bzrlib.plugins.gtk.dialog import error_dialog
32
 
from bzrlib.plugins.gtk.errors import show_bzr_error
33
 
 
34
 
 
35
 
class AddDialog(gtk.Dialog):
36
 
    """ Dialog for adding selected file or recursively all unknown files/folders in branch """
37
 
    
38
 
    def __init__(self, wt, wtpath, selected, parent=None):
39
 
        """ Initialize the Add dialog. """
40
 
        gtk.Dialog.__init__(self, title="Olive - Add file(s)",
41
 
                                  parent=parent,
42
 
                                  flags=0,
43
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
44
 
        
45
 
        # Get arguments
46
 
        self.wt = wt
47
 
        self.wtpath = wtpath
48
 
        self.selected = selected
49
 
        
50
 
        # Create widgets
51
 
        self._label_add_question = gtk.Label(_i18n("Which file(s) do you want to add?"))
52
 
        self._radiobutton_add_selected = gtk.RadioButton(None,_i18n("Selected: %s"%self.selected))
53
 
        self._radiobutton_add_unknown = gtk.RadioButton(self._radiobutton_add_selected, 
54
 
                                                        _i18n("All unknowns recursively"))
55
 
        self._button_add = gtk.Button(stock=gtk.STOCK_ADD)        
56
 
        
57
 
        self._button_add.connect('clicked', self._on_add_clicked)
58
 
        
59
 
        # Add widgets to dialog window and decorate
60
 
        self.vbox.add(self._label_add_question)
61
 
        self.vbox.add(self._radiobutton_add_selected)
62
 
        self.vbox.add(self._radiobutton_add_unknown)
63
 
        self.vbox.set_spacing(3)
64
 
        self.action_area.pack_end(self._button_add)
65
 
        
66
 
        self.vbox.show_all()
67
 
        
68
 
    @show_bzr_error
69
 
    def _on_add_clicked(self, button):
70
 
        """ """
71
 
        if self._radiobutton_add_selected.get_active():
 
33
class OliveAdd:
 
34
    """ Display the Add file(s) dialog and perform the needed actions. """
 
35
    def __init__(self, gladefile, wt, wtpath):
 
36
        """ Initialize the Add file(s) dialog. """
 
37
        self.gladefile = gladefile
 
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_add', 'olive-gtk')
 
39
        
 
40
        self.window = self.glade.get_widget('window_add')
 
41
        
 
42
        # Dictionary for signal_autoconnect
 
43
        dic = { "on_button_add_add_clicked": self.add,
 
44
                "on_button_add_cancel_clicked": self.close }
 
45
        
 
46
        # Connect the signals to the handlers
 
47
        self.glade.signal_autoconnect(dic)
 
48
 
 
49
                self.wt = wt
 
50
                self.wtpath = wtpath
 
51
 
 
52
    def display(self):
 
53
        """ Display the Add file(s) dialog. """
 
54
        self.window.show_all()
 
55
        
 
56
    def add(self, widget):
 
57
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
 
58
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
 
59
        
 
60
        if radio_selected.get_active():
72
61
            # Add only the selected file
73
 
            filename = self.selected
 
62
            filename = self.comm.get_selected_right()
74
63
            
75
64
            if filename is None:
76
 
                error_dialog(_i18n('No file was selected'),
77
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
 
65
                error_dialog(_('No file was selected'),
 
66
                                         _('Please select a file from the list,\nor choose the other option.'))
 
67
                self.comm.set_busy(self.window, False)
78
68
                return
79
69
            
80
70
            try:
81
 
                self.wt.add([filename])
 
71
                bzrlib.add.smart_add([directory + '/' + filename])
82
72
            except errors.NotBranchError:
83
 
                error_dialog(_i18n('Directory is not a branch'),
84
 
                             _i18n('You can perform this action only in a branch.'))
 
73
                error_dialog(_('Directory is not a branch'),
 
74
                                         _('You can perform this action only in a branch.'))
 
75
                self.comm.set_busy(self.window, False)
85
76
                return
86
 
        elif self._radiobutton_add_unknown.get_active():
 
77
            except:
 
78
                raise
 
79
        elif radio_unknown.get_active():
87
80
            # Add unknown files recursively
88
81
            try:
89
 
                self.wt.add(self.wt.unknowns())
 
82
                bzrlib.add.smart_add([directory], True)
90
83
            except errors.NotBranchError:
91
 
                error_dialog(_i18n('Directory is not a branch'),
92
 
                             _i18n('You can perform this action only in a branch.'))
 
84
                error_dialog(_('Directory is not a branch'),
 
85
                                         _('You can perform this action only in a branch.'))
 
86
                self.comm.set_busy(self.window, False)
93
87
                return
 
88
            except:
 
89
                raise
 
90
        else:
 
91
            # This should really never happen.
 
92
            pass
94
93
        
95
 
        self.response(gtk.RESPONSE_OK)
 
94
        self.close()
 
95
        self.comm.refresh_right()
 
96
    
 
97
    def close(self, widget=None):
 
98
        self.window.destroy()