diff options
| author |   Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2012-09-28 18:06:06 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-28 16:41:48 +0100 |
| commit | 5b84d88f2a47063197f9a20f8ebf0a7ccf22c2eb (patch) | |
| tree | f2cb9e3d03f220c083732b461a14c7d4e4a60093 | |
| parent | be8bf02f2b347edf5514cafc6cb6a44f71118736 (diff) | |
| download | bitbake-5b84d88f2a47063197f9a20f8ebf0a7ccf22c2eb.tar.gz | |
Fix bad merge of #2162
This patch fixes the bad merge of #2162 fixes on master.
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/ui/crumbs/hig.py | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/lib/bb/ui/crumbs/hig.py b/lib/bb/ui/crumbs/hig.py index 3c8c1c9e8..2ef8e36bf 100644 --- a/lib/bb/ui/crumbs/hig.py +++ b/lib/bb/ui/crumbs/hig.py @@ -300,7 +300,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, @@ -645,27 +647,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], @@ -835,6 +819,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) |