/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 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/mkdir.py
27
27
 
28
28
import bzrlib.errors as errors
29
29
 
30
 
from olive import gladefile
31
 
from dialog import error_dialog, warning_dialog
 
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
        
52
56
        """ Display the Make directory dialog. """
53
57
        self.window.show_all()
54
58
 
 
59
    @show_bzr_error
55
60
    def mkdir(self, widget):
56
61
        # Get the widgets
57
62
        entry = self.glade.get_widget('entry_mkdir')
60
65
        dirname = entry.get_text()
61
66
        
62
67
        if dirname == "":
63
 
            error_dialog(_('No directory name given'),
64
 
                         _('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.'))
65
70
            return
66
71
        
67
72
        if checkbox.get_active():
72
77
                self.wt.add([os.path.join(self.wtpath, dirname)])
73
78
            except OSError, e:
74
79
                if e.errno == 17:
75
 
                    error_dialog(_('Directory already exists'),
76
 
                                 _('Please specify another name to continue.'))
 
80
                    error_dialog(_i18n('Directory already exists'),
 
81
                                 _i18n('Please specify another name to continue.'))
77
82
                else:
78
83
                    raise
79
 
            except errors.NotBranchError:
80
 
                warning_dialog(_('Directory is not in a branch'),
81
 
                               _('You can only create a non-versioned directory.'))
82
84
        else:
83
85
            # Just a simple directory
84
86
            try:
85
87
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
86
88
            except OSError, e:
87
89
                if e.errno == 17:
88
 
                    error_dialog(_('Directory already exists'),
89
 
                                 _('Please specify another name to continue.'))
 
90
                    error_dialog(_i18n('Directory already exists'),
 
91
                                 _i18n('Please specify another name to continue.'))
90
92
                    return
91
93
 
92
94
        self.close()