diff options
Diffstat (limited to 'src/dialogs/export.c')
| -rw-r--r-- | src/dialogs/export.c | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/src/dialogs/export.c b/src/dialogs/export.c index 16622a9..726b16d 100644 --- a/src/dialogs/export.c +++ b/src/dialogs/export.c @@ -310,7 +310,6 @@ static void export_assistant_close(GtkAssistant *assistant, GObject *ref) static void register_format_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal #1 */ GtkWidget *hbox; /* Support principal #2 */ GtkWidget *label; /* Etiquette d'indication */ @@ -318,11 +317,9 @@ static void register_format_panel(GtkAssistant *assistant) GtkWidget *options; /* Zone d'options */ GtkWidget *content; /* Accueil desdites options */ - alignment = qck_create_padded_alignment(8, 8, 8, 8); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Format de sortie */ @@ -341,7 +338,10 @@ static void register_format_panel(GtkAssistant *assistant) /* Eventuelles options */ - options = qck_create_frame(_("<b>Options</b>"), &content, 0, 12, 12, 0); + content = gtk_event_box_new(); + gtk_widget_show(content); + + options = qck_create_frame(_("<b>Options</b>"), content, 0, 12, 12, 0); gtk_box_pack_start(GTK_BOX(vbox), options, FALSE, FALSE, 0); g_object_set_data(G_OBJECT(assistant), "options", content); @@ -350,11 +350,11 @@ static void register_format_panel(GtkAssistant *assistant) gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 1); - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Format")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_INTRO); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Format")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_INTRO); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); } @@ -610,27 +610,22 @@ static void forbid_html_empty_entry(GtkEntry *_entry, GtkAssistant *assistant) static void register_content_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal */ GtkWidget *frame; /* Support avec encadrement */ - GtkWidget *subalign; /* Disposition des options */ GtkWidget *sub_vbox; /* Division verticale */ GtkWidget *checkbutton; /* Coche pour une option */ - alignment = qck_create_padded_alignment(8, 8, 8, 8); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Eléments à afficher */ - frame = qck_create_frame(_("<b>Items to display</b>"), &subalign, 0, 12, 12, 0); - gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); - sub_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); gtk_widget_show(sub_vbox); - gtk_container_add(GTK_CONTAINER(subalign), sub_vbox); + + frame = qck_create_frame(_("<b>Items to display</b>"), sub_vbox, 0, 12, 12, 0); + gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0); checkbutton = qck_create_check_button(G_OBJECT(assistant), "physical_off", _("Physical offset"), NULL, NULL); gtk_box_pack_start(GTK_BOX(sub_vbox), checkbutton, FALSE, FALSE, 0); @@ -646,11 +641,11 @@ static void register_content_panel(GtkAssistant *assistant) /* Intégration */ - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Exported content")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_CONTENT); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Exported content")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_CONTENT); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); } @@ -675,7 +670,6 @@ static void register_content_panel(GtkAssistant *assistant) static void register_output_panel(GtkAssistant *assistant) { - GtkWidget *alignment; /* Disposition sur le support */ GtkWidget *vbox; /* Support principal #1 */ GtkWidget *label; /* Etiquette d'indication */ GtkWidget *hbox; /* Support principal #2 */ @@ -684,11 +678,9 @@ static void register_output_panel(GtkAssistant *assistant) GLoadedBinary *binary; /* Binaire chargé à parcourir */ const char *filename; /* Chemin d'accès par défaut */ - alignment = qck_create_padded_alignment(8, 8, 8, 8); - vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8); + qck_set_margins(vbox, 8, 8, 8, 8); gtk_widget_show(vbox); - gtk_container_add(GTK_CONTAINER(alignment), vbox); /* Fichier de sortie */ @@ -707,11 +699,11 @@ static void register_output_panel(GtkAssistant *assistant) /* Intégration */ - gtk_assistant_append_page(assistant, alignment); - gtk_assistant_set_page_title(assistant, alignment, _("Output")); - gtk_assistant_set_page_type(assistant, alignment, GTK_ASSISTANT_PAGE_CONFIRM); + gtk_assistant_append_page(assistant, vbox); + gtk_assistant_set_page_title(assistant, vbox, _("Output")); + gtk_assistant_set_page_type(assistant, vbox, GTK_ASSISTANT_PAGE_CONFIRM); - gtk_assistant_set_page_complete(assistant, alignment, TRUE); + gtk_assistant_set_page_complete(assistant, vbox, TRUE); /* Choix par défaut */ |