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): md5 = self.config_md5() self.settings_changed = (self.md5 != md5) + def create_build_environment_page(self): + advanced_vbox = gtk.VBox(False, 6) + advanced_vbox.set_border_width(6) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("Select distro:") + tooltip = "Selects the Yocto Project distribution you want" + distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip) + sub_vbox.pack_start(label, expand=False, fill=False) + sub_vbox.pack_start(distro_widget, expand=False, fill=False) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("BB number threads:") + tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the Poky reference manual for information" + bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip) + sub_vbox.pack_start(label, expand=False, fill=False) + sub_vbox.pack_start(bbthread_widget, expand=False, fill=False) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("Parallel make:") + tooltip = "Sets the maximum number of threads the host can use during the build. See the Poky reference manual for information" + pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip) + sub_vbox.pack_start(label, expand=False, fill=False) + sub_vbox.pack_start(pmake_widget, expand=False, fill=False) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("Select download directory:") + tooltip = "Select a folder that caches the upstream project source code" + dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip) + sub_vbox.pack_start(label, expand=False, fill=False) + sub_vbox.pack_start(dldir_widget, expand=False, fill=False) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("Select SSTATE directory:") + tooltip = "Select a folder that caches your prebuilt results" + sstatedir_widget, self.sstatedir_text = self.gen_entry_widget(self.configuration.sstatedir, self, tooltip) + sub_vbox.pack_start(label, expand=False, fill=False) + sub_vbox.pack_start(sstatedir_widget, expand=False, fill=False) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("Select SSTATE mirror:") + tooltip = "Select the pre-built mirror that will speed your build" + sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip) + sub_vbox.pack_start(label, expand=False, fill=False) + sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False) + + return advanced_vbox + + def create_proxy_page(self): + advanced_vbox = gtk.VBox(False, 6) + advanced_vbox.set_border_width(6) + + sub_vbox = gtk.VBox(False, 6) + advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) + label = self.gen_label_widget("Set the proxies used when fetching source code") + tooltip = "Set the proxies used when fetching source code. A blank field uses a direct internet connection." + info = HobInfoButton(tooltip, self) + hbox = gtk.HBox(False, 12) + hbox.pack_start(label, expand=True, fill=True) + hbox.pack_start(info, expand=False, fill=False) + sub_vbox.pack_start(hbox, expand=False, fill=False) + + self.direct_checkbox = gtk.RadioButton(None, "Direct internet connection") + self.direct_checkbox.set_tooltip_text("Check this box to use a direct internet connection with no proxy") + self.direct_checkbox.set_active(not self.configuration.enable_proxy) + sub_vbox.pack_start(self.direct_checkbox, expand=False, fill=False) + + self.proxy_checkbox = gtk.RadioButton(self.direct_checkbox, "Manual proxy configuration") + self.proxy_checkbox.set_tooltip_text("Check this box to manually set up a specific proxy") + self.proxy_checkbox.set_active(self.configuration.enable_proxy) + sub_vbox.pack_start(self.proxy_checkbox, expand=False, fill=False) + + self.same_checkbox = gtk.CheckButton("Use the same proxy for all protocols") + self.same_checkbox.set_tooltip_text("Check this box to use the HTTP proxy for all five proxies") + self.same_checkbox.set_active(self.configuration.same_proxy) + hbox = gtk.HBox(False, 12) + hbox.pack_start(self.same_checkbox, expand=False, fill=False, padding=24) + sub_vbox.pack_start(hbox, expand=False, fill=False) + + proxy_widget, self.http_proxy, self.http_proxy_port, self.http_proxy_details = self.gen_proxy_entry_widget( + "http", self, True) + sub_vbox.pack_start(proxy_widget, expand=False, fill=False) + + proxy_widget, self.https_proxy, self.https_proxy_port, self.https_proxy_details = self.gen_proxy_entry_widget( + "https", self, True) + sub_vbox.pack_start(proxy_widget, expand=False, fill=False) + + proxy_widget, self.ftp_proxy, self.ftp_proxy_port, self.ftp_proxy_details = self.gen_proxy_entry_widget( + "ftp", self, True) + sub_vbox.pack_start(proxy_widget, expand=False, fill=False) + + proxy_widget, self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget( + "git", self, True) + sub_vbox.pack_start(proxy_widget, expand=False, fill=False) + + proxy_widget, self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget( + "cvs", self, True) + sub_vbox.pack_start(proxy_widget, expand=False, fill=False) + + self.direct_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb) + self.proxy_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb) + self.same_checkbox.connect("toggled", self.same_checkbox_toggled_cb) + + self.refresh_proxy_components() + return advanced_vbox + + def create_visual_elements(self): self.nb = gtk.Notebook() self.nb.set_show_tabs(True) @@ -364,7 +481,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): self.show_all() - # # AdvancedSettings Dialog # @@ -685,122 +801,6 @@ class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper): return advanced_vbox - def create_build_environment_page(self): - advanced_vbox = gtk.VBox(False, 6) - advanced_vbox.set_border_width(6) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("Select distro:") - tooltip = "Selects the Yocto Project distribution you want" - distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip) - sub_vbox.pack_start(label, expand=False, fill=False) - sub_vbox.pack_start(distro_widget, expand=False, fill=False) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("BB number threads:") - tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the Poky reference manual for information" - bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip) - sub_vbox.pack_start(label, expand=False, fill=False) - sub_vbox.pack_start(bbthread_widget, expand=False, fill=False) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("Parallel make:") - tooltip = "Sets the maximum number of threads the host can use during the build. See the Poky reference manual for information" - pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip) - sub_vbox.pack_start(label, expand=False, fill=False) - sub_vbox.pack_start(pmake_widget, expand=False, fill=False) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("Select download directory:") - tooltip = "Select a folder that caches the upstream project source code" - dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip) - sub_vbox.pack_start(label, expand=False, fill=False) - sub_vbox.pack_start(dldir_widget, expand=False, fill=False) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("Select SSTATE directory:") - tooltip = "Select a folder that caches your prebuilt results" - sstatedir_widget, self.sstatedir_text = self.gen_entry_widget(self.configuration.sstatedir, self, tooltip) - sub_vbox.pack_start(label, expand=False, fill=False) - sub_vbox.pack_start(sstatedir_widget, expand=False, fill=False) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("Select SSTATE mirror:") - tooltip = "Select the pre-built mirror that will speed your build" - sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip) - sub_vbox.pack_start(label, expand=False, fill=False) - sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False) - - return advanced_vbox - - def create_proxy_page(self): - advanced_vbox = gtk.VBox(False, 6) - advanced_vbox.set_border_width(6) - - sub_vbox = gtk.VBox(False, 6) - advanced_vbox.pack_start(sub_vbox, expand=False, fill=False) - label = self.gen_label_widget("Set the proxies used when fetching source code") - tooltip = "Set the proxies used when fetching source code. A blank field uses a direct internet connection." - info = HobInfoButton(tooltip, self) - hbox = gtk.HBox(False, 12) - hbox.pack_start(label, expand=True, fill=True) - hbox.pack_start(info, expand=False, fill=False) - sub_vbox.pack_start(hbox, expand=False, fill=False) - - self.direct_checkbox = gtk.RadioButton(None, "Direct internet connection") - self.direct_checkbox.set_tooltip_text("Check this box to use a direct internet connection with no proxy") - self.direct_checkbox.set_active(not self.configuration.enable_proxy) - sub_vbox.pack_start(self.direct_checkbox, expand=False, fill=False) - - self.proxy_checkbox = gtk.RadioButton(self.direct_checkbox, "Manual proxy configuration") - self.proxy_checkbox.set_tooltip_text("Check this box to manually set up a specific proxy") - self.proxy_checkbox.set_active(self.configuration.enable_proxy) - sub_vbox.pack_start(self.proxy_checkbox, expand=False, fill=False) - - self.same_checkbox = gtk.CheckButton("Use the same proxy for all protocols") - self.same_checkbox.set_tooltip_text("Check this box to use the HTTP proxy for all five proxies") - self.same_checkbox.set_active(self.configuration.same_proxy) - hbox = gtk.HBox(False, 12) - hbox.pack_start(self.same_checkbox, expand=False, fill=False, padding=24) - sub_vbox.pack_start(hbox, expand=False, fill=False) - - proxy_widget, self.http_proxy, self.http_proxy_port, self.http_proxy_details = self.gen_proxy_entry_widget( - "http", self, True) - sub_vbox.pack_start(proxy_widget, expand=False, fill=False) - - proxy_widget, self.https_proxy, self.https_proxy_port, self.https_proxy_details = self.gen_proxy_entry_widget( - "https", self, True) - sub_vbox.pack_start(proxy_widget, expand=False, fill=False) - - proxy_widget, self.ftp_proxy, self.ftp_proxy_port, self.ftp_proxy_details = self.gen_proxy_entry_widget( - "ftp", self, True) - sub_vbox.pack_start(proxy_widget, expand=False, fill=False) - - proxy_widget, self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget( - "git", self, True) - sub_vbox.pack_start(proxy_widget, expand=False, fill=False) - - proxy_widget, self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget( - "cvs", self, True) - sub_vbox.pack_start(proxy_widget, expand=False, fill=False) - - self.direct_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb) - self.proxy_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb) - self.same_checkbox.connect("toggled", self.same_checkbox_toggled_cb) - - self.refresh_proxy_components() - return advanced_vbox - def create_others_page(self): advanced_vbox = gtk.VBox(False, 6) 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): def settings_button_clicked_cb(self, button): # Create an advanced settings dialog - response, settings_changed = self.builder.show_adv_settings_dialog() + response, settings_changed = self.builder.show_simple_settings_dialog() if not response: return if settings_changed: