/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: Gary van der Merwe
  • Date: 2007-08-10 10:45:06 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: garyvdm@gmail.com-20070810104506-wo2mp9zfkh338axe
Make icon locations consistant between source and installed version. Let glade nkow where to find the icons with a project file.

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