/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: 2006-09-27 17:56:26 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927175626-4462e9dc20d422b1
Bunch of random cleanups

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