/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/frontend/gtk/mkdir.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-08-15 17:37:54 UTC
  • mto: (0.14.1 main) (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060815173754-9877ef0e3e64660e
Some small tweaks in the .desktop file.

2006-08-15  Szilveszter Farkas <Szilveszter.Farkas@gmail.com>

    * icons/olive-gtk.png: added application icon

Show diffs side-by-side

added added

removed removed

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