[PATCH] [hob] Fix bad merge of #2162

[PATCH] [hob] Fix bad merge of #2162

[Bogdan Marinescu]

This patch fixes the bad merge of #2162 fixes on master.

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 bitbake/lib/bb/ui/crumbs/hig.py |   23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index bdb3702..791fc01 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -271,7 +271,9 @@ class CrumbsMessageDialog(CrumbsDialog):
 class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
 
     (BUILD_ENV_PAGE_ID,
-     PROXIES_PAGE_ID) = range(2)
+     SHARED_STATE_PAGE_ID,
+     PROXIES_PAGE_ID,
+     OTHERS_PAGE_ID) = range(4)
 
     def __init__(self, title, configuration, all_image_types,
             all_package_formats, all_distros, all_sdk_machines,
@@ -616,27 +618,9 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
         self.refresh_proxy_components()
         return advanced_vbox
 
-
-    def create_visual_elements(self):
-        self.nb = gtk.Notebook()
-        self.nb.set_show_tabs(True)
-        self.nb.append_page(self.create_build_environment_page(), gtk.Label("Build environment"))
-        self.nb.append_page(self.create_shared_state_page(), gtk.Label("Shared state"))
-        self.nb.append_page(self.create_proxy_page(), gtk.Label("Proxies"))
-        self.nb.set_current_page(0)
-        self.vbox.pack_start(self.nb, expand=True, fill=True)
-        self.vbox.pack_end(gtk.HSeparator(), expand=True, fill=True)
-
-        self.show_all()
-
     def switch_to_page(self, page_id):
         self.nb.set_current_page(page_id)
 
-#
-# AdvancedSettings Dialog
-#
-class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper):
-    
     def details_cb(self, button, parent, protocol):
         dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details",
             user = self.configuration.proxies[protocol][1],
@@ -806,6 +790,7 @@ class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper):
         self.nb = gtk.Notebook()
         self.nb.set_show_tabs(True)        
         self.nb.append_page(self.create_build_environment_page(), gtk.Label("Build environment"))
+        self.nb.append_page(self.create_shared_state_page(), gtk.Label("Shared state"))
         self.nb.append_page(self.create_proxy_page(), gtk.Label("Proxies"))        
         self.nb.append_page(self.create_others_page(), gtk.Label("Others"))
         self.nb.set_current_page(0)
-- 
1.7.9.5

Re: [PATCH] [hob] Fix bad merge of #2162

[Richard Purdie]

On Fri, 2012-09-28 at 18:06 +0300, Bogdan Marinescu wrote:
> This patch fixes the bad merge of #2162 fixes on master.
> 
> Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
> ---
>  bitbake/lib/bb/ui/crumbs/hig.py |   23 ++++-------------------
>  1 file changed, 4 insertions(+), 19 deletions(-)

Merged to master, thanks.

Richard