/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 18:08:35 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927180835-4c295d9bb936623a
Turn some windows into dialogs.
Remove the diffwindow code from olive, 
switched to using the one from bzr-gtk instead.

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.dialog import error_dialog
32
 
from guifiles import GLADEFILENAME
33
 
 
34
 
 
35
33
class OliveAdd:
36
34
    """ Display the Add file(s) dialog and perform the needed actions. """
37
 
    def __init__(self, wt, wtpath, selected=[]):
 
35
    def __init__(self, gladefile, wt, wtpath, selected=[]):
38
36
        """ Initialize the Add file(s) dialog. """
39
 
        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')
40
39
        
41
40
        self.window = self.glade.get_widget('window_add')
42
41
        
65
64
            
66
65
            if filename is None:
67
66
                error_dialog(_('No file was selected'),
68
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
67
                                         _('Please select a file from the list,\nor choose the other option.'))
 
68
                self.comm.set_busy(self.window, False)
69
69
                return
70
70
            
71
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
72
 
            
73
71
            try:
74
 
                bzrlib.add.smart_add([fullpath])
 
72
                bzrlib.add.smart_add([directory + '/' + filename])
75
73
            except errors.NotBranchError:
76
74
                error_dialog(_('Directory is not a branch'),
77
 
                             _('You can perform this action only in a branch.'))
 
75
                                         _('You can perform this action only in a branch.'))
 
76
                self.comm.set_busy(self.window, False)
78
77
                return
 
78
            except:
 
79
                raise
79
80
        elif radio_unknown.get_active():
80
81
            # Add unknown files recursively
81
 
            fullpath = self.wt.abspath(self.wtpath)
82
 
            
83
82
            try:
84
 
                bzrlib.add.smart_add([fullpath], True)
 
83
                bzrlib.add.smart_add([directory], True)
85
84
            except errors.NotBranchError:
86
85
                error_dialog(_('Directory is not a branch'),
87
 
                             _('You can perform this action only in a branch.'))
 
86
                                         _('You can perform this action only in a branch.'))
 
87
                self.comm.set_busy(self.window, False)
88
88
                return
 
89
            except:
 
90
                raise
 
91
        else:
 
92
            # This should really never happen.
 
93
            pass
89
94
        
90
95
        self.close()
 
96
        self.comm.refresh_right()
91
97
    
92
98
    def close(self, widget=None):
93
99
        self.window.destroy()