/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
24
24
import gtk.glade
25
25
 
26
26
 
27
 
def about():
28
 
    """ Display the AboutDialog. """
29
 
    import olive
30
 
    from guifiles import GLADEFILENAME
31
 
 
32
 
    # Load AboutDialog description
33
 
    dglade = gtk.glade.XML(GLADEFILENAME, 'aboutdialog')
34
 
    dialog = dglade.get_widget('aboutdialog')
35
 
 
36
 
    # Set version
37
 
    dialog.set_version(olive.__version__)
38
 
 
39
 
    dialog.run()
40
 
    # Destroy the dialog
41
 
    dialog.destroy()
42
 
 
43
 
def _message_dialog(type, primary, secondary):
 
27
def _message_dialog(type, primary, secondary, buttons=gtk.BUTTONS_OK):
44
28
    """ Display a given type of MessageDialog with the given message.
45
29
    
46
 
    :param type: error | warning | info
 
30
    :param type: message dialog type
47
31
    
48
32
    :param message: the message you want to display.
49
33
    """
50
 
    if type == 'error':
51
 
        dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
52
 
                                   type=gtk.MESSAGE_ERROR,
53
 
                                   buttons=gtk.BUTTONS_OK)
54
 
        dialog.set_markup('<big><b>' + primary + '</b></big>')
55
 
    elif type == 'warning':
56
 
        dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
57
 
                                   type=gtk.MESSAGE_WARNING,
58
 
                                   buttons=gtk.BUTTONS_OK)
59
 
        dialog.set_markup('<big><b>' + primary + '</b></big>')
60
 
    elif type == 'info':
61
 
        dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
62
 
                                   type=gtk.MESSAGE_INFO,
63
 
                                   buttons=gtk.BUTTONS_OK)
64
 
        dialog.set_markup('<big><b>' + primary + '</b></big>')
65
 
    elif type == 'question':
66
 
        dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL,
67
 
                                   type=gtk.MESSAGE_QUESTION,
68
 
                                   buttons=gtk.BUTTONS_YES_NO)
69
 
        dialog.set_markup('<big><b>' + primary + '</b></big>')
70
 
    else:
71
 
        return
72
 
 
 
34
    dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type,
 
35
                               buttons=buttons)
 
36
    dialog.set_markup('<big><b>' + primary + '</b></big>')
73
37
    dialog.format_secondary_markup(secondary)
74
 
 
75
38
    response = dialog.run()
76
39
    dialog.destroy()
77
 
 
78
40
    return response
79
41
 
80
42
def error_dialog(primary, secondary):
81
43
    """ Display an error dialog with the given message. """
82
 
    return _message_dialog('error', primary, secondary)
 
44
    return _message_dialog(gtk.MESSAGE_ERROR, primary, secondary)
83
45
 
84
46
def info_dialog(primary, secondary):
85
47
    """ Display an info dialog with the given message. """
86
 
    return _message_dialog('info', primary, secondary)
 
48
    return _message_dialog(gtk.MESSAGE_INFO, primary, secondary)
87
49
 
88
50
def warning_dialog(primary, secondary):
89
51
    """ Display a warning dialog with the given message. """
90
 
    return _message_dialog('warning', primary, secondary)
 
52
    return _message_dialog(gtk.MESSAGE_WARNING, primary, secondary)
91
53
 
92
54
def question_dialog(primary, secondary):
93
55
    """ Display a dialog with the given question. """
94
 
    return _message_dialog('question', primary, secondary)
 
56
    return _message_dialog(gtk.MESSAGE_QUESTION, primary, secondary, gtk.BUTTONS_YES_NO)