From 4fd5e438fe43d8a1b726a9660fd9f8bb9c279106 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Fri, 7 Feb 2020 12:50:49 +0200
Subject: new.ui: Stock icons are deprecated

---
 src/dlg-new.c |  6 ------
 src/ui/new.ui | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/dlg-new.c b/src/dlg-new.c
index 84ecb7e..4998d47 100644
--- a/src/dlg-new.c
+++ b/src/dlg-new.c
@@ -27,7 +27,6 @@
 #include <gio/gio.h>
 #include "dlg-new.h"
 #include "file-utils.h"
-#include "fr-stock.h"
 #include "gtk-utils.h"
 #include "fr-init.h"
 #include "preferences.h"
@@ -268,7 +267,6 @@ dlg_new_archive (FrWindow  *window,
 		const char *default_name)
 {
 	DlgNewData    *data;
-	GtkWidget     *n_new_button;
         GSettings *settings;
 	/*char          *default_ext;*/
 	int            i;
@@ -298,8 +296,6 @@ dlg_new_archive (FrWindow  *window,
 	data->n_volume_spinbutton = GET_WIDGET ("n_volume_spinbutton");
 	data->n_volume_box = GET_WIDGET ("n_volume_box");
 
-	n_new_button = GET_WIDGET ("n_new_button");
-
 	/* Set widgets data. */
 
 	gtk_dialog_set_default_response (GTK_DIALOG (data->dialog), GTK_RESPONSE_OK);
@@ -310,8 +306,6 @@ dlg_new_archive (FrWindow  *window,
 
 	/**/
 
-	gtk_button_set_use_stock (GTK_BUTTON (n_new_button), TRUE);
-	gtk_button_set_label (GTK_BUTTON (n_new_button), FR_STOCK_CREATE_ARCHIVE);
 	gtk_expander_set_expanded (GTK_EXPANDER (data->n_other_options_expander), FALSE);
 	settings = g_settings_new (ENGRAMPA_SCHEMA_GENERAL);
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->n_encrypt_header_checkbutton), g_settings_get_boolean (settings, PREF_GENERAL_ENCRYPT_HEADER));
diff --git a/src/ui/new.ui b/src/ui/new.ui
index 2c4c5c2..8aa6eb5 100644
--- a/src/ui/new.ui
+++ b/src/ui/new.ui
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.14"/>
+  <requires lib="gtk+" version="3.22"/>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">process-stop</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">help-browser</property>
+  </object>
+  <object class="GtkImage" id="image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">add-files-to-archive</property>
+  </object>
   <object class="GtkAdjustment" id="volume_adjustment">
     <property name="lower">0.10000000000000001</property>
     <property name="upper">1000</property>
@@ -198,6 +213,9 @@
     <property name="action">save</property>
     <property name="do_overwrite_confirmation">True</property>
     <property name="extra_widget">extra_widget</property>
+    <child>
+      <placeholder/>
+    </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -211,11 +229,13 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="n_cancel_button">
-                <property name="label">gtk-cancel</property>
+                <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="image">image1</property>
+                <property name="use_underline">True</property>
+                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -225,12 +245,14 @@
             </child>
             <child>
               <object class="GtkButton" id="n_new_button">
-                <property name="label">gtk-new</property>
+                <property name="label" translatable="yes">C_reate</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="image">image3</property>
+                <property name="use_underline">True</property>
+                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -240,11 +262,13 @@
             </child>
             <child>
               <object class="GtkButton" id="n_help_button">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="yes">_Help</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
+                <property name="image">image2</property>
+                <property name="use_underline">True</property>
+                <property name="always_show_image">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-- 
cgit v1.2.1