summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py234
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/imagedetailspage.py2
2 files changed, 118 insertions, 118 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index ff0ad17664..e043f93252 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -352,6 +352,123 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
352 md5 = self.config_md5() 352 md5 = self.config_md5()
353 self.settings_changed = (self.md5 != md5) 353 self.settings_changed = (self.md5 != md5)
354 354
355 def create_build_environment_page(self):
356 advanced_vbox = gtk.VBox(False, 6)
357 advanced_vbox.set_border_width(6)
358
359 sub_vbox = gtk.VBox(False, 6)
360 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
361 label = self.gen_label_widget("<span weight=\"bold\">Select distro:</span>")
362 tooltip = "Selects the Yocto Project distribution you want"
363 distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip)
364 sub_vbox.pack_start(label, expand=False, fill=False)
365 sub_vbox.pack_start(distro_widget, expand=False, fill=False)
366
367 sub_vbox = gtk.VBox(False, 6)
368 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
369 label = self.gen_label_widget("<span weight=\"bold\">BB number threads:</span>")
370 tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the <a href=\""
371 tooltip += "http://www.yoctoproject.org/docs/current/poky-ref-manual/"
372 tooltip += "poky-ref-manual.html#var-BB_NUMBER_THREADS\">Poky reference manual</a> for information"
373 bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip)
374 sub_vbox.pack_start(label, expand=False, fill=False)
375 sub_vbox.pack_start(bbthread_widget, expand=False, fill=False)
376
377 sub_vbox = gtk.VBox(False, 6)
378 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
379 label = self.gen_label_widget("<span weight=\"bold\">Parallel make:</span>")
380 tooltip = "Sets the maximum number of threads the host can use during the build. See the <a href=\""
381 tooltip += "http://www.yoctoproject.org/docs/current/poky-ref-manual/"
382 tooltip += "poky-ref-manual.html#var-PARALLEL_MAKE\">Poky reference manual</a> for information"
383 pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip)
384 sub_vbox.pack_start(label, expand=False, fill=False)
385 sub_vbox.pack_start(pmake_widget, expand=False, fill=False)
386
387 sub_vbox = gtk.VBox(False, 6)
388 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
389 label = self.gen_label_widget("<span weight=\"bold\">Select download directory:</span>")
390 tooltip = "Select a folder that caches the upstream project source code"
391 dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip)
392 sub_vbox.pack_start(label, expand=False, fill=False)
393 sub_vbox.pack_start(dldir_widget, expand=False, fill=False)
394
395 sub_vbox = gtk.VBox(False, 6)
396 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
397 label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE directory:</span>")
398 tooltip = "Select a folder that caches your prebuilt results"
399 sstatedir_widget, self.sstatedir_text = self.gen_entry_widget(self.configuration.sstatedir, self, tooltip)
400 sub_vbox.pack_start(label, expand=False, fill=False)
401 sub_vbox.pack_start(sstatedir_widget, expand=False, fill=False)
402
403 sub_vbox = gtk.VBox(False, 6)
404 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
405 label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE mirror:</span>")
406 tooltip = "Select the pre-built mirror that will speed your build"
407 sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip)
408 sub_vbox.pack_start(label, expand=False, fill=False)
409 sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False)
410
411 return advanced_vbox
412
413 def create_proxy_page(self):
414 advanced_vbox = gtk.VBox(False, 6)
415 advanced_vbox.set_border_width(6)
416
417 sub_vbox = gtk.VBox(False, 6)
418 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
419 label = self.gen_label_widget("<span weight=\"bold\">Set the proxies used when fetching source code</span>")
420 tooltip = "Set the proxies used when fetching source code. A blank field uses a direct internet connection."
421 info = HobInfoButton(tooltip, self)
422 hbox = gtk.HBox(False, 12)
423 hbox.pack_start(label, expand=True, fill=True)
424 hbox.pack_start(info, expand=False, fill=False)
425 sub_vbox.pack_start(hbox, expand=False, fill=False)
426
427 self.direct_checkbox = gtk.RadioButton(None, "Direct internet connection")
428 self.direct_checkbox.set_tooltip_text("Check this box to use a direct internet connection with no proxy")
429 self.direct_checkbox.set_active(not self.configuration.enable_proxy)
430 sub_vbox.pack_start(self.direct_checkbox, expand=False, fill=False)
431
432 self.proxy_checkbox = gtk.RadioButton(self.direct_checkbox, "Manual proxy configuration")
433 self.proxy_checkbox.set_tooltip_text("Check this box to manually set up a specific proxy")
434 self.proxy_checkbox.set_active(self.configuration.enable_proxy)
435 sub_vbox.pack_start(self.proxy_checkbox, expand=False, fill=False)
436
437 self.same_checkbox = gtk.CheckButton("Use the same proxy for all protocols")
438 self.same_checkbox.set_tooltip_text("Check this box to use the HTTP proxy for all five proxies")
439 self.same_checkbox.set_active(self.configuration.same_proxy)
440 hbox = gtk.HBox(False, 12)
441 hbox.pack_start(self.same_checkbox, expand=False, fill=False, padding=24)
442 sub_vbox.pack_start(hbox, expand=False, fill=False)
443
444 proxy_widget, self.http_proxy, self.http_proxy_port, self.http_proxy_details = self.gen_proxy_entry_widget(
445 "http", self, True)
446 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
447
448 proxy_widget, self.https_proxy, self.https_proxy_port, self.https_proxy_details = self.gen_proxy_entry_widget(
449 "https", self, True)
450 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
451
452 proxy_widget, self.ftp_proxy, self.ftp_proxy_port, self.ftp_proxy_details = self.gen_proxy_entry_widget(
453 "ftp", self, True)
454 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
455
456 proxy_widget, self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget(
457 "git", self, True)
458 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
459
460 proxy_widget, self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget(
461 "cvs", self, True)
462 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
463
464 self.direct_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)
465 self.proxy_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)
466 self.same_checkbox.connect("toggled", self.same_checkbox_toggled_cb)
467
468 self.refresh_proxy_components()
469 return advanced_vbox
470
471
355 def create_visual_elements(self): 472 def create_visual_elements(self):
356 self.nb = gtk.Notebook() 473 self.nb = gtk.Notebook()
357 self.nb.set_show_tabs(True) 474 self.nb.set_show_tabs(True)
@@ -364,7 +481,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
364 self.show_all() 481 self.show_all()
365 482
366 483
367
368# 484#
369# AdvancedSettings Dialog 485# AdvancedSettings Dialog
370# 486#
@@ -685,122 +801,6 @@ class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper):
685 801
686 return advanced_vbox 802 return advanced_vbox
687 803
688 def create_build_environment_page(self):
689 advanced_vbox = gtk.VBox(False, 6)
690 advanced_vbox.set_border_width(6)
691
692 sub_vbox = gtk.VBox(False, 6)
693 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
694 label = self.gen_label_widget("<span weight=\"bold\">Select distro:</span>")
695 tooltip = "Selects the Yocto Project distribution you want"
696 distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip)
697 sub_vbox.pack_start(label, expand=False, fill=False)
698 sub_vbox.pack_start(distro_widget, expand=False, fill=False)
699
700 sub_vbox = gtk.VBox(False, 6)
701 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
702 label = self.gen_label_widget("<span weight=\"bold\">BB number threads:</span>")
703 tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the <a href=\""
704 tooltip += "http://www.yoctoproject.org/docs/current/poky-ref-manual/"
705 tooltip += "poky-ref-manual.html#var-BB_NUMBER_THREADS\">Poky reference manual</a> for information"
706 bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip)
707 sub_vbox.pack_start(label, expand=False, fill=False)
708 sub_vbox.pack_start(bbthread_widget, expand=False, fill=False)
709
710 sub_vbox = gtk.VBox(False, 6)
711 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
712 label = self.gen_label_widget("<span weight=\"bold\">Parallel make:</span>")
713 tooltip = "Sets the maximum number of threads the host can use during the build. See the <a href=\""
714 tooltip += "http://www.yoctoproject.org/docs/current/poky-ref-manual/"
715 tooltip += "poky-ref-manual.html#var-PARALLEL_MAKE\">Poky reference manual</a> for information"
716 pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip)
717 sub_vbox.pack_start(label, expand=False, fill=False)
718 sub_vbox.pack_start(pmake_widget, expand=False, fill=False)
719
720 sub_vbox = gtk.VBox(False, 6)
721 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
722 label = self.gen_label_widget("<span weight=\"bold\">Select download directory:</span>")
723 tooltip = "Select a folder that caches the upstream project source code"
724 dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip)
725 sub_vbox.pack_start(label, expand=False, fill=False)
726 sub_vbox.pack_start(dldir_widget, expand=False, fill=False)
727
728 sub_vbox = gtk.VBox(False, 6)
729 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
730 label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE directory:</span>")
731 tooltip = "Select a folder that caches your prebuilt results"
732 sstatedir_widget, self.sstatedir_text = self.gen_entry_widget(self.configuration.sstatedir, self, tooltip)
733 sub_vbox.pack_start(label, expand=False, fill=False)
734 sub_vbox.pack_start(sstatedir_widget, expand=False, fill=False)
735
736 sub_vbox = gtk.VBox(False, 6)
737 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
738 label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE mirror:</span>")
739 tooltip = "Select the pre-built mirror that will speed your build"
740 sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip)
741 sub_vbox.pack_start(label, expand=False, fill=False)
742 sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False)
743
744 return advanced_vbox
745
746 def create_proxy_page(self):
747 advanced_vbox = gtk.VBox(False, 6)
748 advanced_vbox.set_border_width(6)
749
750 sub_vbox = gtk.VBox(False, 6)
751 advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)
752 label = self.gen_label_widget("<span weight=\"bold\">Set the proxies used when fetching source code</span>")
753 tooltip = "Set the proxies used when fetching source code. A blank field uses a direct internet connection."
754 info = HobInfoButton(tooltip, self)
755 hbox = gtk.HBox(False, 12)
756 hbox.pack_start(label, expand=True, fill=True)
757 hbox.pack_start(info, expand=False, fill=False)
758 sub_vbox.pack_start(hbox, expand=False, fill=False)
759
760 self.direct_checkbox = gtk.RadioButton(None, "Direct internet connection")
761 self.direct_checkbox.set_tooltip_text("Check this box to use a direct internet connection with no proxy")
762 self.direct_checkbox.set_active(not self.configuration.enable_proxy)
763 sub_vbox.pack_start(self.direct_checkbox, expand=False, fill=False)
764
765 self.proxy_checkbox = gtk.RadioButton(self.direct_checkbox, "Manual proxy configuration")
766 self.proxy_checkbox.set_tooltip_text("Check this box to manually set up a specific proxy")
767 self.proxy_checkbox.set_active(self.configuration.enable_proxy)
768 sub_vbox.pack_start(self.proxy_checkbox, expand=False, fill=False)
769
770 self.same_checkbox = gtk.CheckButton("Use the same proxy for all protocols")
771 self.same_checkbox.set_tooltip_text("Check this box to use the HTTP proxy for all five proxies")
772 self.same_checkbox.set_active(self.configuration.same_proxy)
773 hbox = gtk.HBox(False, 12)
774 hbox.pack_start(self.same_checkbox, expand=False, fill=False, padding=24)
775 sub_vbox.pack_start(hbox, expand=False, fill=False)
776
777 proxy_widget, self.http_proxy, self.http_proxy_port, self.http_proxy_details = self.gen_proxy_entry_widget(
778 "http", self, True)
779 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
780
781 proxy_widget, self.https_proxy, self.https_proxy_port, self.https_proxy_details = self.gen_proxy_entry_widget(
782 "https", self, True)
783 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
784
785 proxy_widget, self.ftp_proxy, self.ftp_proxy_port, self.ftp_proxy_details = self.gen_proxy_entry_widget(
786 "ftp", self, True)
787 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
788
789 proxy_widget, self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget(
790 "git", self, True)
791 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
792
793 proxy_widget, self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget(
794 "cvs", self, True)
795 sub_vbox.pack_start(proxy_widget, expand=False, fill=False)
796
797 self.direct_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)
798 self.proxy_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)
799 self.same_checkbox.connect("toggled", self.same_checkbox_toggled_cb)
800
801 self.refresh_proxy_components()
802 return advanced_vbox
803
804 def create_others_page(self): 804 def create_others_page(self):
805 advanced_vbox = gtk.VBox(False, 6) 805 advanced_vbox = gtk.VBox(False, 6)
806 advanced_vbox.set_border_width(6) 806 advanced_vbox.set_border_width(6)
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
index 146feb03ee..1af67f24ed 100755
--- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
@@ -587,7 +587,7 @@ class ImageDetailsPage (HobPage):
587 587
588 def settings_button_clicked_cb(self, button): 588 def settings_button_clicked_cb(self, button):
589 # Create an advanced settings dialog 589 # Create an advanced settings dialog
590 response, settings_changed = self.builder.show_adv_settings_dialog() 590 response, settings_changed = self.builder.show_simple_settings_dialog()
591 if not response: 591 if not response:
592 return 592 return
593 if settings_changed: 593 if settings_changed: