/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/mkdir.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/mkdir.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
 
18
import sys
18
19
 
19
20
try:
20
21
    import pygtk
27
28
 
28
29
import bzrlib.errors as errors
29
30
 
30
 
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
31
 
from guifiles import GLADEFILENAME
32
 
 
 
31
from olive import gladefile
33
32
 
34
33
class OliveMkdir:
35
34
    """ Display the Make directory dialog and perform the needed actions. """
36
35
    def __init__(self, wt, wtpath):
37
36
        """ Initialize the Make directory dialog. """
38
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_mkdir', 'olive-gtk')
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_mkdir', 'olive-gtk')
39
38
        
40
39
        self.window = self.glade.get_widget('window_mkdir')
41
40
        
45
44
        
46
45
        # Connect the signals to the handlers
47
46
        self.glade.signal_autoconnect(dic)
48
 
        
49
 
        self.wt = wt
50
 
        self.wtpath = wtpath
51
47
 
52
48
    def display(self):
53
49
        """ Display the Make directory dialog. """
54
50
        self.window.show_all()
55
51
 
56
 
    @show_bzr_error
57
52
    def mkdir(self, widget):
58
53
        # Get the widgets
59
54
        entry = self.glade.get_widget('entry_mkdir')
63
58
        
64
59
        if dirname == "":
65
60
            error_dialog(_('No directory name given'),
66
 
                         _('Please specify a desired name for the new directory.'))
 
61
                                     _('Please specify a desired name for the new directory.'))
67
62
            return
68
63
        
69
64
        if checkbox.get_active():
70
65
            # Want to create a versioned directory
71
66
            try:
72
 
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
 
67
                from bzrlib.workingtree import WorkingTree
 
68
    
 
69
                os.mkdir(os.path.join(wt.base, wtpath))
73
70
 
74
 
                self.wt.add([os.path.join(self.wtpath, dirname)])
 
71
                wt.add([wtpath])
75
72
            except OSError, e:
76
73
                if e.errno == 17:
77
74
                    error_dialog(_('Directory already exists'),
78
 
                                 _('Please specify another name to continue.'))
 
75
                                             _('Please specify another name to continue.'))
79
76
                else:
80
77
                    raise
 
78
            except errors.NotBranchError:
 
79
                warning_dialog(_('Directory is not in a branch'),
 
80
                                           _('You can only create a non-versioned directory.'))
81
81
        else:
82
82
            # Just a simple directory
83
83
            try:
84
 
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
 
84
                os.mkdir(os.path.join(wt.base, wtpath))
85
85
            except OSError, e:
86
86
                if e.errno == 17:
87
87
                    error_dialog(_('Directory already exists'),
88
 
                                 _('Please specify another name to continue.'))
 
88
                                             _('Please specify another name to continue.'))
89
89
                    return
90
90
 
91
91
        self.close()
 
92
        self.comm.refresh_right()
92
93
    
93
94
    def close(self, widget=None):
94
95
        self.window.destroy()