Please merge this patch, it's blocking other people who need to work on any settings-related issue.<div><br></div><div>Thanks,</div><div>BogdanM<br><br><div class="gmail_quote">On Wed, Sep 19, 2012 at 1:49 PM, Bogdan Marinescu <span dir="ltr"><<a href="mailto:bogdan.a.marinescu@intel.com" target="_blank">bogdan.a.marinescu@intel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Fix some issues with the settings dialog that were introduced as<br>
a result of merging the fix for #2162.<br>
The second version of the patch removes a stray "distro" combobox<br>
from simple settings.<br>
<br>
[YOCTO #3117]<br>
<br>
Signed-off-by: Bogdan Marinescu <<a href="mailto:bogdan.a.marinescu@intel.com">bogdan.a.marinescu@intel.com</a>><br>
---<br>
bitbake/lib/bb/ui/crumbs/hig.py | 228 ++++++++++++--------------<br>
bitbake/lib/bb/ui/crumbs/imagedetailspage.py | 2 +-<br>
2 files changed, 110 insertions(+), 120 deletions(-)<br>
<br>
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py<br>
index ff0ad17..f304a68 100644<br>
--- a/bitbake/lib/bb/ui/crumbs/hig.py<br>
+++ b/bitbake/lib/bb/ui/crumbs/hig.py<br>
@@ -195,7 +195,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):<br>
self.max_threads = max_threads<br>
<br>
# class members for internal use<br>
- self.distro_combo = None<br>
self.dldir_text = None<br>
self.sstatedir_text = None<br>
self.sstatemirror_text = None<br>
@@ -330,7 +329,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):<br>
self.refresh_proxy_components()<br>
<br>
def response_cb(self, dialog, response_id):<br>
- #self.configuration.curr_distro = self.distro_combo.get_active_text()<br>
self.configuration.dldir = self.dldir_text.get_text()<br>
self.configuration.sstatedir = self.sstatedir_text.get_text()<br>
self.configuration.sstatemirror = self.sstatemirror_text.get_text()<br>
@@ -352,6 +350,115 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):<br>
md5 = self.config_md5()<br>
self.settings_changed = (self.md5 != md5)<br>
<br>
+ def create_build_environment_page(self):<br>
+ advanced_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.set_border_width(6)<br>
+<br>
+ sub_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
+ label = self.gen_label_widget("<span weight=\"bold\">BB number threads:</span>")<br>
+ tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the <a href=\""<br>
+ tooltip += "<a href="http://www.yoctoproject.org/docs/current/poky-ref-manual/" target="_blank">http://www.yoctoproject.org/docs/current/poky-ref-manual/</a>"<br>
+ tooltip += "poky-ref-manual.html#var-BB_NUMBER_THREADS\">Poky reference manual</a> for information"<br>
+ bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip)<br>
+ sub_vbox.pack_start(label, expand=False, fill=False)<br>
+ sub_vbox.pack_start(bbthread_widget, expand=False, fill=False)<br>
+<br>
+ sub_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
+ label = self.gen_label_widget("<span weight=\"bold\">Parallel make:</span>")<br>
+ tooltip = "Sets the maximum number of threads the host can use during the build. See the <a href=\""<br>
+ tooltip += "<a href="http://www.yoctoproject.org/docs/current/poky-ref-manual/" target="_blank">http://www.yoctoproject.org/docs/current/poky-ref-manual/</a>"<br>
+ tooltip += "poky-ref-manual.html#var-PARALLEL_MAKE\">Poky reference manual</a> for information"<br>
+ pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip)<br>
+ sub_vbox.pack_start(label, expand=False, fill=False)<br>
+ sub_vbox.pack_start(pmake_widget, expand=False, fill=False)<br>
+<br>
+ sub_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
+ label = self.gen_label_widget("<span weight=\"bold\">Select download directory:</span>")<br>
+ tooltip = "Select a folder that caches the upstream project source code"<br>
+ dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip)<br>
+ sub_vbox.pack_start(label, expand=False, fill=False)<br>
+ sub_vbox.pack_start(dldir_widget, expand=False, fill=False)<br>
+<br>
+ sub_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
+ label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE directory:</span>")<br>
+ tooltip = "Select a folder that caches your prebuilt results"<br>
+ sstatedir_widget, self.sstatedir_text = self.gen_entry_widget(self.configuration.sstatedir, self, tooltip)<br>
+ sub_vbox.pack_start(label, expand=False, fill=False)<br>
+ sub_vbox.pack_start(sstatedir_widget, expand=False, fill=False)<br>
+<br>
+ sub_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
+ label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE mirror:</span>")<br>
+ tooltip = "Select the pre-built mirror that will speed your build"<br>
+ sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip)<br>
+ sub_vbox.pack_start(label, expand=False, fill=False)<br>
+ sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False)<br>
+<br>
+ return advanced_vbox<br>
+<br>
+ def create_proxy_page(self):<br>
+ advanced_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.set_border_width(6)<br>
+<br>
+ sub_vbox = gtk.VBox(False, 6)<br>
+ advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
+ label = self.gen_label_widget("<span weight=\"bold\">Set the proxies used when fetching source code</span>")<br>
+ tooltip = "Set the proxies used when fetching source code. A blank field uses a direct internet connection."<br>
+ info = HobInfoButton(tooltip, self)<br>
+ hbox = gtk.HBox(False, 12)<br>
+ hbox.pack_start(label, expand=True, fill=True)<br>
+ hbox.pack_start(info, expand=False, fill=False)<br>
+ sub_vbox.pack_start(hbox, expand=False, fill=False)<br>
+<br>
+ self.direct_checkbox = gtk.RadioButton(None, "Direct internet connection")<br>
+ self.direct_checkbox.set_tooltip_text("Check this box to use a direct internet connection with no proxy")<br>
+ self.direct_checkbox.set_active(not self.configuration.enable_proxy)<br>
+ sub_vbox.pack_start(self.direct_checkbox, expand=False, fill=False)<br>
+<br>
+ self.proxy_checkbox = gtk.RadioButton(self.direct_checkbox, "Manual proxy configuration")<br>
+ self.proxy_checkbox.set_tooltip_text("Check this box to manually set up a specific proxy")<br>
+ self.proxy_checkbox.set_active(self.configuration.enable_proxy)<br>
+ sub_vbox.pack_start(self.proxy_checkbox, expand=False, fill=False)<br>
+<br>
+ self.same_checkbox = gtk.CheckButton("Use the same proxy for all protocols")<br>
+ self.same_checkbox.set_tooltip_text("Check this box to use the HTTP proxy for all five proxies")<br>
+ self.same_checkbox.set_active(self.configuration.same_proxy)<br>
+ hbox = gtk.HBox(False, 12)<br>
+ hbox.pack_start(self.same_checkbox, expand=False, fill=False, padding=24)<br>
+ sub_vbox.pack_start(hbox, expand=False, fill=False)<br>
+<br>
+ proxy_widget, self.http_proxy, self.http_proxy_port, self.http_proxy_details = self.gen_proxy_entry_widget(<br>
+ "http", self, True)<br>
+ sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
+<br>
+ proxy_widget, self.https_proxy, self.https_proxy_port, self.https_proxy_details = self.gen_proxy_entry_widget(<br>
+ "https", self, True)<br>
+ sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
+<br>
+ proxy_widget, self.ftp_proxy, self.ftp_proxy_port, self.ftp_proxy_details = self.gen_proxy_entry_widget(<br>
+ "ftp", self, True)<br>
+ sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
+<br>
+ proxy_widget, self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget(<br>
+ "git", self, True)<br>
+ sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
+<br>
+ proxy_widget, self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget(<br>
+ "cvs", self, True)<br>
+ sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
+<br>
+ self.direct_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)<br>
+ self.proxy_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)<br>
+ self.same_checkbox.connect("toggled", self.same_checkbox_toggled_cb)<br>
+<br>
+ self.refresh_proxy_components()<br>
+ return advanced_vbox<br>
+<br>
+<br>
def create_visual_elements(self):<br>
self.nb = gtk.Notebook()<br>
self.nb.set_show_tabs(True)<br>
@@ -364,7 +471,6 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):<br>
self.show_all()<br>
<br>
<br>
-<br>
#<br>
# AdvancedSettings Dialog<br>
#<br>
@@ -685,122 +791,6 @@ class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper):<br>
<br>
return advanced_vbox<br>
<br>
- def create_build_environment_page(self):<br>
- advanced_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.set_border_width(6)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">Select distro:</span>")<br>
- tooltip = "Selects the Yocto Project distribution you want"<br>
- distro_widget, self.distro_combo = self.gen_combo_widget(self.configuration.curr_distro, self.all_distros, tooltip)<br>
- sub_vbox.pack_start(label, expand=False, fill=False)<br>
- sub_vbox.pack_start(distro_widget, expand=False, fill=False)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">BB number threads:</span>")<br>
- tooltip = "Sets the number of threads that BitBake tasks can simultaneously run. See the <a href=\""<br>
- tooltip += "<a href="http://www.yoctoproject.org/docs/current/poky-ref-manual/" target="_blank">http://www.yoctoproject.org/docs/current/poky-ref-manual/</a>"<br>
- tooltip += "poky-ref-manual.html#var-BB_NUMBER_THREADS\">Poky reference manual</a> for information"<br>
- bbthread_widget, self.bb_spinner = self.gen_spinner_widget(self.configuration.bbthread, 1, self.max_threads, tooltip)<br>
- sub_vbox.pack_start(label, expand=False, fill=False)<br>
- sub_vbox.pack_start(bbthread_widget, expand=False, fill=False)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">Parallel make:</span>")<br>
- tooltip = "Sets the maximum number of threads the host can use during the build. See the <a href=\""<br>
- tooltip += "<a href="http://www.yoctoproject.org/docs/current/poky-ref-manual/" target="_blank">http://www.yoctoproject.org/docs/current/poky-ref-manual/</a>"<br>
- tooltip += "poky-ref-manual.html#var-PARALLEL_MAKE\">Poky reference manual</a> for information"<br>
- pmake_widget, self.pmake_spinner = self.gen_spinner_widget(self.configuration.pmake, 1, self.max_threads, tooltip)<br>
- sub_vbox.pack_start(label, expand=False, fill=False)<br>
- sub_vbox.pack_start(pmake_widget, expand=False, fill=False)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">Select download directory:</span>")<br>
- tooltip = "Select a folder that caches the upstream project source code"<br>
- dldir_widget, self.dldir_text = self.gen_entry_widget(self.configuration.dldir, self, tooltip)<br>
- sub_vbox.pack_start(label, expand=False, fill=False)<br>
- sub_vbox.pack_start(dldir_widget, expand=False, fill=False)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE directory:</span>")<br>
- tooltip = "Select a folder that caches your prebuilt results"<br>
- sstatedir_widget, self.sstatedir_text = self.gen_entry_widget(self.configuration.sstatedir, self, tooltip)<br>
- sub_vbox.pack_start(label, expand=False, fill=False)<br>
- sub_vbox.pack_start(sstatedir_widget, expand=False, fill=False)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">Select SSTATE mirror:</span>")<br>
- tooltip = "Select the pre-built mirror that will speed your build"<br>
- sstatemirror_widget, self.sstatemirror_text = self.gen_entry_widget(self.configuration.sstatemirror, self, tooltip)<br>
- sub_vbox.pack_start(label, expand=False, fill=False)<br>
- sub_vbox.pack_start(sstatemirror_widget, expand=False, fill=False)<br>
-<br>
- return advanced_vbox<br>
-<br>
- def create_proxy_page(self):<br>
- advanced_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.set_border_width(6)<br>
-<br>
- sub_vbox = gtk.VBox(False, 6)<br>
- advanced_vbox.pack_start(sub_vbox, expand=False, fill=False)<br>
- label = self.gen_label_widget("<span weight=\"bold\">Set the proxies used when fetching source code</span>")<br>
- tooltip = "Set the proxies used when fetching source code. A blank field uses a direct internet connection."<br>
- info = HobInfoButton(tooltip, self)<br>
- hbox = gtk.HBox(False, 12)<br>
- hbox.pack_start(label, expand=True, fill=True)<br>
- hbox.pack_start(info, expand=False, fill=False)<br>
- sub_vbox.pack_start(hbox, expand=False, fill=False)<br>
-<br>
- self.direct_checkbox = gtk.RadioButton(None, "Direct internet connection")<br>
- self.direct_checkbox.set_tooltip_text("Check this box to use a direct internet connection with no proxy")<br>
- self.direct_checkbox.set_active(not self.configuration.enable_proxy)<br>
- sub_vbox.pack_start(self.direct_checkbox, expand=False, fill=False)<br>
-<br>
- self.proxy_checkbox = gtk.RadioButton(self.direct_checkbox, "Manual proxy configuration")<br>
- self.proxy_checkbox.set_tooltip_text("Check this box to manually set up a specific proxy")<br>
- self.proxy_checkbox.set_active(self.configuration.enable_proxy)<br>
- sub_vbox.pack_start(self.proxy_checkbox, expand=False, fill=False)<br>
-<br>
- self.same_checkbox = gtk.CheckButton("Use the same proxy for all protocols")<br>
- self.same_checkbox.set_tooltip_text("Check this box to use the HTTP proxy for all five proxies")<br>
- self.same_checkbox.set_active(self.configuration.same_proxy)<br>
- hbox = gtk.HBox(False, 12)<br>
- hbox.pack_start(self.same_checkbox, expand=False, fill=False, padding=24)<br>
- sub_vbox.pack_start(hbox, expand=False, fill=False)<br>
-<br>
- proxy_widget, self.http_proxy, self.http_proxy_port, self.http_proxy_details = self.gen_proxy_entry_widget(<br>
- "http", self, True)<br>
- sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
-<br>
- proxy_widget, self.https_proxy, self.https_proxy_port, self.https_proxy_details = self.gen_proxy_entry_widget(<br>
- "https", self, True)<br>
- sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
-<br>
- proxy_widget, self.ftp_proxy, self.ftp_proxy_port, self.ftp_proxy_details = self.gen_proxy_entry_widget(<br>
- "ftp", self, True)<br>
- sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
-<br>
- proxy_widget, self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget(<br>
- "git", self, True)<br>
- sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
-<br>
- proxy_widget, self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget(<br>
- "cvs", self, True)<br>
- sub_vbox.pack_start(proxy_widget, expand=False, fill=False)<br>
-<br>
- self.direct_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)<br>
- self.proxy_checkbox.connect("toggled", self.proxy_checkbox_toggled_cb)<br>
- self.same_checkbox.connect("toggled", self.same_checkbox_toggled_cb)<br>
-<br>
- self.refresh_proxy_components()<br>
- return advanced_vbox<br>
-<br>
def create_others_page(self):<br>
advanced_vbox = gtk.VBox(False, 6)<br>
advanced_vbox.set_border_width(6)<br>
diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py<br>
index ed8c7ac..5a6cb21 100755<br>
--- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py<br>
+++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py<br>
@@ -587,7 +587,7 @@ class ImageDetailsPage (HobPage):<br>
<br>
def settings_button_clicked_cb(self, button):<br>
# Create an advanced settings dialog<br>
- response, settings_changed = self.builder.show_adv_settings_dialog()<br>
+ response, settings_changed = self.builder.show_simple_settings_dialog()<br>
if not response:<br>
return<br>
if settings_changed:<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.5<br>
<br>
</font></span></blockquote></div><br></div>