From f73ad2d1e2e86f2354a6f60a82ff41b72ff58f4d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 6 Feb 2025 15:15:14 +0600 Subject: [PATCH] File chooser size saving fix; File chooser save fix --- source/ubl-settings-logging.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index d6e1e99..c984798 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -671,14 +671,13 @@ void on_logrotate_configuration_path_filechooser_open(GtkWidget *self, logrotate dialog->AcceptButton = yon_gtk_builder_get_widget(builder,"AcceptButton"); dialog->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); yon_window_config_custom_window_set(GTK_WINDOW(dialog->FileChooser),"FileDialog"); - gtk_window_set_transient_for(GTK_WINDOW(dialog->FileChooser),GTK_WINDOW(window->MainWindow)); + yon_gtk_window_setup(GTK_WINDOW(dialog->FileChooser),GTK_WINDOW(window->MainWindow),TITLE_LABEL,icon_path,"FileChooser"); GtkFileFilter *filter = gtk_file_filter_new(); gtk_file_filter_set_name(filter,"*log*"); gtk_file_filter_add_pattern(filter,"*log*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog->FileChooser),filter); dictionary *dict = NULL; - gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),FILECHOOSER_TITLE_LABEL); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog); g_signal_connect(G_OBJECT(dialog->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); @@ -922,7 +921,7 @@ void on_filechooser_mode_switch(GtkWidget *, logrotate_filechooser_window *windo void on_filechooser_save(GtkWidget *, dictionary *dict){ logrotate_configure_window *window = yon_dictionary_get_data(dict->first,logrotate_configure_window*); logrotate_filechooser_window *dialog = yon_dictionary_get_data(dict->first->next,logrotate_filechooser_window*); - char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->FileChooser)); + char *filename = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->FileOrDirCheck))?gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog->FileChooser)):gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->FileChooser)); gtk_entry_set_text(GTK_ENTRY(window->FileAmountEntry),filename); on_subwindow_close(dialog->FileChooser); } @@ -935,10 +934,11 @@ void on_filechooser_open(GtkWidget *, logrotate_configure_window *window){ dialog->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton"); dialog->AcceptButton = yon_gtk_builder_get_widget(builder,"AcceptButton"); yon_window_config_custom_window_set(GTK_WINDOW(dialog->FileChooser),"FileDialog"); - gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(window->MainWindow)); + yon_gtk_window_setup(GTK_WINDOW(dialog->FileChooser),GTK_WINDOW(window->MainWindow),TITLE_LABEL,icon_path,"FileChooser"); dictionary *dict = NULL; - gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),FILECHOOSER_TITLE_LABEL); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->FileOrDirCheck),1); + gtk_widget_hide(dialog->FileOrDirCheck); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog); g_signal_connect(G_OBJECT(dialog->FileOrDirCheck),"toggled",G_CALLBACK(on_filechooser_mode_switch),dialog);