/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: Daniel Schierbeck
  • Date: 2008-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

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