[file-roller/wip/gtk4: 41/54] extract dialog: use the check button specific functions
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller/wip/gtk4: 41/54] extract dialog: use the check button specific functions
- Date: Sun, 2 Oct 2022 17:56:50 +0000 (UTC)
commit 22eba423cd86fd0696568397ca8eb4bbab8bd7b2
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Oct 1 22:45:33 2022 +0200
extract dialog: use the check button specific functions
src/dlg-extract.c | 20 ++++++++++----------
src/ui/extract-dialog-options.ui | 3 +++
2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/src/dlg-extract.c b/src/dlg-extract.c
index 45b51b65..758d6298 100644
--- a/src/dlg-extract.c
+++ b/src/dlg-extract.c
@@ -221,15 +221,15 @@ extract_cb_start_extracting (DialogData *data)
fr_window_set_extract_default_dir (window, destination);
- skip_newer = ! gtk_check_button_get_inconsistent (GTK_CHECK_BUTTON (GET_WIDGET
("keep_newer_checkbutton"))) && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("keep_newer_checkbutton")));
- junk_paths = ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("keep_structure_checkbutton")));
+ skip_newer = ! gtk_check_button_get_inconsistent (GTK_CHECK_BUTTON (GET_WIDGET
("keep_newer_checkbutton"))) && gtk_check_button_get_active (GTK_CHECK_BUTTON (GET_WIDGET
("keep_newer_checkbutton")));
+ junk_paths = ! gtk_check_button_get_active (GTK_CHECK_BUTTON (GET_WIDGET
("keep_structure_checkbutton")));
if (! gtk_check_button_get_inconsistent (GTK_CHECK_BUTTON (GET_WIDGET ("keep_newer_checkbutton"))))
g_settings_set_boolean (data->settings, PREF_EXTRACT_SKIP_NEWER, skip_newer);
g_settings_set_boolean (data->settings, PREF_EXTRACT_RECREATE_FOLDERS, ! junk_paths);
- selected_files = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("selected_files_radiobutton")));
- pattern_files = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("file_pattern_radiobutton")));
+ selected_files = gtk_check_button_get_active (GTK_CHECK_BUTTON (GET_WIDGET
("selected_files_radiobutton")));
+ pattern_files = gtk_check_button_get_active (GTK_CHECK_BUTTON (GET_WIDGET
("file_pattern_radiobutton")));
/* create the file list. */
@@ -295,8 +295,8 @@ static void
files_entry_changed_cb (GtkEditable *widget,
DialogData *data)
{
- if (! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("file_pattern_radiobutton"))))
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("file_pattern_radiobutton")),
TRUE);
+ if (! gtk_check_button_get_active (GTK_CHECK_BUTTON (GET_WIDGET ("file_pattern_radiobutton"))))
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (GET_WIDGET ("file_pattern_radiobutton")),
TRUE);
}
@@ -336,14 +336,14 @@ dlg_extract__common (FrWindow *window,
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (data->dialog),
fr_window_get_extract_default_dir (window), NULL);
if (data->selected_files != NULL)
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("selected_files_radiobutton")),
TRUE);
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (GET_WIDGET ("selected_files_radiobutton")),
TRUE);
else {
gtk_widget_set_sensitive (GET_WIDGET ("selected_files_radiobutton"), FALSE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("all_files_radiobutton")), TRUE);
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (GET_WIDGET ("all_files_radiobutton")), TRUE);
}
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_newer_checkbutton")),
g_settings_get_boolean (data->settings, PREF_EXTRACT_SKIP_NEWER));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_structure_checkbutton")),
g_settings_get_boolean (data->settings, PREF_EXTRACT_RECREATE_FOLDERS));
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (GET_WIDGET ("keep_newer_checkbutton")),
g_settings_get_boolean (data->settings, PREF_EXTRACT_SKIP_NEWER));
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (GET_WIDGET ("keep_structure_checkbutton")),
g_settings_get_boolean (data->settings, PREF_EXTRACT_RECREATE_FOLDERS));
/* Set the signals handlers. */
diff --git a/src/ui/extract-dialog-options.ui b/src/ui/extract-dialog-options.ui
index 4d8be6b8..686be579 100644
--- a/src/ui/extract-dialog-options.ui
+++ b/src/ui/extract-dialog-options.ui
@@ -3,6 +3,9 @@
<requires lib="gtk" version="4.0"/>
<object class="GtkBox" id="extra_widget">
<property name="spacing">12</property>
+ <style>
+ <class name="extra-widget"/>
+ </style>
<child>
<object class="GtkBox" id="box2">
<property name="hexpand">1</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]