/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 dialog.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:
dialog.py
21
21
    pass
22
22
 
23
23
import gtk
24
 
 
25
 
 
26
 
def _message_dialog(type, primary, secondary, parent=None, buttons=gtk.BUTTONS_OK):
 
24
import gtk.glade
 
25
 
 
26
 
 
27
def _message_dialog(type, primary, secondary, buttons=gtk.BUTTONS_OK):
27
28
    """ Display a given type of MessageDialog with the given message.
28
29
    
29
30
    :param type: message dialog type
30
31
    
31
32
    :param message: the message you want to display.
32
33
    """
33
 
    dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type, parent=parent,
 
34
    dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type,
34
35
                               buttons=buttons)
35
36
    dialog.set_markup('<big><b>' + primary + '</b></big>')
36
37
    dialog.format_secondary_markup(secondary)
38
39
    dialog.destroy()
39
40
    return response
40
41
 
41
 
def error_dialog(primary, secondary, parent=None):
 
42
def error_dialog(primary, secondary):
42
43
    """ Display an error dialog with the given message. """
43
 
    return _message_dialog(gtk.MESSAGE_ERROR, primary, secondary, parent)
 
44
    return _message_dialog(gtk.MESSAGE_ERROR, primary, secondary)
44
45
 
45
 
def info_dialog(primary, secondary, parent=None):
 
46
def info_dialog(primary, secondary):
46
47
    """ Display an info dialog with the given message. """
47
 
    return _message_dialog(gtk.MESSAGE_INFO, primary, secondary, parent)
 
48
    return _message_dialog(gtk.MESSAGE_INFO, primary, secondary)
48
49
 
49
 
def warning_dialog(primary, secondary, parent=None):
 
50
def warning_dialog(primary, secondary):
50
51
    """ Display a warning dialog with the given message. """
51
 
    return _message_dialog(gtk.MESSAGE_WARNING, primary, secondary, parent)
 
52
    return _message_dialog(gtk.MESSAGE_WARNING, primary, secondary)
52
53
 
53
 
def question_dialog(primary, secondary, parent=None):
 
54
def question_dialog(primary, secondary):
54
55
    """ Display a dialog with the given question. """
55
 
    return _message_dialog(gtk.MESSAGE_QUESTION, primary, secondary, parent, gtk.BUTTONS_YES_NO)
 
56
    return _message_dialog(gtk.MESSAGE_QUESTION, primary, secondary, gtk.BUTTONS_YES_NO)