diff options
| author | Joshua Lock <josh@linux.intel.com> | 2012-03-02 15:46:40 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-12 02:26:13 +0000 |
| commit | fce8d37144651018f2b69b952fb6d0ea9103276a (patch) | |
| tree | 5e3eeb183f470e5f29d25d074b1e378fe6314938 /bitbake | |
| parent | ee0c3023c4d9ff6b9e2a5097428b1475d33f2aa8 (diff) | |
| download | poky-fce8d37144651018f2b69b952fb6d0ea9103276a.tar.gz | |
ui/crumbs/hig: use HobInfoButton in place of gtk.Image with tooltip
Replace all instances of the stock info icon with an attached tooltip with
the new HobInfoButton with associated PersistentTooltip.
(Bitbake rev: cead9a2e32f0196536c51d3a0713c1f28a35bf3d)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig.py | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py index c5bd27a057..b109c0a997 100644 --- a/bitbake/lib/bb/ui/crumbs/hig.py +++ b/bitbake/lib/bb/ui/crumbs/hig.py | |||
| @@ -28,7 +28,7 @@ import re | |||
| 28 | import subprocess | 28 | import subprocess |
| 29 | import shlex | 29 | import shlex |
| 30 | from bb.ui.crumbs.hobcolor import HobColors | 30 | from bb.ui.crumbs.hobcolor import HobColors |
| 31 | from bb.ui.crumbs.hobwidget import hcc, HobViewTable | 31 | from bb.ui.crumbs.hobwidget import hcc, hic, HobViewTable, HobInfoButton |
| 32 | from bb.ui.crumbs.progressbar import HobProgressBar | 32 | from bb.ui.crumbs.progressbar import HobProgressBar |
| 33 | 33 | ||
| 34 | """ | 34 | """ |
| @@ -130,10 +130,8 @@ class AdvancedSettingDialog (CrumbsDialog): | |||
| 130 | spinner.set_value(content) | 130 | spinner.set_value(content) |
| 131 | hbox.pack_start(spinner, expand=False, fill=False) | 131 | hbox.pack_start(spinner, expand=False, fill=False) |
| 132 | 132 | ||
| 133 | image = gtk.Image() | 133 | info = HobInfoButton(tooltip, self) |
| 134 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | 134 | hbox.pack_start(info, expand=False, fill=False) |
| 135 | image.set_tooltip_text(tooltip) | ||
| 136 | hbox.pack_start(image, expand=False, fill=False) | ||
| 137 | 135 | ||
| 138 | hbox.show_all() | 136 | hbox.show_all() |
| 139 | return hbox, spinner | 137 | return hbox, spinner |
| @@ -150,11 +148,8 @@ class AdvancedSettingDialog (CrumbsDialog): | |||
| 150 | combo.set_active(index) | 148 | combo.set_active(index) |
| 151 | index += 1 | 149 | index += 1 |
| 152 | 150 | ||
| 153 | image = gtk.Image() | 151 | info = HobInfoButton(tooltip, self) |
| 154 | image.show() | 152 | hbox.pack_start(info, expand=False, fill=False) |
| 155 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | ||
| 156 | image.set_tooltip_text(tooltip) | ||
| 157 | hbox.pack_start(image, expand=False, fill=False) | ||
| 158 | 153 | ||
| 159 | hbox.show_all() | 154 | hbox.show_all() |
| 160 | return hbox, combo | 155 | return hbox, combo |
| @@ -189,10 +184,8 @@ class AdvancedSettingDialog (CrumbsDialog): | |||
| 189 | open_button.connect("clicked", self.entry_widget_select_path_cb, parent, entry) | 184 | open_button.connect("clicked", self.entry_widget_select_path_cb, parent, entry) |
| 190 | table.attach(open_button, 9, 10, 0, 1) | 185 | table.attach(open_button, 9, 10, 0, 1) |
| 191 | 186 | ||
| 192 | image = gtk.Image() | 187 | info = HobInfoButton(tooltip, self) |
| 193 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | 188 | hbox.pack_start(info, expand=False, fill=False) |
| 194 | image.set_tooltip_text(tooltip) | ||
| 195 | hbox.pack_start(image, expand=False, fill=False) | ||
| 196 | 189 | ||
| 197 | hbox.show_all() | 190 | hbox.show_all() |
| 198 | return hbox, entry | 191 | return hbox, entry |
| @@ -331,10 +324,8 @@ class AdvancedSettingDialog (CrumbsDialog): | |||
| 331 | vbox.pack_start(down, False, False, 5) | 324 | vbox.pack_start(down, False, False, 5) |
| 332 | tree_selection.connect("changed", self.pkgfmt_widget_tree_selection_changed_cb, up, down) | 325 | tree_selection.connect("changed", self.pkgfmt_widget_tree_selection_changed_cb, up, down) |
| 333 | 326 | ||
| 334 | image = gtk.Image() | 327 | info = HobInfoButton(tooltip, self) |
| 335 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | 328 | pkgfmt_hbox.pack_start(info, expand=False, fill=False) |
| 336 | image.set_tooltip_text(tooltip) | ||
| 337 | pkgfmt_hbox.pack_start(image, expand=False, fill=False) | ||
| 338 | 329 | ||
| 339 | pkgfmt_hbox.show_all() | 330 | pkgfmt_hbox.show_all() |
| 340 | 331 | ||
| @@ -419,10 +410,8 @@ class AdvancedSettingDialog (CrumbsDialog): | |||
| 419 | button.connect("clicked", self.editable_settings_remove_item_clicked, setting_tree) | 410 | button.connect("clicked", self.editable_settings_remove_item_clicked, setting_tree) |
| 420 | hbox.pack_start(button) | 411 | hbox.pack_start(button) |
| 421 | 412 | ||
| 422 | image = gtk.Image() | 413 | info = HobInfoButton(tooltip, self) |
| 423 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | 414 | setting_hbox.pack_start(info, expand=False, fill=False) |
| 424 | image.set_tooltip_text(tooltip) | ||
| 425 | setting_hbox.pack_start(image, expand=False, fill=False) | ||
| 426 | 415 | ||
| 427 | return setting_hbox, setting_store | 416 | return setting_hbox, setting_store |
| 428 | 417 | ||
| @@ -489,13 +478,10 @@ class AdvancedSettingDialog (CrumbsDialog): | |||
| 489 | advanced_vbox.pack_start(table, expand=False, fill=False) | 478 | advanced_vbox.pack_start(table, expand=False, fill=False) |
| 490 | 479 | ||
| 491 | tooltip = "Select image file system types that will be used." | 480 | tooltip = "Select image file system types that will be used." |
| 492 | image = gtk.Image() | 481 | info = HobInfoButton(tooltip, self) |
| 493 | image.show() | ||
| 494 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | ||
| 495 | image.set_tooltip_text(tooltip) | ||
| 496 | label = self.gen_label_widget("<span weight=\"bold\">Select image types:</span>") | 482 | label = self.gen_label_widget("<span weight=\"bold\">Select image types:</span>") |
| 497 | table.attach(label, 0, 9, 0, 1) | 483 | table.attach(label, 0, 9, 0, 1) |
| 498 | table.attach(image, 9, 10, 0, 1) | 484 | table.attach(info, 9, 10, 0, 1) |
| 499 | 485 | ||
| 500 | i = 1 | 486 | i = 1 |
| 501 | j = 1 | 487 | j = 1 |
| @@ -953,10 +939,8 @@ class LayerSelectionDialog (CrumbsDialog): | |||
| 953 | hbox_top.pack_start(label, expand=False, fill=False) | 939 | hbox_top.pack_start(label, expand=False, fill=False) |
| 954 | 940 | ||
| 955 | tooltip = "Layer is a collection of bb files and conf files" | 941 | tooltip = "Layer is a collection of bb files and conf files" |
| 956 | image = gtk.Image() | 942 | info = HobInfoButton(tooltip, self) |
| 957 | image.set_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON) | 943 | hbox_top.pack_end(info, expand=False, fill=False) |
| 958 | image.set_tooltip_text(tooltip) | ||
| 959 | hbox_top.pack_end(image, expand=False, fill=False) | ||
| 960 | 944 | ||
| 961 | layer_widget, self.layer_store = self.gen_layer_widget(self.split_model, self.layers, self.all_layers, self, None) | 945 | layer_widget, self.layer_store = self.gen_layer_widget(self.split_model, self.layers, self.all_layers, self, None) |
| 962 | layer_widget.set_size_request(-1, 180) | 946 | layer_widget.set_size_request(-1, 180) |
