/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-27 18:08:35 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927180835-4c295d9bb936623a
Turn some windows into dialogs.
Remove the diffwindow code from olive, 
switched to using the one from bzr-gtk instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/mkdir.py
28
28
except:
29
29
    sys.exit(1)
30
30
 
31
 
import olive.backend.errors as errors
32
 
import olive.backend.fileops as fileops
 
31
import bzrlib.errors as errors
33
32
 
34
33
class OliveMkdir:
35
34
    """ Display the Make directory dialog and perform the needed actions. """
36
 
    def __init__(self, gladefile, comm, dialog):
 
35
    def __init__(self, gladefile, wt, wtpath, dialog):
37
36
        """ Initialize the Make directory dialog. """
38
37
        self.gladefile = gladefile
39
38
        self.glade = gtk.glade.XML(self.gladefile, 'window_mkdir', 'olive-gtk')
40
39
        
41
 
        # Communication object
42
 
        self.comm = comm
43
40
        # Dialog object
44
 
        self.dialog = dialog
 
41
        = dialog
45
42
        
46
43
        self.window = self.glade.get_widget('window_mkdir')
47
44
        
64
61
        dirname = entry.get_text()
65
62
        
66
63
        if dirname == "":
67
 
            self.dialog.error_dialog(_('No directory name given'),
 
64
            error_dialog(_('No directory name given'),
68
65
                                     _('Please specify a desired name for the new directory.'))
69
66
            return
70
67
        
71
 
        newdir = self.comm.get_path() + '/' + dirname
72
 
        
73
68
        if checkbox.get_active():
74
69
            # Want to create a versioned directory
75
70
            try:
76
 
                fileops.mkdir(newdir)
77
 
            except errors.DirectoryAlreadyExists:
78
 
                self.dialog.error_dialog(_('Directory already exists'),
79
 
                                         _('Please specify another name to continue.'))
80
 
                return
 
71
                from bzrlib.workingtree import WorkingTree
 
72
    
 
73
                os.mkdir(os.path.join(wt.base, wtpath))
 
74
 
 
75
                wt.add([wtpath])
 
76
            except OSError, e:
 
77
                if e.errno == 17:
 
78
                    error_dialog(_('Directory already exists'),
 
79
                                             _('Please specify another name to continue.'))
 
80
                else:
 
81
                    raise
81
82
            except errors.NotBranchError:
82
 
                self.dialog.warning_dialog(_('Directory is not in a branch'),
 
83
                warning_dialog(_('Directory is not in a branch'),
83
84
                                           _('You can only create a non-versioned directory.'))
84
85
        else:
85
86
            # Just a simple directory
86
87
            try:
87
 
                os.mkdir(newdir)
 
88
                os.mkdir(os.path.join(wt.base, wtpath))
88
89
            except OSError, e:
89
90
                if e.errno == 17:
90
 
                    self.dialog.error_dialog(_('Directory already exists'),
 
91
                    error_dialog(_('Directory already exists'),
91
92
                                             _('Please specify another name to continue.'))
92
93
                    return
93
94