[Xfce4-commits] [apps/ristretto] 01/01: Add icons to "Close" buttons

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/ristretto.

commit 9e0f70f4d0a61128f8dbddf32d7a911573eaa222
Author: Igor <f2404 at yandex.ru>
Date:   Wed Jul 31 11:54:44 2019 -0400

    Add icons to "Close" buttons
---
 src/preferences_dialog.c |  5 +++--
 src/properties_dialog.c  | 30 ++++++++++++++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index b272745..3274d34 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -242,7 +242,7 @@ rstto_preferences_dialog_init ( RsttoPreferencesDialog *dialog )
     GtkWidget *behaviour_main_lbl;
     GtkWidget *behaviour_desktop_lbl;
     GtkWidget *notebook = gtk_notebook_new ();
-
+    GtkWidget *button = xfce_gtk_button_new_mixed ("window-close", _("_Close"));
 
     /* Code Section */
 
@@ -543,7 +543,8 @@ rstto_preferences_dialog_init ( RsttoPreferencesDialog *dialog )
     /* Window should not be resizable */
     gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE);
 
-    gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_OK);
+    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
+    gtk_widget_show (button);
 
 }
 
diff --git a/src/properties_dialog.c b/src/properties_dialog.c
index 7f7afd5..4b2432d 100644
--- a/src/properties_dialog.c
+++ b/src/properties_dialog.c
@@ -127,23 +127,25 @@ rstto_properties_dialog_init (RsttoPropertiesDialog *dialog)
     /* General tab */
     GtkWidget *general_label;
     GtkWidget *name_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-    GtkWidget *name_label = gtk_label_new(NULL);
-    GtkWidget *mime_label = gtk_label_new(NULL);
+    GtkWidget *name_label = gtk_label_new (NULL);
+    GtkWidget *mime_label = gtk_label_new (NULL);
 
-    GtkWidget *modified_label = gtk_label_new(NULL);
-    GtkWidget *accessed_label = gtk_label_new(NULL);
+    GtkWidget *modified_label = gtk_label_new (NULL);
+    GtkWidget *accessed_label = gtk_label_new (NULL);
 
-    GtkWidget *size_label  = gtk_label_new(NULL);
+    GtkWidget *size_label = gtk_label_new (NULL);
+
+    GtkWidget *button = xfce_gtk_button_new_mixed ("window-close", _("_Close"));
 
     dialog->priv = g_new0 (RsttoPropertiesDialogPriv, 1);
 
     dialog->priv->settings = rstto_settings_new ();
     dialog->priv->image_thumbnail = gtk_image_new ();
-    dialog->priv->name_entry = gtk_entry_new();
-    dialog->priv->mime_content_label = gtk_label_new(NULL);
-    dialog->priv->modified_content_label = gtk_label_new(NULL);
-    dialog->priv->accessed_content_label = gtk_label_new(NULL);
-    dialog->priv->size_content_label = gtk_label_new(NULL);
+    dialog->priv->name_entry = gtk_entry_new ();
+    dialog->priv->mime_content_label = gtk_label_new (NULL);
+    dialog->priv->modified_content_label = gtk_label_new (NULL);
+    dialog->priv->accessed_content_label = gtk_label_new (NULL);
+    dialog->priv->size_content_label = gtk_label_new (NULL);
 
     gtk_label_set_xalign (GTK_LABEL (dialog->priv->mime_content_label), 0.0);
     gtk_label_set_yalign (GTK_LABEL (dialog->priv->mime_content_label), 0.5);
@@ -154,8 +156,7 @@ rstto_properties_dialog_init (RsttoPropertiesDialog *dialog)
     gtk_label_set_xalign (GTK_LABEL (dialog->priv->size_content_label), 0.0);
     gtk_label_set_yalign (GTK_LABEL (dialog->priv->size_content_label), 0.5);
 
-    vbox = gtk_dialog_get_content_area (
-            GTK_DIALOG (dialog));
+    vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
     dialog->priv->notebook = gtk_notebook_new ();
 
     grid = gtk_grid_new ();
@@ -215,9 +216,10 @@ rstto_properties_dialog_init (RsttoPropertiesDialog *dialog)
     gtk_widget_show_all (vbox);
 
     /* Window should not be resizable */
-    gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+    gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-    gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_OK);
+    gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
+    gtk_widget_show (button);
 }
 
 static void

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.