/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: Jelmer Vernooij
  • Date: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dialog.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
 
try:
18
 
    import pygtk
19
 
    pygtk.require("2.0")
20
 
except:
21
 
    pass
22
 
 
23
 
import gtk
24
 
import gtk.glade
25
 
 
26
 
 
27
 
def about():
28
 
    """ Display the AboutDialog. """
29
 
    from bzrlib.plugins.gtk import __version__
30
 
    from bzrlib.plugins.gtk.olive.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(__version__)
38
 
 
39
 
    dialog.run()
40
 
    # Destroy the dialog
41
 
    dialog.destroy()
42
 
 
43
 
def _message_dialog(type, primary, secondary, buttons=gtk.BUTTONS_OK):
 
17
from gi.repository import Gtk
 
18
 
 
19
 
 
20
def _message_dialog(type, primary, secondary, parent=None, buttons=Gtk.ButtonsType.OK):
44
21
    """ Display a given type of MessageDialog with the given message.
45
 
    
 
22
 
46
23
    :param type: message dialog type
47
 
    
 
24
 
48
25
    :param message: the message you want to display.
49
26
    """
50
 
    dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type,
51
 
                               buttons=buttons)
 
27
    dialog = Gtk.MessageDialog(parent=parent, flags=Gtk.DialogFlags.MODAL,
 
28
                               type=type, buttons=buttons)
52
29
    dialog.set_markup('<big><b>' + primary + '</b></big>')
53
 
    dialog.format_secondary_markup(secondary)
 
30
    dialog.format_secondary_text(secondary)
54
31
    response = dialog.run()
55
32
    dialog.destroy()
56
33
    return response
57
34
 
58
 
def error_dialog(primary, secondary):
 
35
def error_dialog(primary, secondary, parent=None):
59
36
    """ Display an error dialog with the given message. """
60
 
    return _message_dialog(gtk.MESSAGE_ERROR, primary, secondary)
 
37
    return _message_dialog(Gtk.MessageType.ERROR, primary, secondary, parent)
61
38
 
62
 
def info_dialog(primary, secondary):
 
39
def info_dialog(primary, secondary, parent=None):
63
40
    """ Display an info dialog with the given message. """
64
 
    return _message_dialog(gtk.MESSAGE_INFO, primary, secondary)
 
41
    return _message_dialog(Gtk.MessageType.INFO, primary, secondary, parent)
65
42
 
66
 
def warning_dialog(primary, secondary):
 
43
def warning_dialog(primary, secondary, parent=None):
67
44
    """ Display a warning dialog with the given message. """
68
 
    return _message_dialog(gtk.MESSAGE_WARNING, primary, secondary)
 
45
    return _message_dialog(Gtk.MessageType.WARNING, primary, secondary, parent)
69
46
 
70
 
def question_dialog(primary, secondary):
 
47
def question_dialog(primary, secondary, parent=None):
71
48
    """ Display a dialog with the given question. """
72
 
    return _message_dialog(gtk.MESSAGE_QUESTION, primary, secondary, gtk.BUTTONS_YES_NO)
 
49
    return _message_dialog(Gtk.MessageType.QUESTION, primary, secondary, parent, Gtk.ButtonsType.YES_NO)