diff options
| -rw-r--r-- | src/dlg-new.c | 40 | ||||
| -rw-r--r-- | src/ui/new.ui | 5 |
2 files changed, 12 insertions, 33 deletions
diff --git a/src/dlg-new.c b/src/dlg-new.c index 4998d47..7412dfa 100644 --- a/src/dlg-new.c +++ b/src/dlg-new.c @@ -285,7 +285,7 @@ dlg_new_archive (FrWindow *window, /* Get the widgets. */ - data->dialog = GET_WIDGET ("filechooserdialog"); + data->dialog = GET_WIDGET ("dialog"); data->n_password_entry = GET_WIDGET ("n_password_entry"); data->n_password_label = GET_WIDGET ("n_password_label"); @@ -358,42 +358,18 @@ dlg_new_archive (FrWindow *window, /* Set the signals handlers. */ - /*g_signal_connect (G_OBJECT (data->dialog), - "response", - G_CALLBACK (new_file_response_cb), - data);*/ + gtk_builder_add_callback_symbols (data->builder, + "on_dialog_destroy", G_CALLBACK (destroy_cb), + "on_n_password_entry_changed", G_CALLBACK (password_entry_changed_cb), + "on_n_volume_checkbutton_toggled", G_CALLBACK (volume_toggled_cb), + NULL); + gtk_builder_connect_signals (data->builder, data); - g_signal_connect (G_OBJECT (data->dialog), - "destroy", - G_CALLBACK (destroy_cb), - data); - - /* - g_signal_connect_swapped (G_OBJECT (cancel_button), - "clicked", - G_CALLBACK (gtk_widget_destroy), - G_OBJECT (data->dialog)); - g_signal_connect (G_OBJECT (add_button), - "clicked", - G_CALLBACK (add_clicked_cb), - data);*/ - - /* FIXME g_signal_connect (G_OBJECT (data->n_archive_type_combo_box), - "changed", - G_CALLBACK (archive_type_combo_box_changed_cb), - data); */ - g_signal_connect (G_OBJECT (data->n_password_entry), - "changed", - G_CALLBACK (password_entry_changed_cb), - data); - g_signal_connect (G_OBJECT (data->n_volume_checkbutton), - "toggled", - G_CALLBACK (volume_toggled_cb), - data); g_signal_connect (G_OBJECT (data->format_chooser), "selection-changed", G_CALLBACK (format_chooser_selection_changed_cb), data); + g_signal_connect_after (GET_WIDGET ("other_oprtions_alignment"), "unmap", G_CALLBACK (options_expander_unmap_cb), diff --git a/src/ui/new.ui b/src/ui/new.ui index 8aa6eb5..391a3e2 100644 --- a/src/ui/new.ui +++ b/src/ui/new.ui @@ -77,6 +77,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <signal name="changed" handler="on_n_password_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -142,6 +143,7 @@ <property name="receives_default">False</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_n_volume_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -204,7 +206,7 @@ </packing> </child> </object> - <object class="GtkFileChooserDialog" id="filechooserdialog"> + <object class="GtkFileChooserDialog" id="dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="modal">True</property> @@ -213,6 +215,7 @@ <property name="action">save</property> <property name="do_overwrite_confirmation">True</property> <property name="extra_widget">extra_widget</property> + <signal name="destroy" handler="on_dialog_destroy" swapped="no"/> <child> <placeholder/> </child> |