/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: Andrew Bennetts
  • Date: 2008-04-29 08:17:01 UTC
  • mto: This revision was merged to the branch mainline in revision 476.
  • Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.

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