/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-30 13:04:15 UTC
  • mto: (0.14.3 main)
  • mto: This revision was merged to the branch mainline in revision 86.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060930130415-aba4100709e11f0a
Loads of fixes. Pyflakes cleanup.

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 olive import gladefile
 
31
from dialog import error_dialog, warning_dialog
32
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, wt, wtpath, selected=[]):
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
        
50
44
        
51
45
        # Connect the signals to the handlers
52
46
        self.glade.signal_autoconnect(dic)
 
47
        
 
48
        self.wt = wt
 
49
        self.wtpath = wtpath
 
50
        self.selected = selected
53
51
 
54
52
    def display(self):
55
53
        """ Display the Remove file(s) dialog. """
59
57
        radio_selected = self.glade.get_widget('radiobutton_remove_selected')
60
58
        radio_new = self.glade.get_widget('radiobutton_remove_new')
61
59
        
62
 
        directory = self.comm.get_path()
63
 
        
64
 
        self.comm.set_busy(self.window)
65
60
        if radio_selected.get_active():
66
61
            # Remove only the selected file
67
 
            filename = self.comm.get_selected_right()
 
62
            filename = self.selected
68
63
            
69
64
            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)
 
65
                error_dialog(_('No file was selected'),
 
66
                             _('Please select a file from the list,\nor choose the other option.'))
73
67
                return
74
68
            
 
69
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
70
            
75
71
            try:
76
 
                fileops.remove([directory + '/' + filename])
 
72
                self.wt.remove(fullpath)
77
73
            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)
 
74
                error_dialog(_('Directory is not a branch'),
 
75
                             _('You can perform this action only in a branch.'))
81
76
                return
82
77
            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)
 
78
                error_dialog(_('File not versioned'),
 
79
                             _('The selected file is not versioned.'))
86
80
                return
87
 
            except:
88
 
                raise
89
81
        elif radio_new.get_active():
90
82
            # 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)
 
83
            added = self.wt.changes_from(self.wt.basis_tree()).added
 
84
            file_list = sorted([f[0] for f in added], reverse=True)
 
85
            if len(file_list) == 0:
 
86
                warning_dialog(_('No matching files'),
 
87
                               _('No added files were found in the working tree.'))
97
88
                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
 
89
            self.wt.remove(file_list)
107
90
        
108
91
        self.close()
109
 
        self.comm.refresh_right()
110
92
    
111
93
    def close(self, widget=None):
112
94
        self.window.destroy()