summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-04-09 16:42:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 00:04:43 +0100
commit44b08a96b8011b3d3375f9a93c35cedad200fd3b (patch)
treec56fe47e40e1aafedb6f4fd1be9ab316eb4c1e3e /bitbake/lib
parentf9d7043b6280ecbab8e71899bf19bc85f7a40f44 (diff)
downloadpoky-44b08a96b8011b3d3375f9a93c35cedad200fd3b.tar.gz
Hob: Fix tooltips in Settings dialog
This fixes [YOCTO #2229] (Bitbake rev: 0f57e1d1d85a2c86d68e604e294ea4b0ceff03ca) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py38
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/recipeselectionpage.py2
2 files changed, 21 insertions, 19 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index 9adb28117a..016fb59acb 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -182,7 +182,7 @@ class AdvancedSettingDialog (CrumbsDialog):
182 check_hbox.pack_start(check_button, expand=False, fill=False) 182 check_hbox.pack_start(check_button, expand=False, fill=False)
183 check_hbox.show_all() 183 check_hbox.show_all()
184 184
185 def gen_pkgfmt_widget(self, curr_package_format, all_package_format, tooltip=""): 185 def gen_pkgfmt_widget(self, curr_package_format, all_package_format, tooltip_combo="", tooltip_extra=""):
186 pkgfmt_hbox = gtk.HBox(False, 24) 186 pkgfmt_hbox = gtk.HBox(False, 24)
187 187
188 rootfs_vbox = gtk.VBox(False, 6) 188 rootfs_vbox = gtk.VBox(False, 6)
@@ -195,8 +195,7 @@ class AdvancedSettingDialog (CrumbsDialog):
195 if curr_package_format: 195 if curr_package_format:
196 rootfs_format = curr_package_format.split()[0] 196 rootfs_format = curr_package_format.split()[0]
197 197
198 tooltip = "Package format that is used to generate rootfs" 198 rootfs_format_widget, rootfs_combo = self.gen_combo_widget(rootfs_format, all_package_format, tooltip_combo)
199 rootfs_format_widget, rootfs_combo = self.gen_combo_widget(rootfs_format, all_package_format, tooltip)
200 rootfs_vbox.pack_start(rootfs_format_widget, expand=False, fill=False) 199 rootfs_vbox.pack_start(rootfs_format_widget, expand=False, fill=False)
201 200
202 extra_vbox = gtk.VBox(False, 6) 201 extra_vbox = gtk.VBox(False, 6)
@@ -214,8 +213,7 @@ class AdvancedSettingDialog (CrumbsDialog):
214 check_button.set_active(is_active) 213 check_button.set_active(is_active)
215 check_hbox.pack_start(check_button, expand=False, fill=False) 214 check_hbox.pack_start(check_button, expand=False, fill=False)
216 215
217 tooltip = "Extra package formats to build" 216 info = HobInfoButton(tooltip_extra, self)
218 info = HobInfoButton(tooltip, self)
219 check_hbox.pack_end(info, expand=False, fill=False) 217 check_hbox.pack_end(info, expand=False, fill=False)
220 218
221 rootfs_combo.connect("changed", self.rootfs_combo_changed_cb, all_package_format, check_hbox) 219 rootfs_combo.connect("changed", self.rootfs_combo_changed_cb, all_package_format, check_hbox)
@@ -383,7 +381,7 @@ class AdvancedSettingDialog (CrumbsDialog):
383 table = gtk.Table(rows + 1, 10, True) 381 table = gtk.Table(rows + 1, 10, True)
384 advanced_vbox.pack_start(table, expand=False, fill=False) 382 advanced_vbox.pack_start(table, expand=False, fill=False)
385 383
386 tooltip = "Select image file system types that will be used." 384 tooltip = "Image file system types you want."
387 info = HobInfoButton(tooltip, self) 385 info = HobInfoButton(tooltip, self)
388 label = self.gen_label_widget("<span weight=\"bold\">Select image types:</span>") 386 label = self.gen_label_widget("<span weight=\"bold\">Select image types:</span>")
389 table.attach(label, 0, 9, 0, 1) 387 table.attach(label, 0, 9, 0, 1)
@@ -411,16 +409,16 @@ class AdvancedSettingDialog (CrumbsDialog):
411 sub_vbox = gtk.VBox(False, 6) 409 sub_vbox = gtk.VBox(False, 6)
412 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 410 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
413 label = self.gen_label_widget("<span weight=\"bold\">Packaging format:</span>") 411 label = self.gen_label_widget("<span weight=\"bold\">Packaging format:</span>")
414 tooltip = "Select package formats that will be used. " 412 tooltip_combo = "Selects the package format used to generate rootfs."
415 tooltip += "The first format will be used for final image" 413 tooltip_extra = "Selects extra package formats to build"
416 pkgfmt_widget, self.rootfs_combo, self.check_hbox = self.gen_pkgfmt_widget(self.configuration.curr_package_format, self.all_package_formats, tooltip) 414 pkgfmt_widget, self.rootfs_combo, self.check_hbox = self.gen_pkgfmt_widget(self.configuration.curr_package_format, self.all_package_formats, tooltip_combo, tooltip_extra)
417 sub_vbox.pack_start(label, expand=False, fill=False) 415 sub_vbox.pack_start(label, expand=False, fill=False)
418 sub_vbox.pack_start(pkgfmt_widget, expand=False, fill=False) 416 sub_vbox.pack_start(pkgfmt_widget, expand=False, fill=False)
419 417
420 sub_vbox = gtk.VBox(False, 6) 418 sub_vbox = gtk.VBox(False, 6)
421 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 419 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
422 label = self.gen_label_widget("<span weight=\"bold\">Image rootfs size: (MB)</span>") 420 label = self.gen_label_widget("<span weight=\"bold\">Image rootfs size: (MB)</span>")
423 tooltip = "Sets the size of your target image.\nThis is the basic size of your target image, unless your selected package size exceeds this value, or you set value to \"Image Extra Size\"." 421 tooltip = "Sets the basic size of your target image.\nThis is the basic size of your target image unless your selected package size exceeds this value or you select \'Image Extra Size\'."
424 rootfs_size_widget, self.rootfs_size_spinner = self.gen_spinner_widget(int(self.configuration.image_rootfs_size*1.0/1024), 0, 1024, tooltip) 422 rootfs_size_widget, self.rootfs_size_spinner = self.gen_spinner_widget(int(self.configuration.image_rootfs_size*1.0/1024), 0, 1024, tooltip)
425 sub_vbox.pack_start(label, expand=False, fill=False) 423 sub_vbox.pack_start(label, expand=False, fill=False)
426 sub_vbox.pack_start(rootfs_size_widget, expand=False, fill=False) 424 sub_vbox.pack_start(rootfs_size_widget, expand=False, fill=False)
@@ -428,7 +426,7 @@ class AdvancedSettingDialog (CrumbsDialog):
428 sub_vbox = gtk.VBox(False, 6) 426 sub_vbox = gtk.VBox(False, 6)
429 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 427 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
430 label = self.gen_label_widget("<span weight=\"bold\">Image extra size: (MB)</span>") 428 label = self.gen_label_widget("<span weight=\"bold\">Image extra size: (MB)</span>")
431 tooltip = "Sets the extra free space of your target image.\nDefaultly, system will reserve 30% of your image size as your free space. If your image contains zypper, it will bring in 50MB more space. The maximum free space is 1024MB." 429 tooltip = "Sets the extra free space of your target image.\nBy default, the system reserves 30% of your image size as free space. If your image contains zypper, it brings in 50MB more space. The maximum free space is 1024MB."
432 extra_size_widget, self.extra_size_spinner = self.gen_spinner_widget(int(self.configuration.image_extra_size*1.0/1024), 0, 1024, tooltip) 430 extra_size_widget, self.extra_size_spinner = self.gen_spinner_widget(int(self.configuration.image_extra_size*1.0/1024), 0, 1024, tooltip)
433 sub_vbox.pack_start(label, expand=False, fill=False) 431 sub_vbox.pack_start(label, expand=False, fill=False)
434 sub_vbox.pack_start(extra_size_widget, expand=False, fill=False) 432 sub_vbox.pack_start(extra_size_widget, expand=False, fill=False)
@@ -448,7 +446,7 @@ class AdvancedSettingDialog (CrumbsDialog):
448 self.toolchain_checkbox.set_active(self.configuration.toolchain_build) 446 self.toolchain_checkbox.set_active(self.configuration.toolchain_build)
449 sub_hbox.pack_start(self.toolchain_checkbox, expand=False, fill=False) 447 sub_hbox.pack_start(self.toolchain_checkbox, expand=False, fill=False)
450 448
451 tooltip = "This is the Host platform you would like to run the toolchain" 449 tooltip = "Selects the Host platform for which you want to run the toolchain"
452 sdk_machine_widget, self.sdk_machine_combo = self.gen_combo_widget(self.configuration.curr_sdk_machine, self.all_sdk_machines, tooltip) 450 sdk_machine_widget, self.sdk_machine_combo = self.gen_combo_widget(self.configuration.curr_sdk_machine, self.all_sdk_machines, tooltip)
453 sub_hbox.pack_start(sdk_machine_widget, expand=False, fill=False) 451 sub_hbox.pack_start(sdk_machine_widget, expand=False, fill=False)
454 452
@@ -461,7 +459,7 @@ class AdvancedSettingDialog (CrumbsDialog):
461 sub_vbox = gtk.VBox(False, 6) 459 sub_vbox = gtk.VBox(False, 6)
462 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 460 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
463 label = self.gen_label_widget("<span weight=\"bold\">Select distro:</span>") 461 label = self.gen_label_widget("<span weight=\"bold\">Select distro:</span>")
464 tooltip = "This is the Yocto distribution you would like to use" 462 tooltip = "Selects the Yocto Project distribution you want"
465 distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip) 463 distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip)
466 sub_vbox.pack_start(label, expand=False, fill=False) 464 sub_vbox.pack_start(label, expand=False, fill=False)
467 sub_vbox.pack_start(distro_widget, expand=False, fill=False) 465 sub_vbox.pack_start(distro_widget, expand=False, fill=False)
@@ -469,7 +467,9 @@ class AdvancedSettingDialog (CrumbsDialog):
469 sub_vbox = gtk.VBox(False, 6) 467 sub_vbox = gtk.VBox(False, 6)
470 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 468 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
471 label = self.gen_label_widget("<span weight=\"bold\">BB number threads:</span>") 469 label = self.gen_label_widget("<span weight=\"bold\">BB number threads:</span>")
472 tooltip = "Sets the number of threads that bitbake tasks can run simultaneously" 470 tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the <a href=\""
471 tooltip += "http://www.yoctoproject.org/docs/current/poky-ref-manual/"
472 tooltip += "poky-ref-manual.html#var-BB_NUMBER_THREADS\">Poky reference manual</a> for information"
473 bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip) 473 bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip)
474 sub_vbox.pack_start(label, expand=False, fill=False) 474 sub_vbox.pack_start(label, expand=False, fill=False)
475 sub_vbox.pack_start(bbthread_widget, expand=False, fill=False) 475 sub_vbox.pack_start(bbthread_widget, expand=False, fill=False)
@@ -477,14 +477,16 @@ class AdvancedSettingDialog (CrumbsDialog):
477 sub_vbox = gtk.VBox(False, 6) 477 sub_vbox = gtk.VBox(False, 6)
478 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 478 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
479 label = self.gen_label_widget("<span weight=\"bold\">Parallel make:</span>") 479 label = self.gen_label_widget("<span weight=\"bold\">Parallel make:</span>")
480 tooltip = "Sets the make parallism, as known as 'make -j'" 480 tooltip = "Sets the maximum number of threads the host can use during the build. See the <a href=\""
481 tooltip += "http://www.yoctoproject.org/docs/current/poky-ref-manual/"
482 tooltip += "poky-ref-manual.html#var-PARALLEL_MAKE\">Poky reference manual</a> for information"
481 pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip) 483 pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip)
482 sub_vbox.pack_start(label, expand=False, fill=False) 484 sub_vbox.pack_start(label, expand=False, fill=False)
483 sub_vbox.pack_start(pmake_widget, expand=False, fill=False) 485 sub_vbox.pack_start(pmake_widget, expand=False, fill=False)
484 486
485 sub_vbox = gtk.VBox(False, 6) 487 sub_vbox = gtk.VBox(False, 6)
486 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 488 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
487 label = self.gen_label_widget("<span weight=\"bold\">Set download directory:</span>") 489 label = self.gen_label_widget("<span weight=\"bold\">Select download directory:</span>")
488 tooltip = "Select a folder that caches the upstream project source code" 490 tooltip = "Select a folder that caches the upstream project source code"
489 dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip) 491 dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip)
490 sub_vbox.pack_start(label, expand=False, fill=False) 492 sub_vbox.pack_start(label, expand=False, fill=False)
@@ -501,7 +503,7 @@ class AdvancedSettingDialog (CrumbsDialog):
501 sub_vbox = gtk.VBox(False, 6) 503 sub_vbox = gtk.VBox(False, 6)
502 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) 504 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
503 label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE mirror:</span>") 505 label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE mirror:</span>")
504 tooltip = "Select the prebuilt mirror that will fasten your build speed" 506 tooltip = "Select the pre-built mirror that will speed your build"
505 sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip) 507 sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip)
506 sub_vbox.pack_start(label, expand=False, fill=False) 508 sub_vbox.pack_start(label, expand=False, fill=False)
507 sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False) 509 sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False)
@@ -577,7 +579,7 @@ class AdvancedSettingDialog (CrumbsDialog):
577 sub_vbox = gtk.VBox(False, 6) 579 sub_vbox = gtk.VBox(False, 6)
578 advanced_vbox.pack_start(sub_vbox, expand=True, fill=True) 580 advanced_vbox.pack_start(sub_vbox, expand=True, fill=True)
579 label = self.gen_label_widget("<span weight=\"bold\">Add your own variables:</span>") 581 label = self.gen_label_widget("<span weight=\"bold\">Add your own variables:</span>")
580 tooltip = "This is the key/value pair for your extra settings" 582 tooltip = "These are key/value pairs for your extra settings. Click \'Add\' and then directly edit the key and the value"
581 setting_widget, self.setting_store = self.gen_editable_settings(self.configuration.extra_setting, tooltip) 583 setting_widget, self.setting_store = self.gen_editable_settings(self.configuration.extra_setting, tooltip)
582 sub_vbox.pack_start(label, expand=False, fill=False) 584 sub_vbox.pack_start(label, expand=False, fill=False)
583 sub_vbox.pack_start(setting_widget, expand=True, fill=True) 585 sub_vbox.pack_start(setting_widget, expand=True, fill=True)
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index 3ad4c3cc23..bcd7b9c42d 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -167,7 +167,7 @@ class RecipeSelectionPage (HobPage):
167 167
168 self.build_packages_button = HobButton('Build packages') 168 self.build_packages_button = HobButton('Build packages')
169 self.build_packages_button.set_size_request(205, 49) 169 self.build_packages_button.set_size_request(205, 49)
170 self.build_packages_button.set_tooltip_text("Build packages for customization") 170 self.build_packages_button.set_tooltip_text("Build selected recipes into packages")
171 self.build_packages_button.set_flags(gtk.CAN_DEFAULT) 171 self.build_packages_button.set_flags(gtk.CAN_DEFAULT)
172 self.build_packages_button.grab_default() 172 self.build_packages_button.grab_default()
173 self.build_packages_button.connect("clicked", self.build_packages_clicked_cb) 173 self.build_packages_button.connect("clicked", self.build_packages_clicked_cb)