/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: 2008-06-29 19:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629190723-l8mzg9x4oec0lhsl
Return cleartext from seahorse module

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