diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py | 55 |
1 files changed, 15 insertions, 40 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py b/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py index 097ce7b027..3b998e4637 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py | |||
@@ -31,51 +31,28 @@ BitBake GUI's | |||
31 | In summary: spacing = 12px, border-width = 6px | 31 | In summary: spacing = 12px, border-width = 6px |
32 | """ | 32 | """ |
33 | 33 | ||
34 | class CrumbsMessageDialog(CrumbsDialog): | 34 | class CrumbsMessageDialog(gtk.MessageDialog): |
35 | """ | 35 | """ |
36 | A GNOME HIG compliant dialog widget. | 36 | A GNOME HIG compliant dialog widget. |
37 | Add buttons with gtk.Dialog.add_button or gtk.Dialog.add_buttons | 37 | Add buttons with gtk.Dialog.add_button or gtk.Dialog.add_buttons |
38 | """ | 38 | """ |
39 | def __init__(self, parent=None, label="", icon=gtk.STOCK_INFO, msg=""): | 39 | def __init__(self, parent = None, label="", dialog_type = gtk.MESSAGE_QUESTION, msg=""): |
40 | super(CrumbsMessageDialog, self).__init__("", parent, gtk.DIALOG_MODAL) | 40 | super(CrumbsMessageDialog, self).__init__(None, |
41 | gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, | ||
42 | dialog_type, | ||
43 | gtk.BUTTONS_NONE, | ||
44 | None) | ||
41 | 45 | ||
42 | self.set_border_width(6) | 46 | self.set_skip_taskbar_hint(False) |
43 | self.vbox.set_property("spacing", 12) | ||
44 | self.action_area.set_property("spacing", 12) | ||
45 | self.action_area.set_property("border-width", 6) | ||
46 | 47 | ||
47 | first_column = gtk.HBox(spacing=12) | 48 | self.set_markup(label) |
48 | first_column.set_property("border-width", 6) | ||
49 | first_column.show() | ||
50 | self.vbox.add(first_column) | ||
51 | 49 | ||
52 | self.icon = gtk.Image() | 50 | if 0 <= len(msg) < 300: |
53 | # We have our own Info icon which should be used in preference of the stock icon | 51 | self.format_secondary_markup(msg) |
54 | self.icon_chk = HobIconChecker() | ||
55 | self.icon.set_from_stock(self.icon_chk.check_stock_icon(icon), gtk.ICON_SIZE_DIALOG) | ||
56 | self.icon.set_property("yalign", 0.00) | ||
57 | self.icon.show() | ||
58 | first_column.pack_start(self.icon, expand=False, fill=True, padding=0) | ||
59 | |||
60 | if 0 <= len(msg) < 200: | ||
61 | lbl = label + "%s" % glib.markup_escape_text(msg) | ||
62 | self.label_short = gtk.Label() | ||
63 | self.label_short.set_use_markup(True) | ||
64 | self.label_short.set_line_wrap(True) | ||
65 | self.label_short.set_markup(lbl) | ||
66 | self.label_short.set_property("yalign", 0.00) | ||
67 | self.label_short.show() | ||
68 | first_column.add(self.label_short) | ||
69 | else: | 52 | else: |
70 | second_row = gtk.VBox(spacing=12) | 53 | vbox = self.get_message_area() |
71 | second_row.set_property("border-width", 6) | 54 | vbox.set_border_width(1) |
72 | self.label_long = gtk.Label() | 55 | vbox.set_property("spacing", 12) |
73 | self.label_long.set_use_markup(True) | ||
74 | self.label_long.set_line_wrap(True) | ||
75 | self.label_long.set_markup(label) | ||
76 | self.label_long.set_alignment(0.0, 0.0) | ||
77 | second_row.pack_start(self.label_long, expand=False, fill=False, padding=0) | ||
78 | self.label_long.show() | ||
79 | self.textWindow = gtk.ScrolledWindow() | 56 | self.textWindow = gtk.ScrolledWindow() |
80 | self.textWindow.set_shadow_type(gtk.SHADOW_IN) | 57 | self.textWindow.set_shadow_type(gtk.SHADOW_IN) |
81 | self.textWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) | 58 | self.textWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) |
@@ -89,7 +66,5 @@ class CrumbsMessageDialog(CrumbsDialog): | |||
89 | self.msgView.set_buffer(self.buf) | 66 | self.msgView.set_buffer(self.buf) |
90 | self.textWindow.add(self.msgView) | 67 | self.textWindow.add(self.msgView) |
91 | self.msgView.show() | 68 | self.msgView.show() |
92 | second_row.add(self.textWindow) | 69 | vbox.add(self.textWindow) |
93 | self.textWindow.show() | 70 | self.textWindow.show() |
94 | first_column.add(second_row) | ||
95 | second_row.show() | ||