[Xfce4-commits] [apps/xfce4-screenshooter] 01/01: Replace GtkStock buttons

[noreply at xfce.org]

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

a   n   d   r   e       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/xfce4-screenshooter.

commit 0b26440d385b59293197e0b4b721f4a7922cc9d2
Author: Andre Miranda <andreldm at xfce.org>
Date:   Thu Aug 1 23:05:20 2019 -0300

    Replace GtkStock buttons
---
 lib/screenshooter-dialogs.c       | 56 +++++++++++++++------------------------
 lib/screenshooter-imgur-dialog.ui |  6 ++---
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/lib/screenshooter-dialogs.c b/lib/screenshooter-dialogs.c
index 8f735cc..651b397 100644
--- a/lib/screenshooter-dialogs.c
+++ b/lib/screenshooter-dialogs.c
@@ -655,36 +655,26 @@ GtkWidget *screenshooter_region_dialog_new (ScreenshotData *sd, gboolean plugin)
   GtkWidget *delay_spinner_box, *delay_spinner, *seconds_label;
 
   /* Create the dialog */
-  if (!plugin)
+  if (plugin)
     {
-      dlg =
-        xfce_titled_dialog_new_with_buttons (_("Screenshot"),
-                                             NULL,
-                                             GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             "gtk-help",
-                                             GTK_RESPONSE_HELP,
-                                             "gtk-cancel",
-                                             GTK_RESPONSE_CANCEL,
-                                             "gtk-ok",
-                                             GTK_RESPONSE_OK,
-                                             NULL);
+      dlg = xfce_titled_dialog_new_with_mixed_buttons (_("Screenshot"),
+        NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+        "help-browser", _("_Help"), GTK_RESPONSE_HELP,
+        "window-close", _("_Close"), GTK_RESPONSE_OK,
+        NULL);
 
-      xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Take a screenshot"));
+      xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Preferences"));
     }
   else
     {
-      dlg =
-        xfce_titled_dialog_new_with_buttons (_("Screenshot"),
-                                             NULL,
-                                             GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             "gtk-help",
-                                             GTK_RESPONSE_HELP,
-                                             "gtk-close",
-                                             GTK_RESPONSE_OK,
-                                             NULL);
-
-      xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg),
-                                       _("Preferences"));
+      dlg = xfce_titled_dialog_new_with_mixed_buttons (_("Screenshot"),
+        NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+        "help-browser", _("_Help"), GTK_RESPONSE_HELP,
+        "", _("_Cancel"), GTK_RESPONSE_CANCEL,
+        "", _("_OK"), GTK_RESPONSE_OK,
+        NULL);
+
+      xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Take a screenshot"));
     }
 
   gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
@@ -894,16 +884,12 @@ GtkWidget *screenshooter_actions_dialog_new (ScreenshotData *sd)
   GtkWidget *preview, *preview_ebox, *preview_box, *preview_label;
   GdkPixbuf *thumbnail;
 
-  dlg = xfce_titled_dialog_new_with_buttons (_("Screenshot"),
-                                             NULL,
-                                             GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             "gtk-help",
-                                             GTK_RESPONSE_HELP,
-                                             "gtk-cancel",
-                                             GTK_RESPONSE_CANCEL,
-                                             "gtk-ok",
-                                             GTK_RESPONSE_OK,
-                                             NULL);
+  dlg = xfce_titled_dialog_new_with_mixed_buttons (_("Screenshot"),
+    NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+    "help-browser", _("_Help"), GTK_RESPONSE_HELP,
+    "", _("_Cancel"), GTK_RESPONSE_CANCEL,
+    "", _("_OK"), GTK_RESPONSE_OK,
+    NULL);
 
   xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _("Action"));
   gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
diff --git a/lib/screenshooter-imgur-dialog.ui b/lib/screenshooter-imgur-dialog.ui
index 7fa626e..f76889e 100644
--- a/lib/screenshooter-imgur-dialog.ui
+++ b/lib/screenshooter-imgur-dialog.ui
@@ -5,7 +5,7 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-copy</property>
+    <property name="icon_name">edit-copy</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
@@ -15,12 +15,12 @@
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-copy</property>
+    <property name="icon_name">edit-copy</property>
   </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-copy</property>
+    <property name="icon_name">edit-copy</property>
   </object>
   <object class="GtkImage" id="image6">
     <property name="visible">True</property>

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