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

  • Committer: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/remove.py
23
23
        pass
24
24
 
25
25
import gtk
26
 
import gtk.glade
27
26
 
28
27
import bzrlib.errors as errors
29
28
 
 
29
from bzrlib.plugins.gtk import _i18n
30
30
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
31
 
from guifiles import GLADEFILENAME
32
 
 
33
 
 
34
 
class OliveRemove:
35
 
    """ Display the Remove file(s) dialog and perform the needed actions. """
36
 
    def __init__(self, wt, wtpath, selected=[]):
37
 
        """ Initialize the Remove file(s) dialog. """
38
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
39
 
        
40
 
        self.window = self.glade.get_widget('window_remove')
41
 
        
42
 
        # Dictionary for signal_autoconnect
43
 
        dic = { "on_button_remove_remove_clicked": self.remove,
44
 
                "on_button_remove_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
 
        self.selected = selected
52
 
 
53
 
    def display(self):
54
 
        """ Display the Remove file(s) dialog. """
55
 
        self.window.show_all()
56
 
        
57
 
    @show_bzr_error
58
 
    def remove(self, widget):
59
 
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
60
 
        radio_new = self.glade.get_widget('radiobutton_remove_new')
61
 
        
62
 
        if radio_selected.get_active():
63
 
            # Remove only the selected file
64
 
            filename = self.selected
65
 
            
66
 
            if filename is None:
67
 
                error_dialog(_('No file was selected'),
68
 
                             _('Please select a file from the list,\nor choose the other option.'))
69
 
                return
70
 
            
71
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
72
 
            
73
 
            self.wt.remove(fullpath)
74
 
        elif radio_new.get_active():
75
 
            # Remove added files recursively
76
 
            added = self.wt.changes_from(self.wt.basis_tree()).added
77
 
            file_list = sorted([f[0] for f in added], reverse=True)
78
 
            if len(file_list) == 0:
79
 
                warning_dialog(_('No matching files'),
80
 
                               _('No added files were found in the working tree.'))
81
 
                return
82
 
            self.wt.remove(file_list)
83
 
        
84
 
        self.close()
85
 
    
86
 
    def close(self, widget=None):
87
 
        self.window.destroy()
88
 
 
89
 
class OliveRemoveDialog(gtk.Dialog):
 
31
from bzrlib.plugins.gtk.errors import show_bzr_error
 
32
 
 
33
 
 
34
class RemoveDialog(gtk.Dialog):
90
35
    """ This class wraps the old Remove window into a gtk.Dialog. """
91
36
    
92
 
    def __init__(self, wt, wtpath, selected=[], parent=None):
 
37
    def __init__(self, wt, wtpath, selected='', parent=None):
93
38
        """ Initialize the Remove file(s) dialog. """
94
 
        gtk.Dialog.__init__(self, title="Remove files - Olive",
 
39
        gtk.Dialog.__init__(self, title="Olive - Remove files",
95
40
                                  parent=parent,
96
41
                                  flags=0,
97
42
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
102
47
        self.selected = selected
103
48
        
104
49
        # Create widgets
105
 
        self._label = gtk.Label(_("Which file(s) do you want to remove?"))
106
 
        self._radio_selected = gtk.RadioButton(None, _("Selected only"), False)
107
 
        self._radio_added = gtk.RadioButton(self._radio_selected, _("All files with status 'added'"), False)
108
 
        self._button_remove = gtk.Button(_("_Remove"), use_underline=True)
 
50
        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
 
51
        self._radio_selected = gtk.RadioButton(None, _i18n("Selected: %s"%self.selected), False)
 
52
        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
 
53
        self._button_remove = gtk.Button(stock=gtk.STOCK_REMOVE)
109
54
        
110
55
        self._button_remove.connect('clicked', self._on_remove_clicked)
111
56
        
112
 
        self.vbox.pack_start(self._label)
113
 
        self.vbox.pack_end(self._radio_added)
114
 
        self.vbox.pack_end(self._radio_selected)
115
 
        
 
57
        self.vbox.add(self._label)
 
58
        self.vbox.add(self._radio_selected)
 
59
        self.vbox.add(self._radio_added)
 
60
        self.vbox.set_spacing(3)
116
61
        self.action_area.pack_end(self._button_remove)
117
62
        
118
 
        self.vbox.set_spacing(3)
119
63
        self.vbox.show_all()
120
64
        
121
65
    @show_bzr_error
126
70
            filename = self.selected
127
71
            
128
72
            if filename is None:
129
 
                error_dialog(_('No file was selected'),
130
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
73
                error_dialog(_i18n('No file was selected'),
 
74
                             _i18n('Please select a file from the list,\nor choose the other option.'))
131
75
                return
132
76
            
133
77
            self.wt.remove(os.path.join(self.wtpath, filename))
136
80
            added = self.wt.changes_from(self.wt.basis_tree()).added
137
81
            file_list = sorted([f[0] for f in added], reverse=True)
138
82
            if len(file_list) == 0:
139
 
                warning_dialog(_('No matching files'),
140
 
                               _('No added files were found in the working tree.'))
 
83
                warning_dialog(_i18n('No matching files'),
 
84
                               _i18n('No added files were found in the working tree.'))
141
85
                return
142
86
            self.wt.remove(file_list)
143
87