summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2012-09-28 18:06:06 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 16:42:09 +0100
commit71107aa1add5fd3c8e996ff91e9c4919ca81a949 (patch)
tree1c4ba25377240d6f4f54b207e58aaf406d709ed4 /bitbake/lib/bb
parent183ffd2048a1ff864a2c32412c4f8b409ee4c3e9 (diff)
downloadpoky-71107aa1add5fd3c8e996ff91e9c4919ca81a949.tar.gz
bitbake: Fix bad merge of #2162
This patch fixes the bad merge of #2162 fixes on master. (Bitbake rev: 5b84d88f2a47063197f9a20f8ebf0a7ccf22c2eb) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py23
1 files changed, 4 insertions, 19 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index 3c8c1c9e8a..2ef8e36bf9 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -300,7 +300,9 @@ class CrumbsMessageDialog(CrumbsDialog):
300class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): 300class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
301 301
302 (BUILD_ENV_PAGE_ID, 302 (BUILD_ENV_PAGE_ID,
303 PROXIES_PAGE_ID) = range(2) 303 SHARED_STATE_PAGE_ID,
304 PROXIES_PAGE_ID,
305 OTHERS_PAGE_ID) = range(4)
304 306
305 def __init__(self, title, configuration, all_image_types, 307 def __init__(self, title, configuration, all_image_types,
306 all_package_formats, all_distros, all_sdk_machines, 308 all_package_formats, all_distros, all_sdk_machines,
@@ -645,27 +647,9 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
645 self.refresh_proxy_components() 647 self.refresh_proxy_components()
646 return advanced_vbox 648 return advanced_vbox
647 649
648
649 def create_visual_elements(self):
650 self.nb = gtk.Notebook()
651 self.nb.set_show_tabs(True)
652 self.nb.append_page(self.create_build_environment_page(), gtk.Label("Build environment"))
653 self.nb.append_page(self.create_shared_state_page(), gtk.Label("Shared state"))
654 self.nb.append_page(self.create_proxy_page(), gtk.Label("Proxies"))
655 self.nb.set_current_page(0)
656 self.vbox.pack_start(self.nb, expand=True, fill=True)
657 self.vbox.pack_end(gtk.HSeparator(), expand=True, fill=True)
658
659 self.show_all()
660
661 def switch_to_page(self, page_id): 650 def switch_to_page(self, page_id):
662 self.nb.set_current_page(page_id) 651 self.nb.set_current_page(page_id)
663 652
664#
665# AdvancedSettings Dialog
666#
667class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper):
668
669 def details_cb(self, button, parent, protocol): 653 def details_cb(self, button, parent, protocol):
670 dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details", 654 dialog = ProxyDetailsDialog(title = protocol.upper() + " Proxy Details",
671 user = self.configuration.proxies[protocol][1], 655 user = self.configuration.proxies[protocol][1],
@@ -835,6 +819,7 @@ class AdvancedSettingDialog (CrumbsDialog, SettingsUIHelper):
835 self.nb = gtk.Notebook() 819 self.nb = gtk.Notebook()
836 self.nb.set_show_tabs(True) 820 self.nb.set_show_tabs(True)
837 self.nb.append_page(self.create_build_environment_page(), gtk.Label("Build environment")) 821 self.nb.append_page(self.create_build_environment_page(), gtk.Label("Build environment"))
822 self.nb.append_page(self.create_shared_state_page(), gtk.Label("Shared state"))
838 self.nb.append_page(self.create_proxy_page(), gtk.Label("Proxies")) 823 self.nb.append_page(self.create_proxy_page(), gtk.Label("Proxies"))
839 self.nb.append_page(self.create_others_page(), gtk.Label("Others")) 824 self.nb.append_page(self.create_others_page(), gtk.Label("Others"))
840 self.nb.set_current_page(0) 825 self.nb.set_current_page(0)