/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-10-03 06:44:48 UTC
  • mfrom: (0.8.98 merge)
  • mto: (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 103.
  • Revision ID: Szilveszter.Farkas@gmail.com-20061003064448-8cf3c9cc653346ab
Merge from the merge branch.

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
22
21
    pygtk.require("2.0")
23
22
except:
24
23
    pass
25
 
try:
26
 
    import gtk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
 
24
 
 
25
import gtk
 
26
import gtk.glade
30
27
 
31
28
import bzrlib.errors as errors
32
29
 
 
30
from olive import gladefile
 
31
from dialog import error_dialog, warning_dialog
 
32
 
33
33
class OliveMkdir:
34
34
    """ Display the Make directory dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm, dialog):
 
35
    def __init__(self, wt, wtpath):
36
36
        """ Initialize the Make directory dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_mkdir', 'olive-gtk')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
42
 
        # Dialog object
43
 
        self.dialog = dialog
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_mkdir', 'olive-gtk')
44
38
        
45
39
        self.window = self.glade.get_widget('window_mkdir')
46
40
        
50
44
        
51
45
        # Connect the signals to the handlers
52
46
        self.glade.signal_autoconnect(dic)
 
47
        
 
48
        self.wt = wt
 
49
        self.wtpath = wtpath
53
50
 
54
51
    def display(self):
55
52
        """ Display the Make directory dialog. """
63
60
        dirname = entry.get_text()
64
61
        
65
62
        if dirname == "":
66
 
            self.dialog.error_dialog(_('No directory name given'),
67
 
                                     _('Please specify a desired name for the new directory.'))
 
63
            error_dialog(_('No directory name given'),
 
64
                         _('Please specify a desired name for the new directory.'))
68
65
            return
69
66
        
70
 
        newdir = self.comm.get_path() + '/' + dirname
71
 
        
72
67
        if checkbox.get_active():
73
68
            # Want to create a versioned directory
74
69
            try:
75
 
                from bzrlib.workingtree import WorkingTree
76
 
    
77
 
                os.mkdir(newdir)
 
70
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
78
71
 
79
 
                wt, dd = WorkingTree.open_containing(newdir)
80
 
                wt.add([dd])
 
72
                self.wt.add([os.path.join(self.wtpath, dirname)])
81
73
            except OSError, e:
82
74
                if e.errno == 17:
83
 
                    self.dialog.error_dialog(_('Directory already exists'),
84
 
                                             _('Please specify another name to continue.'))
 
75
                    error_dialog(_('Directory already exists'),
 
76
                                 _('Please specify another name to continue.'))
85
77
                else:
86
78
                    raise
87
79
            except errors.NotBranchError:
88
 
                self.dialog.warning_dialog(_('Directory is not in a branch'),
89
 
                                           _('You can only create a non-versioned directory.'))
 
80
                warning_dialog(_('Directory is not in a branch'),
 
81
                               _('You can only create a non-versioned directory.'))
90
82
        else:
91
83
            # Just a simple directory
92
84
            try:
93
 
                os.mkdir(newdir)
 
85
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
94
86
            except OSError, e:
95
87
                if e.errno == 17:
96
 
                    self.dialog.error_dialog(_('Directory already exists'),
97
 
                                             _('Please specify another name to continue.'))
 
88
                    error_dialog(_('Directory already exists'),
 
89
                                 _('Please specify another name to continue.'))
98
90
                    return
99
91
 
100
92
        self.close()
101
 
        self.comm.refresh_right()
102
93
    
103
94
    def close(self, widget=None):
104
95
        self.window.destroy()