/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 initialize.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
initialize.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from gi.repository import GObject
18
 
from gi.repository import Gtk
 
17
try:
 
18
    import pygtk
 
19
    pygtk.require("2.0")
 
20
except:
 
21
    pass
 
22
 
 
23
import gtk
19
24
 
20
25
import os
21
26
 
22
 
from bzrlib import (
23
 
    bzrdir,
24
 
    errors,
25
 
    transport,
26
 
    )
27
 
 
28
 
from bzrlib.plugins.gtk.dialog import error_dialog
29
 
from bzrlib.plugins.gtk.errors import show_bzr_error
30
 
from bzrlib.plugins.gtk.i18n import _i18n
31
 
 
32
 
 
33
 
class InitDialog(Gtk.Dialog):
 
27
from dialog import error_dialog
 
28
from errors import show_bzr_error
 
29
 
 
30
from bzrlib import bzrdir
 
31
from bzrlib import transport
 
32
import bzrlib.errors as errors
 
33
from bzrlib.plugins.gtk import _i18n
 
34
 
 
35
class InitDialog(gtk.Dialog):
34
36
    """ Initialize dialog. """
35
 
 
36
37
    def __init__(self, path, parent=None):
37
38
        """ Initialize the Initialize dialog. """
38
 
        super(InitDialog, self).__init__(
39
 
            title="Initialize - Olive", parent=parent, flags=0,
40
 
            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
39
        gtk.Dialog.__init__(self, title="Initialize - Olive",
 
40
                                  parent=parent,
 
41
                                  flags=0,
 
42
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
41
43
        
42
44
        # Get arguments
43
45
        self.path = path
44
46
        
45
47
        # Create the widgets
46
 
        self._button_init = Gtk.Button(_i18n("_Initialize"), use_underline=True)
47
 
        self._label_question = Gtk.Label(label=_i18n("Which directory do you want to initialize?"))
48
 
        self._radio_current = Gtk.RadioButton.new_with_label(
49
 
            None, _i18n("Current directory"))
50
 
        self._radio_custom = Gtk.RadioButton.new_with_label_from_widget(
51
 
            self._radio_current, _i18n("Create a new directory with the name:"))
52
 
        self._entry_custom = Gtk.Entry()
53
 
        self._hbox_custom = Gtk.HBox()
 
48
        self._button_init = gtk.Button(_i18n("_Initialize"), use_underline=True)
 
49
        self._label_question = gtk.Label(_i18n("Which directory do you want to initialize?"))
 
50
        self._radio_current = gtk.RadioButton(None, _i18n("Current directory"))
 
51
        self._radio_custom = gtk.RadioButton(self._radio_current, _i18n("Create a new directory with the name:"))
 
52
        self._entry_custom = gtk.Entry()
 
53
        self._hbox_custom = gtk.HBox()
54
54
        
55
55
        # Set callbacks
56
56
        self._button_init.connect('clicked', self._on_init_clicked)
60
60
        self._entry_custom.set_sensitive(False)
61
61
        
62
62
        # Construct the dialog
63
 
        self.action_area.pack_end(self._button_init, False, False, 0)
64
 
        
65
 
        self._hbox_custom.pack_start(self._radio_custom, False, False, 0)
66
 
        self._hbox_custom.pack_start(self._entry_custom, True, True, 0)
67
 
        
68
 
        content_area = self.get_content_area()
69
 
        content_area.pack_start(self._label_question, True, True, 0)
70
 
        content_area.pack_start(self._radio_current, True, True, 0)
71
 
        content_area.pack_start(self._hbox_custom, True, True, 0)
 
63
        self.action_area.pack_end(self._button_init)
 
64
        
 
65
        self._hbox_custom.pack_start(self._radio_custom, False, False)
 
66
        self._hbox_custom.pack_start(self._entry_custom, True, True)
 
67
        
 
68
        self.vbox.pack_start(self._label_question)
 
69
        self.vbox.pack_start(self._radio_current)
 
70
        self.vbox.pack_start(self._hbox_custom)
72
71
        
73
72
        # Display the dialog
74
 
        content_area.show_all()
 
73
        self.vbox.show_all()
75
74
    
76
75
    def _on_custom_toggled(self, widget):
77
76
        """ Occurs if the Custom radiobutton is toggled. """
117
116
                branch = existing_bzrdir.create_branch()
118
117
                existing_bzrdir.create_workingtree()
119
118
        
120
 
        self.response(Gtk.ResponseType.OK)
 
119
        self.response(gtk.RESPONSE_OK)