summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2018-03-02 10:20:50 +0100
committerPablo Barciela <[email protected]>2018-03-03 12:04:31 +0100
commited46e154e2e2a4083baa2f13009e204f07f15a0c (patch)
treea74f521652d9397b4a398b815048e324dfb5ef26 /libcaja-private
parent4901253a0e740395aa7df52b225cda7f82bfe8d9 (diff)
downloadcaja-ed46e154e2e2a4083baa2f13009e204f07f15a0c.tar.bz2
caja-ed46e154e2e2a4083baa2f13009e204f07f15a0c.tar.xz
rename mate_dialog_add_button to eel_dialog_add_button
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-autorun.c35
-rw-r--r--libcaja-private/caja-file-conflict-dialog.c27
-rw-r--r--libcaja-private/caja-file-operations.c26
3 files changed, 18 insertions, 70 deletions
diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c
index 110b9fe7..0c08004e 100644
--- a/libcaja-private/caja-autorun.c
+++ b/libcaja-private/caja-autorun.c
@@ -33,6 +33,7 @@
#include <gdk/gdkkeysyms.h>
#include <eel/eel-glib-extensions.h>
+#include <eel/eel-stock-dialogs.h>
#include "caja-icon-info.h"
#include "caja-global-preferences.h"
@@ -915,24 +916,6 @@ combo_box_enter_ok (GtkWidget *togglebutton, GdkEventKey *event, GtkDialog *dial
return FALSE;
}
-static void
-mate_dialog_add_button (GtkDialog *dialog,
- const gchar *button_text,
- const gchar *icon_name,
- gint response_id)
-{
- GtkWidget *button;
-
- button = gtk_button_new_with_mnemonic (button_text);
- gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON));
-
- gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
- gtk_style_context_add_class (gtk_widget_get_style_context (button), "text-button");
- gtk_widget_set_can_default (button, TRUE);
- gtk_widget_show (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
-}
-
/* returns TRUE if a folder window should be opened */
static gboolean
do_autorun_for_content_type (GMount *mount, const char *x_content_type, CajaAutorunOpenWindow open_window_func, gpointer user_data)
@@ -1144,15 +1127,15 @@ show_dialog:
data);
gtk_box_pack_start (GTK_BOX (vbox), always_check_button, TRUE, TRUE, 0);
- mate_dialog_add_button (GTK_DIALOG (dialog),
- _("_Cancel"),
- "process-stop",
- GTK_RESPONSE_CANCEL);
+ eel_dialog_add_button (GTK_DIALOG (dialog),
+ _("_Cancel"),
+ "process-stop",
+ GTK_RESPONSE_CANCEL);
- mate_dialog_add_button (GTK_DIALOG (dialog),
- _("_OK"),
- "gtk-ok",
- GTK_RESPONSE_OK);
+ eel_dialog_add_button (GTK_DIALOG (dialog),
+ _("_OK"),
+ "gtk-ok",
+ GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/libcaja-private/caja-file-conflict-dialog.c b/libcaja-private/caja-file-conflict-dialog.c
index db9369be..2b9a7955 100644
--- a/libcaja-private/caja-file-conflict-dialog.c
+++ b/libcaja-private/caja-file-conflict-dialog.c
@@ -32,6 +32,7 @@
#include <glib/gi18n.h>
#include <pango/pango.h>
#include <eel/eel-vfs-extensions.h>
+#include <eel/eel-stock-dialogs.h>
#include "caja-file.h"
#include "caja-icon-info.h"
@@ -555,24 +556,6 @@ diff_button_clicked_cb (GtkButton *w,
}
static void
-mate_dialog_add_button (GtkDialog *dialog,
- const gchar *button_text,
- const gchar *icon_name,
- gint response_id)
-{
- GtkWidget *button;
-
- button = gtk_button_new_with_mnemonic (button_text);
- gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON));
-
- gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
- gtk_style_context_add_class (gtk_widget_get_style_context (button), "text-button");
- gtk_widget_set_can_default (button, TRUE);
- gtk_widget_show (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
-}
-
-static void
caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd)
{
GtkWidget *hbox, *vbox, *vbox2;
@@ -668,10 +651,10 @@ caja_file_conflict_dialog_init (CajaFileConflictDialog *fcd)
G_CALLBACK (checkbox_toggled_cb), dialog);
/* Add buttons */
- mate_dialog_add_button (dialog,
- _("_Cancel"),
- "process-stop",
- GTK_RESPONSE_CANCEL);
+ eel_dialog_add_button (dialog,
+ _("_Cancel"),
+ "process-stop",
+ GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog,
_("_Skip"),
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index ca3172b6..fd9fe9cb 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -1085,24 +1085,6 @@ typedef struct {
int result;
} RunSimpleDialogData;
-static void
-mate_dialog_add_button (GtkDialog *dialog,
- const gchar *button_text,
- const gchar *icon_name,
- gint response_id)
-{
- GtkWidget *button;
-
- button = gtk_button_new_with_mnemonic (button_text);
- gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON));
-
- gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
- gtk_style_context_add_class (gtk_widget_get_style_context (button), "text-button");
- gtk_widget_set_can_default (button, TRUE);
- gtk_widget_show (button);
- gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
-}
-
static gboolean
do_run_simple_dialog (gpointer _data)
{
@@ -1133,9 +1115,9 @@ do_run_simple_dialog (gpointer _data)
}
if (g_strcmp0 (button_title, CANCEL) == 0)
- mate_dialog_add_button (GTK_DIALOG (dialog), button_title, "process-stop", response_id);
+ eel_dialog_add_button (GTK_DIALOG (dialog), button_title, "process-stop", response_id);
else if (g_strcmp0 (button_title, DELETE) == 0)
- mate_dialog_add_button (GTK_DIALOG (dialog), button_title, "edit-delete", response_id);
+ eel_dialog_add_button (GTK_DIALOG (dialog), button_title, "edit-delete", response_id);
else
gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id);
@@ -2344,8 +2326,8 @@ prompt_empty_trash (GtkWindow *parent_window)
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("Do _not Empty Trash"), GTK_RESPONSE_REJECT);
- mate_dialog_add_button (GTK_DIALOG (dialog),
- CANCEL, "process-stop", GTK_RESPONSE_CANCEL);
+ eel_dialog_add_button (GTK_DIALOG (dialog),
+ CANCEL, "process-stop", GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog),
_("Empty _Trash"), GTK_RESPONSE_ACCEPT);
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-16 07:52:39 +0000