[gthumb] file selection info: add a separator only if needed



commit 4bbe4387b760ef698501828249353b9f4605def7
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sat Mar 7 14:01:11 2020 +0100

    file selection info: add a separator only if needed

 data/ui/file-selection-info.ui                  | 17 ++---------------
 extensions/catalogs/dlg-add-to-catalog.c        |  9 +++++++++
 extensions/edit_metadata/gth-edit-tags-dialog.c |  9 +++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/data/ui/file-selection-info.ui b/data/ui/file-selection-info.ui
index 74199ac0..64d46366 100644
--- a/data/ui/file-selection-info.ui
+++ b/data/ui/file-selection-info.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkBox" id="content">
@@ -7,19 +7,6 @@
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkSeparator">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -87,7 +74,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">1</property>
+        <property name="position">0</property>
       </packing>
     </child>
   </object>
diff --git a/extensions/catalogs/dlg-add-to-catalog.c b/extensions/catalogs/dlg-add-to-catalog.c
index c0f75428..0bbd8019 100644
--- a/extensions/catalogs/dlg-add-to-catalog.c
+++ b/extensions/catalogs/dlg-add-to-catalog.c
@@ -667,6 +667,7 @@ dlg_add_to_catalog (GthBrowser *browser)
        DialogData       *data;
        GtkTreeSelection *selection;
        char             *last_catalog;
+       GtkWidget        *sep;
 
        if (gth_browser_get_dialog (browser, ADD_TO_CATALOG_DIALOG_NAME)) {
                gtk_window_present (GTK_WINDOW (gth_browser_get_dialog (browser, 
ADD_TO_CATALOG_DIALOG_NAME)));
@@ -694,6 +695,14 @@ dlg_add_to_catalog (GthBrowser *browser)
                            FALSE,
                            0);
 
+       sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+       gtk_widget_show (sep);
+       gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
+                           sep,
+                           FALSE,
+                           FALSE,
+                           5);
+
        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
                            GET_WIDGET ("dialog_content"),
                            FALSE,
diff --git a/extensions/edit_metadata/gth-edit-tags-dialog.c b/extensions/edit_metadata/gth-edit-tags-dialog.c
index 4468b7d6..10521356 100644
--- a/extensions/edit_metadata/gth-edit-tags-dialog.c
+++ b/extensions/edit_metadata/gth-edit-tags-dialog.c
@@ -178,6 +178,7 @@ static void
 gth_edit_tags_dialog_init (GthEditTagsDialog *self)
 {
        GtkWidget *box;
+       GtkWidget *sep;
 
        self->priv = gth_edit_tags_dialog_get_instance_private (self);
        self->priv->builder = _gtk_builder_new_from_file ("tag-chooser.ui", "edit_metadata");
@@ -195,13 +196,21 @@ gth_edit_tags_dialog_init (GthEditTagsDialog *self)
        gtk_box_pack_start (GTK_BOX (GET_WIDGET ("tag_entry_box")), self->priv->tags_entry, TRUE, TRUE, 0);
 
        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+
        self->priv->info = gth_file_selection_info_new ();
        gtk_widget_show (self->priv->info);
        gtk_box_pack_start (GTK_BOX (box), self->priv->info, FALSE, FALSE, 0);
+
+       sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+       gtk_widget_show (sep);
+       gtk_box_pack_start (GTK_BOX (box), sep, FALSE, FALSE, 0);
+
        gtk_box_pack_start (GTK_BOX (box), GET_WIDGET ("content"), TRUE, TRUE, 0);
+
        self->priv->keep_open_check_button = gtk_check_button_new_with_mnemonic (_("_Keep the dialog open"));
        gtk_widget_show (self->priv->keep_open_check_button);
        gtk_box_pack_start (GTK_BOX (box), self->priv->keep_open_check_button, FALSE, FALSE, 0);
+
        gtk_widget_show (box);
        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), box, TRUE, TRUE, 0);
 }


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