[file-roller/wip/gtk4: 47/54] add dialog: added the selection mode, simplified the options section




commit 8b8a6462e72d09e3af3bb8cb7195f6071899b03e
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Oct 2 10:56:05 2022 +0200

    add dialog: added the selection mode, simplified the options section

 src/dlg-add.c                |  2 +-
 src/ui/add-dialog-options.ui | 41 ++++++++++++-----------------------------
 2 files changed, 13 insertions(+), 30 deletions(-)
---
diff --git a/src/dlg-add.c b/src/dlg-add.c
index 18eaf8e5..c361362c 100644
--- a/src/dlg-add.c
+++ b/src/dlg-add.c
@@ -184,7 +184,7 @@ dlg_add (FrWindow *window)
        data = g_new0 (DialogData, 1);
        data->settings = g_settings_new (FILE_ROLLER_SCHEMA_ADD);
        data->window = window;
-       data->dialog = fr_file_selector_dialog_new (C_("Window title", "Add"), GTK_WINDOW (data->window));
+       data->dialog = fr_file_selector_dialog_new (FR_FILE_SELECTOR_MODE_FILES, C_("Window title", "Add"), 
GTK_WINDOW (data->window));
        gtk_dialog_set_default_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_OK);
 
        g_object_get (data->dialog, "use-header-bar", &use_header, NULL);
diff --git a/src/ui/add-dialog-options.ui b/src/ui/add-dialog-options.ui
index f733c194..e04000fc 100644
--- a/src/ui/add-dialog-options.ui
+++ b/src/ui/add-dialog-options.ui
@@ -24,6 +24,7 @@
     <property name="spacing">24</property>
     <child>
       <object class="GtkBox" id="box2">
+        <property name="hexpand">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
@@ -71,8 +72,7 @@
               <object class="GtkEntry" id="include_files_entry">
                 <property name="focusable">1</property>
                 <property name="placeholder_text" translatable="1">*.o; *.bak</property>
-                <property name="invisible_char">●</property>
-                <property name="width_chars">30</property>
+                <property name="max_width_chars">25</property>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">0</property>
@@ -83,7 +83,6 @@
               <object class="GtkEntry" id="exclude_files_entry">
                 <property name="focusable">1</property>
                 <property name="placeholder_text" translatable="1">*.o; *.bak</property>
-                <property name="invisible_char">●</property>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">1</property>
@@ -94,7 +93,6 @@
               <object class="GtkEntry" id="exclude_folders_entry">
                 <property name="focusable">1</property>
                 <property name="placeholder_text" translatable="1">*.o; *.bak</property>
-                <property name="invisible_char">●</property>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">2</property>
@@ -107,38 +105,23 @@
     </child>
     <child>
       <object class="GtkBox" id="box5">
+        <property name="hexpand">1</property>
         <property name="orientation">vertical</property>
         <property name="spacing">10</property>
         <child>
-          <object class="GtkLabel" id="label2">
+          <object class="GtkCheckButton" id="update_checkbutton">
+            <property name="label" translatable="1">Add only if _newer</property>
+            <property name="focusable">1</property>
+            <property name="use_underline">1</property>
             <property name="halign">start</property>
-            <property name="label" translatable="1">Options</property>
-            <attributes>
-              <attribute name="weight" value="bold"></attribute>
-            </attributes>
           </object>
         </child>
         <child>
-          <object class="GtkBox" id="box6">
-            <property name="margin-start">0</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkCheckButton" id="update_checkbutton">
-                <property name="label" translatable="1">Add only if _newer</property>
-                <property name="focusable">1</property>
-                <property name="use_underline">1</property>
-                <property name="halign">start</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="follow_links_checkbutton">
-                <property name="label" translatable="1">_Follow symbolic links</property>
-                <property name="focusable">1</property>
-                <property name="use_underline">1</property>
-                <property name="halign">start</property>
-              </object>
-            </child>
+          <object class="GtkCheckButton" id="follow_links_checkbutton">
+            <property name="label" translatable="1">_Follow symbolic links</property>
+            <property name="focusable">1</property>
+            <property name="use_underline">1</property>
+            <property name="halign">start</property>
           </object>
         </child>
       </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]