/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-12-13 12:29:59 UTC
  • mto: (66.2.16 bzr-gtk-meld)
  • mto: This revision was merged to the branch mainline in revision 118.
  • Revision ID: jelmer@samba.org-20061213122959-h9yluqyu0ijelmb0
Fix desktop file. Patch from Toshio Kuratomi. Fixes #75278.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/remove.py
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 sys
 
17
import os
18
18
 
19
19
try:
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)
29
 
 
30
 
import olive.backend.errors as errors
31
 
import olive.backend.fileops as fileops
 
23
        pass
 
24
 
 
25
import gtk
 
26
import gtk.glade
 
27
 
 
28
import bzrlib.errors as errors
 
29
 
 
30
from dialog import error_dialog, warning_dialog
 
31
from guifiles import GLADEFILENAME
 
32
 
32
33
 
33
34
class OliveRemove:
34
35
    """ Display the Remove file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
36
    def __init__(self, wt, wtpath, selected=[]):
36
37
        """ 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
 
38
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_remove')
44
39
        
45
40
        self.window = self.glade.get_widget('window_remove')
46
41
        
50
45
        
51
46
        # Connect the signals to the handlers
52
47
        self.glade.signal_autoconnect(dic)
 
48
        
 
49
        self.wt = wt
 
50
        self.wtpath = wtpath
 
51
        self.selected = selected
53
52
 
54
53
    def display(self):
55
54
        """ Display the Remove file(s) dialog. """
59
58
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
60
59
        radio_new = self.glade.get_widget('radiobutton_remove_new')
61
60
        
62
 
        directory = self.comm.get_path()
63
 
        
64
 
        self.comm.set_busy(self.window)
65
61
        if radio_selected.get_active():
66
62
            # Remove only the selected file
67
 
            filename = self.comm.get_selected_right()
 
63
            filename = self.selected
68
64
            
69
65
            if filename is None:
70
 
                self.dialog.error_dialog(_('No file was selected'),
71
 
                                         _('Please select a file from the list,\nor choose the other option.'))
72
 
                self.comm.set_busy(self.window, False)
 
66
                error_dialog(_('No file was selected'),
 
67
                             _('Please select a file from the list,\nor choose the other option.'))
73
68
                return
74
69
            
 
70
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
71
            
75
72
            try:
76
 
                fileops.remove([directory + '/' + filename])
 
73
                self.wt.remove(fullpath)
77
74
            except errors.NotBranchError:
78
 
                self.dialog.error_dialog(_('Directory is not a branch'),
79
 
                                         _('You can perform this action only in a branch.'))
80
 
                self.comm.set_busy(self.window, False)
 
75
                error_dialog(_('Directory is not a branch'),
 
76
                             _('You can perform this action only in a branch.'))
81
77
                return
82
78
            except errors.NotVersionedError:
83
 
                self.dialog.error_dialog(_('File not versioned'),
84
 
                                         _('The selected file is not versioned.'))
85
 
                self.comm.set_busy(self.window, False)
 
79
                error_dialog(_('File not versioned'),
 
80
                             _('The selected file is not versioned.'))
86
81
                return
87
 
            except:
88
 
                raise
89
82
        elif radio_new.get_active():
90
83
            # Remove added files recursively
91
 
            try:
92
 
                fileops.remove([directory], True)
93
 
            except errors.NotBranchError:
94
 
                self.dialog.error_dialog(_('Directory is not a branch'),
95
 
                                         _('You can perform this action only in a branch.'))
96
 
                self.comm.set_busy(self.window, False)
 
84
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
85
            file_list = sorted([f[0] for f in added], reverse=True)
 
86
            if len(file_list) == 0:
 
87
                warning_dialog(_('No matching files'),
 
88
                               _('No added files were found in the working tree.'))
97
89
                return
98
 
            except errors.NoMatchingFiles:
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)
102
 
            except:
103
 
                raise
104
 
        else:
105
 
            # This should really never happen.
106
 
            pass
 
90
            self.wt.remove(file_list)
107
91
        
108
92
        self.close()
109
 
        self.comm.refresh_right()
110
93
    
111
94
    def close(self, widget=None):
112
95
        self.window.destroy()