/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: Jelmer Vernooij
  • Date: 2007-07-15 15:22:29 UTC
  • Revision ID: jelmer@samba.org-20070715152229-clmlen0vpd8d2pzx
Add docstrings, remove unused code.

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 bzrlib.plugins.gtk.dialog import error_dialog
 
32
from guifiles import GLADEFILENAME
 
33
 
32
34
 
33
35
class OliveAdd:
34
36
    """ Display the Add file(s) dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
37
    def __init__(self, wt, wtpath, selected=[]):
36
38
        """ 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
 
39
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_add', 'olive-gtk')
44
40
        
45
41
        self.window = self.glade.get_widget('window_add')
46
42
        
51
47
        # Connect the signals to the handlers
52
48
        self.glade.signal_autoconnect(dic)
53
49
 
 
50
        self.wt = wt
 
51
        self.wtpath = wtpath
 
52
        self.selected = selected
 
53
 
54
54
    def display(self):
55
55
        """ Display the Add file(s) dialog. """
56
56
        self.window.show_all()
59
59
        radio_selected = self.glade.get_widget('radiobutton_add_selected')
60
60
        radio_unknown = self.glade.get_widget('radiobutton_add_unknown')
61
61
        
62
 
        directory = self.comm.get_path()
63
 
        
64
 
        self.comm.set_busy(self.window)
65
62
        if radio_selected.get_active():
66
63
            # Add only the selected file
67
 
            filename = self.comm.get_selected_right()
 
64
            filename = self.selected
68
65
            
69
66
            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.'))
 
67
                error_dialog(_('No file was selected'),
 
68
                             _('Please select a file from the list,\nor choose the other option.'))
72
69
                return
73
70
            
 
71
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
72
            
74
73
            try:
75
 
                fileops.add([directory + '/' + filename])
 
74
                bzrlib.add.smart_add([fullpath])
76
75
            except errors.NotBranchError:
77
 
                self.dialog.error_dialog(_('Directory is not a branch'),
78
 
                                         _('You can perform this action only in a branch.'))
79
 
                self.comm.set_busy(self.window, False)
 
76
                error_dialog(_('Directory is not a branch'),
 
77
                             _('You can perform this action only in a branch.'))
80
78
                return
81
 
            except:
82
 
                raise
83
79
        elif radio_unknown.get_active():
84
80
            # Add unknown files recursively
 
81
            fullpath = self.wt.abspath(self.wtpath)
 
82
            
85
83
            try:
86
 
                fileops.add([directory], True)
 
84
                bzrlib.add.smart_add([fullpath], True)
87
85
            except errors.NotBranchError:
88
 
                self.dialog.error_dialog(_('Directory is not a branch'),
89
 
                                         _('You can perform this action only in a branch.'))
90
 
                self.comm.set_busy(self.window, False)
 
86
                error_dialog(_('Directory is not a branch'),
 
87
                             _('You can perform this action only in a branch.'))
91
88
                return
92
 
            except:
93
 
                raise
94
 
        else:
95
 
            # This should really never happen.
96
 
            pass
97
89
        
98
90
        self.close()
99
 
        self.comm.refresh_right()
100
91
    
101
92
    def close(self, widget=None):
102
93
        self.window.destroy()