diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 68 |
1 files changed, 25 insertions, 43 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 80332feaba..6aeb6dc82f 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |||
@@ -135,8 +135,10 @@ class ImageConfigurationPage (HobPage): | |||
135 | self._pack_components(pack_config_build_button = True) | 135 | self._pack_components(pack_config_build_button = True) |
136 | self.set_config_machine_layout(show_progress_bar = False) | 136 | self.set_config_machine_layout(show_progress_bar = False) |
137 | self.set_config_baseimg_layout() | 137 | self.set_config_baseimg_layout() |
138 | self.set_rcppkg_layout() | ||
139 | self.show_all() | 138 | self.show_all() |
139 | if self.builder.recipe_model.get_selected_image() == self.builder.recipe_model.__custom_image__: | ||
140 | self.just_bake_button.hide() | ||
141 | self.or_label.hide() | ||
140 | 142 | ||
141 | def create_config_machine(self): | 143 | def create_config_machine(self): |
142 | self.machine_title = gtk.Label() | 144 | self.machine_title = gtk.Label() |
@@ -207,22 +209,6 @@ class ImageConfigurationPage (HobPage): | |||
207 | self.image_desc.set_justify(gtk.JUSTIFY_LEFT) | 209 | self.image_desc.set_justify(gtk.JUSTIFY_LEFT) |
208 | self.image_desc.set_line_wrap(True) | 210 | self.image_desc.set_line_wrap(True) |
209 | 211 | ||
210 | # button to view recipes | ||
211 | icon_file = hic.ICON_RCIPE_DISPLAY_FILE | ||
212 | hover_file = hic.ICON_RCIPE_HOVER_FILE | ||
213 | self.view_recipes_button = HobImageButton("View recipes", | ||
214 | "Add/remove recipes and tasks", | ||
215 | icon_file, hover_file) | ||
216 | self.view_recipes_button.connect("clicked", self.view_recipes_button_clicked_cb) | ||
217 | |||
218 | # button to view packages | ||
219 | icon_file = hic.ICON_PACKAGES_DISPLAY_FILE | ||
220 | hover_file = hic.ICON_PACKAGES_HOVER_FILE | ||
221 | self.view_packages_button = HobImageButton("View packages", | ||
222 | "Add/remove previously built packages", | ||
223 | icon_file, hover_file) | ||
224 | self.view_packages_button.connect("clicked", self.view_packages_button_clicked_cb) | ||
225 | |||
226 | self.image_separator = gtk.HSeparator() | 212 | self.image_separator = gtk.HSeparator() |
227 | 213 | ||
228 | def set_config_baseimg_layout(self): | 214 | def set_config_baseimg_layout(self): |
@@ -232,29 +218,27 @@ class ImageConfigurationPage (HobPage): | |||
232 | self.gtable.attach(self.image_desc, 13, 38, 23, 28) | 218 | self.gtable.attach(self.image_desc, 13, 38, 23, 28) |
233 | self.gtable.attach(self.image_separator, 0, 40, 35, 36) | 219 | self.gtable.attach(self.image_separator, 0, 40, 35, 36) |
234 | 220 | ||
235 | def set_rcppkg_layout(self): | ||
236 | self.gtable.attach(self.view_recipes_button, 0, 20, 28, 33) | ||
237 | self.gtable.attach(self.view_packages_button, 20, 40, 28, 33) | ||
238 | |||
239 | def create_config_build_button(self): | 221 | def create_config_build_button(self): |
240 | # Create the "Build packages" and "Build image" buttons at the bottom | 222 | # Create the "Build packages" and "Build image" buttons at the bottom |
241 | button_box = gtk.HBox(False, 6) | 223 | button_box = gtk.HBox(False, 6) |
242 | 224 | ||
243 | # create button "Build image" | 225 | # create button "Build image" |
244 | just_bake_button = HobButton("Build image") | 226 | self.just_bake_button = HobButton("Build image") |
245 | just_bake_button.set_size_request(205, 49) | 227 | self.just_bake_button.set_size_request(205, 49) |
246 | just_bake_button.set_tooltip_text("Build target image") | 228 | self.just_bake_button.set_tooltip_text("Build target image") |
247 | just_bake_button.connect("clicked", self.just_bake_button_clicked_cb) | 229 | self.just_bake_button.connect("clicked", self.just_bake_button_clicked_cb) |
248 | button_box.pack_end(just_bake_button, expand=False, fill=False) | 230 | button_box.pack_end(self.just_bake_button, expand=False, fill=False) |
249 | 231 | ||
250 | label = gtk.Label(" or ") | 232 | # create separator label |
251 | button_box.pack_end(label, expand=False, fill=False) | 233 | self.or_label = gtk.Label(" or ") |
252 | 234 | button_box.pack_end(self.or_label, expand=False, fill=False) | |
253 | # create button "Build Packages" | 235 | |
254 | build_packages_button = HobAltButton("Build packages") | 236 | # create button "Edit Image" |
255 | build_packages_button.connect("clicked", self.build_packages_button_clicked_cb) | 237 | self.edit_image_button = HobButton("Edit image") |
256 | build_packages_button.set_tooltip_text("Build recipes into packages") | 238 | self.edit_image_button.set_size_request(205, 49) |
257 | button_box.pack_end(build_packages_button, expand=False, fill=False) | 239 | self.edit_image_button.set_tooltip_text("Edit target image") |
240 | self.edit_image_button.connect("clicked", self.edit_image_button_clicked_cb) | ||
241 | button_box.pack_end(self.edit_image_button, expand=False, fill=False) | ||
258 | 242 | ||
259 | return button_box | 243 | return button_box |
260 | 244 | ||
@@ -347,6 +331,10 @@ class ImageConfigurationPage (HobPage): | |||
347 | 331 | ||
348 | self.show_baseimg_selected() | 332 | self.show_baseimg_selected() |
349 | 333 | ||
334 | if selected_image == self.builder.recipe_model.__custom_image__: | ||
335 | self.just_bake_button.hide() | ||
336 | self.or_label.hide() | ||
337 | |||
350 | glib.idle_add(self.image_combo_changed_idle_cb, selected_image, selected_recipes, selected_packages) | 338 | glib.idle_add(self.image_combo_changed_idle_cb, selected_image, selected_recipes, selected_packages) |
351 | 339 | ||
352 | def _image_combo_connect_signal(self): | 340 | def _image_combo_connect_signal(self): |
@@ -426,17 +414,11 @@ class ImageConfigurationPage (HobPage): | |||
426 | # Create a layer selection dialog | 414 | # Create a layer selection dialog |
427 | self.builder.show_layer_selection_dialog() | 415 | self.builder.show_layer_selection_dialog() |
428 | 416 | ||
429 | def view_recipes_button_clicked_cb(self, button): | ||
430 | self.builder.show_recipes() | ||
431 | |||
432 | def view_packages_button_clicked_cb(self, button): | ||
433 | self.builder.show_packages() | ||
434 | |||
435 | def just_bake_button_clicked_cb(self, button): | 417 | def just_bake_button_clicked_cb(self, button): |
436 | self.builder.just_bake() | 418 | self.builder.just_bake() |
437 | 419 | ||
438 | def build_packages_button_clicked_cb(self, button): | 420 | def edit_image_button_clicked_cb(self, button): |
439 | self.builder.build_packages() | 421 | self.builder.show_recipes() |
440 | 422 | ||
441 | def template_button_clicked_cb(self, button): | 423 | def template_button_clicked_cb(self, button): |
442 | response, path = self.builder.show_load_template_dialog() | 424 | response, path = self.builder.show_load_template_dialog() |