/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: 2007-02-01 15:50:40 UTC
  • Revision ID: jelmer@samba.org-20070201155040-3hq4mfbxs99kzazy
add framework for tests.

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
19
18
 
20
19
try:
21
20
    import pygtk
28
27
 
29
28
import bzrlib.errors as errors
30
29
 
31
 
from olive import gladefile
 
30
from dialog import error_dialog, warning_dialog
 
31
from guifiles import GLADEFILENAME
 
32
 
32
33
 
33
34
class OliveMkdir:
34
35
    """ Display the Make directory dialog and perform the needed actions. """
35
36
    def __init__(self, wt, wtpath):
36
37
        """ Initialize the Make directory dialog. """
37
 
        self.glade = gtk.glade.XML(gladefile, 'window_mkdir', 'olive-gtk')
 
38
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_mkdir', 'olive-gtk')
38
39
        
39
40
        self.window = self.glade.get_widget('window_mkdir')
40
41
        
44
45
        
45
46
        # Connect the signals to the handlers
46
47
        self.glade.signal_autoconnect(dic)
 
48
        
 
49
        self.wt = wt
 
50
        self.wtpath = wtpath
47
51
 
48
52
    def display(self):
49
53
        """ Display the Make directory dialog. """
50
54
        self.window.show_all()
51
55
 
 
56
    @show_bzr_error
52
57
    def mkdir(self, widget):
53
58
        # Get the widgets
54
59
        entry = self.glade.get_widget('entry_mkdir')
58
63
        
59
64
        if dirname == "":
60
65
            error_dialog(_('No directory name given'),
61
 
                                     _('Please specify a desired name for the new directory.'))
 
66
                         _('Please specify a desired name for the new directory.'))
62
67
            return
63
68
        
64
69
        if checkbox.get_active():
65
70
            # Want to create a versioned directory
66
71
            try:
67
 
                from bzrlib.workingtree import WorkingTree
68
 
    
69
 
                os.mkdir(os.path.join(wt.base, wtpath))
 
72
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
70
73
 
71
 
                wt.add([wtpath])
 
74
                self.wt.add([os.path.join(self.wtpath, dirname)])
72
75
            except OSError, e:
73
76
                if e.errno == 17:
74
77
                    error_dialog(_('Directory already exists'),
75
 
                                             _('Please specify another name to continue.'))
 
78
                                 _('Please specify another name to continue.'))
76
79
                else:
77
80
                    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(wt.base, wtpath))
 
84
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
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()
93
92
    
94
93
    def close(self, widget=None):
95
94
        self.window.destroy()