/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-29 09:31:57 UTC
  • mfrom: (0.12.2 olive)
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060929093157-da322bf8ce59c456
Merge from Jelmer Vernooij's integration branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/remove.py
20
20
    import pygtk
21
21
    pygtk.require("2.0")
22
22
except:
23
 
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.glade
27
 
except:
28
 
    sys.exit(1)
 
23
        pass
 
24
 
 
25
import gtk
 
26
import gtk.glade
29
27
 
30
28
import bzrlib.errors as errors
31
29
from bzrlib.workingtree import WorkingTree
32
30
 
 
31
from olive import gladefile
 
32
 
33
33
class OliveRemove:
34
34
    """ Display the Remove file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
35
    def __init__(self):
36
36
        """ Initialize the Remove file(s) dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_remove')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_remove')
44
38
        
45
39
        self.window = self.glade.get_widget('window_remove')
46
40
        
61
55
        
62
56
        directory = self.comm.get_path()
63
57
        
64
 
        self.comm.set_busy(self.window)
65
58
        if radio_selected.get_active():
66
59
            # Remove only the selected file
67
60
            filename = self.comm.get_selected_right()
68
61
            
69
62
            if filename is None:
70
 
                self.dialog.error_dialog(_('No file was selected'),
 
63
                error_dialog(_('No file was selected'),
71
64
                                         _('Please select a file from the list,\nor choose the other option.'))
72
 
                self.comm.set_busy(self.window, False)
73
65
                return
74
66
            
75
67
            try:
76
68
                wt, path = WorkingTree.open_containing(directory + '/' + filename)
77
69
                wt.remove(path)
78
70
            except errors.NotBranchError:
79
 
                self.dialog.error_dialog(_('Directory is not a branch'),
 
71
                error_dialog(_('Directory is not a branch'),
80
72
                                         _('You can perform this action only in a branch.'))
81
 
                self.comm.set_busy(self.window, False)
82
73
                return
83
74
            except errors.NotVersionedError:
84
 
                self.dialog.error_dialog(_('File not versioned'),
 
75
                error_dialog(_('File not versioned'),
85
76
                                         _('The selected file is not versioned.'))
86
 
                self.comm.set_busy(self.window, False)
87
77
                return
88
 
            except:
89
 
                raise
90
78
        elif radio_new.get_active():
91
79
            # Remove added files recursively
92
80
            try:
93
81
                wt, path = WorkingTree.open_containing(directory)
94
82
            except errors.NotBranchError:
95
 
                self.dialog.error_dialog(_('Directory is not a branch'),
 
83
                error_dialog(_('Directory is not a branch'),
96
84
                                         _('You can perform this action only in a branch.'))
97
 
                self.comm.set_busy(self.window, False)
98
85
                return
99
 
            except:
100
 
                raise
101
86
            
102
87
            added = wt.changes_from(wt.basis_tree()).added
103
88
            file_list = sorted([f[0] for f in added], reverse=True)
104
89
            if len(file_list) == 0:
105
90
                dialog.warning_dialog(_('No matching files'),
106
91
                                      _('No added files were found in the working tree.'))
107
 
                self.comm.set_busy(self.window, False)
108
92
                return
109
93
            wt.remove(file_list)
110
 
        else:
111
 
            # This should really never happen.
112
 
            pass
113
94
        
114
95
        self.close()
115
 
        self.comm.refresh_right()
116
96
    
117
97
    def close(self, widget=None):
118
98
        self.window.destroy()