/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: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/mkdir.py
23
23
    pass
24
24
 
25
25
import gtk
26
 
import gtk.glade
27
26
 
28
27
import bzrlib.errors as errors
29
28
 
 
29
from bzrlib.plugins.gtk import _i18n
30
30
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
31
 
from guifiles import GLADEFILENAME
32
 
 
33
31
from bzrlib.plugins.gtk.errors import show_bzr_error
34
32
 
35
33
 
36
 
class OliveMkdir:
 
34
class MkdirDialog(gtk.Dialog):
37
35
    """ Display the Make directory dialog and perform the needed actions. """
38
 
    def __init__(self, wt, wtpath):
 
36
    
 
37
    def __init__(self, wt, wtpath, parent=None):
39
38
        """ Initialize the Make directory dialog. """
40
 
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_mkdir', 'olive-gtk')
41
 
        
42
 
        self.window = self.glade.get_widget('window_mkdir')
43
 
        
44
 
        # Dictionary for signal_autoconnect
45
 
        dic = { "on_button_mkdir_mkdir_clicked": self.mkdir,
46
 
                "on_button_mkdir_cancel_clicked": self.close }
47
 
        
48
 
        # Connect the signals to the handlers
49
 
        self.glade.signal_autoconnect(dic)
50
 
        
 
39
        gtk.Dialog.__init__(self, title="Olive - Make directory",
 
40
                                  parent=parent,
 
41
                                  flags=0,
 
42
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
 
43
        
 
44
        # Get arguments
51
45
        self.wt = wt
52
46
        self.wtpath = wtpath
53
 
 
54
 
    def display(self):
55
 
        """ Display the Make directory dialog. """
56
 
        self.window.show_all()
 
47
        
 
48
        # Create widgets
 
49
        self._hbox = gtk.HBox()
 
50
        self._label_directory_name = gtk.Label(_i18n("Directory name"))
 
51
        self._entry = gtk.Entry()
 
52
        self._versioned = gtk.CheckButton(_i18n("_Versioned directory"), use_underline=True)
 
53
        self._button_mkdir = gtk.Button(_i18n("_Make directory"), use_underline=True)
 
54
        self._button_mkdir_icon = gtk.Image()
 
55
        self._button_mkdir_icon.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_BUTTON)
 
56
        self._button_mkdir.set_image(self._button_mkdir_icon)
 
57
        
 
58
        self._entry.connect('activate', self._on_mkdir_clicked)
 
59
        self._button_mkdir.connect('clicked', self._on_mkdir_clicked)
 
60
        
 
61
        # Add widgets to dialog
 
62
        self.vbox.add(self._hbox)
 
63
        self._hbox.add(self._label_directory_name)
 
64
        self._hbox.add(self._entry)
 
65
        self._hbox.set_spacing(5)
 
66
        self.vbox.add(self._versioned)
 
67
        self.action_area.pack_end(self._button_mkdir)
 
68
        
 
69
        self.vbox.show_all()
57
70
 
58
71
    @show_bzr_error
59
 
    def mkdir(self, widget):
60
 
        # Get the widgets
61
 
        entry = self.glade.get_widget('entry_mkdir')
62
 
        checkbox = self.glade.get_widget('checkbutton_mkdir_versioned')
63
 
        
64
 
        dirname = entry.get_text()
 
72
    def _on_mkdir_clicked(self, widget):
 
73
        dirname = self._entry.get_text()
65
74
        
66
75
        if dirname == "":
67
 
            error_dialog(_('No directory name given'),
68
 
                         _('Please specify a desired name for the new directory.'))
 
76
            error_dialog(_i18n('No directory name given'),
 
77
                         _i18n('Please specify a desired name for the new directory.'))
69
78
            return
70
79
        
71
 
        if checkbox.get_active():
72
 
            # Want to create a versioned directory
73
 
            try:
74
 
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
75
 
 
 
80
        try:
 
81
            os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
 
82
            
 
83
            if self._versioned.get_active():
76
84
                self.wt.add([os.path.join(self.wtpath, dirname)])
77
 
            except OSError, e:
78
 
                if e.errno == 17:
79
 
                    error_dialog(_('Directory already exists'),
80
 
                                 _('Please specify another name to continue.'))
81
 
                else:
82
 
                    raise
83
 
        else:
84
 
            # Just a simple directory
85
 
            try:
86
 
                os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
87
 
            except OSError, e:
88
 
                if e.errno == 17:
89
 
                    error_dialog(_('Directory already exists'),
90
 
                                 _('Please specify another name to continue.'))
91
 
                    return
92
 
 
93
 
        self.close()
94
 
    
95
 
    def close(self, widget=None):
96
 
        self.window.destroy()
 
85
        except OSError, e:
 
86
            if e.errno == 17:
 
87
                error_dialog(_i18n('Directory already exists'),
 
88
                             _i18n('Please specify another name to continue.'))
 
89
            else:
 
90
                raise
 
91
        
 
92
        self.response(gtk.RESPONSE_OK)