summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py30
1 files changed, 14 insertions, 16 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index cd86606170..db54d79b2a 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -84,21 +84,20 @@ class ImageConfigurationPage (HobPage):
84 for child in children: 84 for child in children:
85 self.remove(child) 85 self.remove(child)
86 86
87 def _pack_components(self): 87 def _pack_components(self, pack_config_build_button = False):
88 self._remove_all_widget() 88 self._remove_all_widget()
89 self.pack_start(self.config_top_button, expand=False, fill=False) 89 self.pack_start(self.config_top_button, expand=False, fill=False)
90 self.pack_start(self.group_align, expand=True, fill=True) 90 self.pack_start(self.group_align, expand=True, fill=True)
91 91
92 self.box_group_area.pack_start(self.gtable, expand=True, fill=True) 92 self.box_group_area.pack_start(self.gtable, expand=True, fill=True)
93 self.box_group_area.pack_end(self.config_build_button, expand=False, fill=False) 93 if pack_config_build_button == True:
94 self.box_group_area.pack_end(self.config_build_button, expand=False, fill=False)
94 95
95 def show_machine(self): 96 def show_machine(self):
96 self._pack_components()
97 self.set_config_machine_layout()
98 self.show_all()
99 self.progress_bar.reset() 97 self.progress_bar.reset()
100 self.progress_bar.hide() 98 self._pack_components(pack_config_build_button = False)
101 self.config_build_button.hide_all() 99 self.set_config_machine_layout(show_progress_bar = False)
100 self.show_all()
102 101
103 def update_progress_bar(self, title, fraction, status=True): 102 def update_progress_bar(self, title, fraction, status=True):
104 self.progress_bar.update(fraction) 103 self.progress_bar.update(fraction)
@@ -106,18 +105,16 @@ class ImageConfigurationPage (HobPage):
106 self.progress_bar.set_rcstyle(status) 105 self.progress_bar.set_rcstyle(status)
107 106
108 def show_info_populating(self): 107 def show_info_populating(self):
109 self._pack_components() 108 self._pack_components(pack_config_build_button = False)
110 self.set_config_machine_layout() 109 self.set_config_machine_layout(show_progress_bar = True)
111 self.show_all() 110 self.show_all()
112 self.config_build_button.hide_all()
113 111
114 def show_info_populated(self): 112 def show_info_populated(self):
115 self._pack_components() 113 self.progress_bar.reset()
116 self.set_config_machine_layout() 114 self._pack_components(pack_config_build_button = True)
115 self.set_config_machine_layout(show_progress_bar = False)
117 self.set_config_baseimg_layout() 116 self.set_config_baseimg_layout()
118 self.show_all() 117 self.show_all()
119 self.progress_bar.reset()
120 self.progress_bar.hide()
121 118
122 def create_config_machine(self): 119 def create_config_machine(self):
123 self.machine_title = gtk.Label() 120 self.machine_title = gtk.Label()
@@ -154,13 +151,14 @@ class ImageConfigurationPage (HobPage):
154 self.progress_bar = HobProgressBar() 151 self.progress_bar = HobProgressBar()
155 self.machine_separator = gtk.HSeparator() 152 self.machine_separator = gtk.HSeparator()
156 153
157 def set_config_machine_layout(self): 154 def set_config_machine_layout(self, show_progress_bar = False):
158 self.gtable.attach(self.machine_title, 0, 40, 0, 4) 155 self.gtable.attach(self.machine_title, 0, 40, 0, 4)
159 self.gtable.attach(self.machine_title_desc, 0, 40, 4, 6) 156 self.gtable.attach(self.machine_title_desc, 0, 40, 4, 6)
160 self.gtable.attach(self.machine_combo, 0, 12, 6, 9) 157 self.gtable.attach(self.machine_combo, 0, 12, 6, 9)
161 self.gtable.attach(self.layer_button, 12, 36, 6, 10) 158 self.gtable.attach(self.layer_button, 12, 36, 6, 10)
162 self.gtable.attach(self.layer_info_icon, 36, 40, 6, 9) 159 self.gtable.attach(self.layer_info_icon, 36, 40, 6, 9)
163 self.gtable.attach(self.progress_bar, 0, 40, 13, 17) 160 if show_progress_bar == True:
161 self.gtable.attach(self.progress_bar, 0, 40, 13, 17)
164 self.gtable.attach(self.machine_separator, 0, 40, 12, 13) 162 self.gtable.attach(self.machine_separator, 0, 40, 12, 13)
165 163
166 def create_config_baseimg(self): 164 def create_config_baseimg(self):