/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/add.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/add.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
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
 
24
 
 
25
import gtk
 
26
import gtk.glade
 
27
 
 
28
import bzrlib.add
 
29
import bzrlib.errors as errors
 
30
 
 
31
from olive import gladefile
 
32
from dialog import error_dialog
32
33
 
33
34
class OliveAdd:
34
35
    """ Display the Add 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 Add file(s) dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_add', 'olive-gtk')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
38
        self.glade = gtk.glade.XML(gladefile, 'window_add', 'olive-gtk')
44
39
        
45
40
        self.window = self.glade.get_widget('window_add')
46
41
        
51
46
        # Connect the signals to the handlers
52
47
        self.glade.signal_autoconnect(dic)
53
48
 
 
49
        self.wt = wt
 
50
        self.wtpath = wtpath
 
51
        self.selected = selected
 
52
 
54
53
    def display(self):
55
54
        """ Display the Add file(s) dialog. """
56
55
        self.window.show_all()
59
58
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
60
59
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
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
            # Add 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.add([directory + '/' + filename])
 
73
                bzrlib.add.smart_add([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
 
            except:
83
 
                raise
84
78
        elif radio_unknown.get_active():
85
79
            # Add unknown files recursively
 
80
            fullpath = self.wt.abspath(self.wtpath)
 
81
            
86
82
            try:
87
 
                fileops.add([directory], True)
 
83
                bzrlib.add.smart_add([fullpath], True)
88
84
            except errors.NotBranchError:
89
 
                self.dialog.error_dialog(_('Directory is not a branch'),
90
 
                                         _('You can perform this action only in a branch.'))
91
 
                self.comm.set_busy(self.window, False)
 
85
                error_dialog(_('Directory is not a branch'),
 
86
                             _('You can perform this action only in a branch.'))
92
87
                return
93
 
            except:
94
 
                raise
95
 
        else:
96
 
            # This should really never happen.
97
 
            pass
98
88
        
99
89
        self.close()
100
 
        self.comm.refresh_right()
101
90
    
102
91
    def close(self, widget=None):
103
92
        self.window.destroy()