diff --git a/app/ui/import_dialog.glade b/app/ui/import_dialog.glade deleted file mode 100644 index ca770aa1..00000000 --- a/app/ui/import_dialog.glade +++ /dev/null @@ -1,391 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - True - False - edit-undo - - - True - False - - - gtk-select-all - True - False - True - True - - - - - - Remove selection - True - False - remove_selection_image - False - - - - - - - - - - - - - - False - True - center-on-parent - 480 - 320 - True - dialog - center - - - - True - False - Import - Bouquets and services - 2 - True - - - True - True - True - Import - - - - True - False - gtk-revert-to-saved - - - - - - - True - True - False - Details - False - - - - True - False - gtk-dialog-info - - - - - - end - 1 - - - - - - - 480 - True - False - 1 - 1 - 1 - vertical - - - True - True - True - - - True - False - vertical - - - True - False - 2 - 2 - Bouquets - - - False - True - 1 - - - - - 200 - True - True - in - - - True - True - main_list_store - False - 0 - - - - - - - multiple - - - - - Name - True - 0.5 - - - 0.019999999552965164 - - - 0 - - - - - - - Type - 0.5 - - - 0.50999999046325684 - - - 1 - - - - - - - Selected - 0.5 - - - 0.50999999046325684 - - - - 2 - - - - - - - - - True - True - 2 - - - - - True - True - - - - - False - vertical - - - True - False - 2 - 2 - Bouquet details - - - False - True - 1 - - - - - 150 - True - True - in - - - True - True - services_list_store - False - 0 - - - - - - Service - True - 0.5 - - - 0.019999999552965164 - - - 0 - - - - - - - Type - 0.5 - - - 0.50999999046325684 - - - 1 - - - - - - - - - True - True - 2 - - - - - True - True - - - - - True - True - 0 - - - - - False - True - - - - False - 6 - end - - - False - False - 0 - - - - - False - 16 - - - True - False - message - True - - - False - True - 0 - - - - - False - False - 0 - - - - - False - True - 1 - - - - - - diff --git a/app/ui/imports.glade b/app/ui/imports.glade new file mode 100644 index 00000000..d4786f72 --- /dev/null +++ b/app/ui/imports.glade @@ -0,0 +1,441 @@ + + + + + + + + + + + + True + False + emblem-important-symbolic + + + True + False + document-revert-symbolic-rtl + 1 + + + + + + + + + + + + + True + False + edit-undo + + + True + False + + + gtk-select-all + True + False + True + True + + + + + + Remove selection + True + False + remove_selection_image + False + + + + + + + + + + + + + + False + Import + True + center-on-parent + 480 + 320 + True + dialog + + + + + + + 480 + True + False + vertical + 5 + + + True + False + + + True + False + center + 15 + 15 + 10 + 10 + start + + + Import + True + True + True + Bouquets and services + center + import_image + True + + + + True + True + 0 + + + + + Details + True + True + False + Details + center + details_image + True + False + + + + True + True + 1 + True + + + + + True + True + 0 + + + + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + True + + + True + False + 0.49000000953674316 + in + + + True + False + 5 + 5 + 5 + vertical + + + 200 + True + True + in + + + True + True + main_list_store + False + 0 + + + + + + + multiple + + + + + Name + True + 0.5 + + + 0.019999999552965164 + + + 0 + + + + + + + Type + 0.5 + + + 0.50999999046325684 + + + 1 + + + + + + + Selected + 0.5 + + + 0.50999999046325684 + + + + 2 + + + + + + + + + True + True + 0 + + + + + + + True + False + 5 + 5 + Bouquets + + + + + True + True + + + + + False + 0.49000000953674316 + in + + + True + False + 5 + 5 + 5 + vertical + + + 150 + True + True + in + + + True + True + services_list_store + False + 0 + + + + + + Service + True + 0.5 + + + 0.02 + end + + + 0 + + + + + + + Type + 0.5 + + + 0.50999999046325684 + + + 1 + + + + + + + + + True + True + 0 + + + + + + + True + False + 5 + 5 + Bouquet details + + + + + True + True + + + + + True + True + 1 + + + + + False + True + + + + False + 6 + end + + + False + False + 0 + + + + + False + 16 + + + True + False + message + True + + + False + True + 0 + + + + + False + False + 0 + + + + + False + True + 2 + + + + + + diff --git a/app/ui/imports.py b/app/ui/imports.py index d683200c..9ecec0f1 100644 --- a/app/ui/imports.py +++ b/app/ui/imports.py @@ -71,7 +71,6 @@ class ImportDialog: def __init__(self, transient, path, settings, service_ids, appender, bouquets=None): handlers = {"on_import": self.on_import, "on_cursor_changed": self.on_cursor_changed, - "on_info_button_toggled": self.on_info_button_toggled, "on_selected_toggled": self.on_selected_toggled, "on_info_bar_close": self.on_info_bar_close, "on_select_all": self.on_select_all, @@ -80,7 +79,7 @@ class ImportDialog: "on_resize": self.on_resize, "on_key_press": self.on_key_press} - builder = get_builder(UI_RESOURCES_PATH + "import_dialog.glade", handlers) + builder = get_builder(UI_RESOURCES_PATH + "imports.glade", handlers) self._bq_services = {} self._services = {} @@ -96,8 +95,8 @@ class ImportDialog: self._main_view = builder.get_object("main_view") self._services_view = builder.get_object("services_view") self._services_model = builder.get_object("services_list_store") - self._services_box = builder.get_object("services_box") self._info_check_button = builder.get_object("info_check_button") + self._info_check_button.bind_property("active", builder.get_object("services_box_frame"), "visible") self._info_bar = builder.get_object("info_bar") self._message_label = builder.get_object("message_label") window_size = self._settings.get("import_dialog_window_size") @@ -196,10 +195,6 @@ class ImportDialog: else: self._services_model.append((bq_srv.name, bq_srv.type.value)) - def on_info_button_toggled(self, button): - active = button.get_active() - self._services_box.set_visible(active) - def on_selected_toggled(self, toggle, path): self._main_model.set_value(self._main_model.get_iter(path), 2, not toggle.get_active())