/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: Jelmer Vernooij
  • Date: 2006-09-27 19:52:46 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927195246-9354d7ccf56127f5
Don't pass around gladefile all the time. 
Fix bug in status information when files have been removed.

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
 
        pass
24
 
 
 
23
    pass
25
24
import gtk
26
25
import gtk.glade
27
26
 
28
27
import bzrlib.errors as errors
29
 
 
30
 
from bzrlib.plugins.gtk import _i18n
31
 
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
32
 
from guifiles import GLADEFILENAME
33
 
 
 
28
from bzrlib.workingtree import WorkingTree
 
29
 
 
30
from olive import gladefile
34
31
 
35
32
class OliveRemove:
36
33
    """ Display the Remove file(s) dialog and perform the needed actions. """
37
 
    def __init__(self, wt, wtpath, selected=[]):
 
34
    def __init__(self, comm):
38
35
        """ Initialize the Remove file(s) dialog. """
39
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
 
36
        self.glade = gtk.glade.XML(gladefile, 'window_remove')
 
37
        
 
38
        # Communication object
 
39
        self.comm = comm
40
40
        
41
41
        self.window = self.glade.get_widget('window_remove')
42
42
        
46
46
        
47
47
        # Connect the signals to the handlers
48
48
        self.glade.signal_autoconnect(dic)
49
 
        
50
 
        self.wt = wt
51
 
        self.wtpath = wtpath
52
 
        self.selected = selected
53
49
 
54
50
    def display(self):
55
51
        """ Display the Remove file(s) dialog. """
56
52
        self.window.show_all()
57
53
        
58
 
    @show_bzr_error
59
54
    def remove(self, widget):
60
55
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
61
56
        radio_new = self.glade.get_widget('radiobutton_remove_new')
62
57
        
 
58
        directory = self.comm.get_path()
 
59
        
 
60
        self.comm.set_busy(self.window)
63
61
        if radio_selected.get_active():
64
62
            # Remove only the selected file
65
 
            filename = self.selected
 
63
            filename = self.comm.get_selected_right()
66
64
            
67
65
            if filename is None:
68
 
                error_dialog(_i18n('No file was selected'),
69
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
70
 
                return
71
 
            
72
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
73
 
            
74
 
            self.wt.remove(fullpath)
 
66
                error_dialog(_('No file was selected'),
 
67
                                         _('Please select a file from the list,\nor choose the other option.'))
 
68
                self.comm.set_busy(self.window, False)
 
69
                return
 
70
            
 
71
            try:
 
72
                wt, path = WorkingTree.open_containing(directory + '/' + filename)
 
73
                wt.remove(path)
 
74
            except errors.NotBranchError:
 
75
                error_dialog(_('Directory is not a branch'),
 
76
                                         _('You can perform this action only in a branch.'))
 
77
                self.comm.set_busy(self.window, False)
 
78
                return
 
79
            except errors.NotVersionedError:
 
80
                error_dialog(_('File not versioned'),
 
81
                                         _('The selected file is not versioned.'))
 
82
                self.comm.set_busy(self.window, False)
 
83
                return
 
84
            except:
 
85
                raise
75
86
        elif radio_new.get_active():
76
87
            # Remove added files recursively
77
 
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
88
            try:
 
89
                wt, path = WorkingTree.open_containing(directory)
 
90
            except errors.NotBranchError:
 
91
                error_dialog(_('Directory is not a branch'),
 
92
                                         _('You can perform this action only in a branch.'))
 
93
                self.comm.set_busy(self.window, False)
 
94
                return
 
95
            
 
96
            added = wt.changes_from(wt.basis_tree()).added
78
97
            file_list = sorted([f[0] for f in added], reverse=True)
79
98
            if len(file_list) == 0:
80
 
                warning_dialog(_i18n('No matching files'),
81
 
                               _i18n('No added files were found in the working tree.'))
 
99
                dialog.warning_dialog(_('No matching files'),
 
100
                                      _('No added files were found in the working tree.'))
 
101
                self.comm.set_busy(self.window, False)
82
102
                return
83
 
            self.wt.remove(file_list)
 
103
            wt.remove(file_list)
 
104
        else:
 
105
            # This should really never happen.
 
106
            pass
84
107
        
85
108
        self.close()
 
109
        self.comm.refresh_right()
86
110
    
87
111
    def close(self, widget=None):
88
112
        self.window.destroy()
89
 
 
90
 
class OliveRemoveDialog(gtk.Dialog):
91
 
    """ This class wraps the old Remove window into a gtk.Dialog. """
92
 
    
93
 
    def __init__(self, wt, wtpath, selected=[], parent=None):
94
 
        """ Initialize the Remove file(s) dialog. """
95
 
        gtk.Dialog.__init__(self, title="Remove files - Olive",
96
 
                                  parent=parent,
97
 
                                  flags=0,
98
 
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
99
 
        
100
 
        # Get arguments
101
 
        self.wt = wt
102
 
        self.wtpath = wtpath
103
 
        self.selected = selected
104
 
        
105
 
        # Create widgets
106
 
        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
107
 
        self._radio_selected = gtk.RadioButton(None, _i18n("Selected only"), False)
108
 
        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
109
 
        self._button_remove = gtk.Button(_i18n("_Remove"), use_underline=True)
110
 
        
111
 
        self._button_remove.connect('clicked', self._on_remove_clicked)
112
 
        
113
 
        self.vbox.pack_start(self._label)
114
 
        self.vbox.pack_end(self._radio_added)
115
 
        self.vbox.pack_end(self._radio_selected)
116
 
        
117
 
        self.action_area.pack_end(self._button_remove)
118
 
        
119
 
        self.vbox.set_spacing(3)
120
 
        self.vbox.show_all()
121
 
        
122
 
    @show_bzr_error
123
 
    def _on_remove_clicked(self, button):
124
 
        """ Remove button clicked handler. """
125
 
        if self._radio_selected.get_active():
126
 
            # Remove only the selected file
127
 
            filename = self.selected
128
 
            
129
 
            if filename is None:
130
 
                error_dialog(_i18n('No file was selected'),
131
 
                             _i18n('Please select a file from the list,\nor choose the other option.'))
132
 
                return
133
 
            
134
 
            self.wt.remove(os.path.join(self.wtpath, filename))
135
 
        elif self._radio_added.get_active():
136
 
            # Remove added files recursively
137
 
            added = self.wt.changes_from(self.wt.basis_tree()).added
138
 
            file_list = sorted([f[0] for f in added], reverse=True)
139
 
            if len(file_list) == 0:
140
 
                warning_dialog(_i18n('No matching files'),
141
 
                               _i18n('No added files were found in the working tree.'))
142
 
                return
143
 
            self.wt.remove(file_list)
144
 
        
145
 
        self.response(gtk.RESPONSE_OK)