[gedit/zbrown/deteplification-src: 372/633] FileChooserDialog: reverse order of accept_label and cancel_label
- From: Zander Brown <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/zbrown/deteplification-src: 372/633] FileChooserDialog: reverse order of accept_label and cancel_label
- Date: Sat, 10 Apr 2021 12:48:03 +0000 (UTC)
commit 19988b30b844179a5f1ad5451c7de037b49dd7e4
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Jun 4 23:47:39 2020 +0200
FileChooserDialog: reverse order of accept_label and cancel_label
To be in the same order as gtk_file_chooser_native_new().
gedit/gedit-commands-file.c | 8 ++++----
gedit/gedit-file-chooser-dialog-gtk.c | 4 ++--
gedit/gedit-file-chooser-dialog-gtk.h | 4 ++--
gedit/gedit-file-chooser-dialog-osx.h | 4 ++--
gedit/gedit-file-chooser-dialog-osx.m | 4 ++--
gedit/gedit-file-chooser-dialog.c | 12 ++++++------
gedit/gedit-file-chooser-dialog.h | 4 ++--
7 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c
index d0659ce19..fd2996e4a 100644
--- a/gedit/gedit-commands-file.c
+++ b/gedit/gedit-commands-file.c
@@ -455,8 +455,8 @@ _gedit_cmd_file_open (GSimpleAction *action,
open_dialog = gedit_file_chooser_dialog_create (C_("window title", "Open Files"),
window != NULL ? GTK_WINDOW (window) : NULL,
GEDIT_FILE_CHOOSER_OPEN,
- _("_Cancel"),
- _("_Open"));
+ _("_Open"),
+ _("_Cancel"));
if (window != NULL)
{
@@ -843,8 +843,8 @@ save_as_tab_async (GeditTab *tab,
save_dialog = gedit_file_chooser_dialog_create (C_("window title", "Save As"),
GTK_WINDOW (window),
GEDIT_FILE_CHOOSER_SAVE,
- _("_Cancel"),
- _("_Save"));
+ _("_Save"),
+ _("_Cancel"));
gedit_file_chooser_dialog_set_do_overwrite_confirmation (save_dialog, TRUE);
diff --git a/gedit/gedit-file-chooser-dialog-gtk.c b/gedit/gedit-file-chooser-dialog-gtk.c
index b0b988d43..67e192df9 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.c
+++ b/gedit/gedit-file-chooser-dialog-gtk.c
@@ -578,8 +578,8 @@ GeditFileChooserDialog *
gedit_file_chooser_dialog_gtk_create (const gchar *title,
GtkWindow *parent,
GeditFileChooserFlags flags,
- const gchar *cancel_label,
- const gchar *accept_label)
+ const gchar *accept_label,
+ const gchar *cancel_label)
{
GeditFileChooserDialogGtk *result;
GtkFileFilter *filter;
diff --git a/gedit/gedit-file-chooser-dialog-gtk.h b/gedit/gedit-file-chooser-dialog-gtk.h
index 533e94ab1..40726af54 100644
--- a/gedit/gedit-file-chooser-dialog-gtk.h
+++ b/gedit/gedit-file-chooser-dialog-gtk.h
@@ -36,8 +36,8 @@ G_DECLARE_FINAL_TYPE (GeditFileChooserDialogGtk, gedit_file_chooser_dialog_gtk,
GeditFileChooserDialog * gedit_file_chooser_dialog_gtk_create (const gchar *title,
GtkWindow *parent,
GeditFileChooserFlags flags,
- const gchar *cancel_label,
- const gchar *accept_label);
+ const gchar *accept_label,
+ const gchar *cancel_label);
G_END_DECLS
diff --git a/gedit/gedit-file-chooser-dialog-osx.h b/gedit/gedit-file-chooser-dialog-osx.h
index c9e776ce3..aaefb53d5 100644
--- a/gedit/gedit-file-chooser-dialog-osx.h
+++ b/gedit/gedit-file-chooser-dialog-osx.h
@@ -36,8 +36,8 @@ G_DECLARE_FINAL_TYPE (GeditFileChooserDialogOSX, gedit_file_chooser_dialog_osx,
GeditFileChooserDialog * gedit_file_chooser_dialog_osx_create (const gchar *title,
GtkWindow *parent,
GeditFileChooserFlags flags,
- const gchar *cancel_label,
- const gchar *accept_label);
+ const gchar *accept_label,
+ const gchar *cancel_label);
G_END_DECLS
diff --git a/gedit/gedit-file-chooser-dialog-osx.m b/gedit/gedit-file-chooser-dialog-osx.m
index df4863f91..f6f4daacd 100644
--- a/gedit/gedit-file-chooser-dialog-osx.m
+++ b/gedit/gedit-file-chooser-dialog-osx.m
@@ -876,8 +876,8 @@ GeditFileChooserDialog *
gedit_file_chooser_dialog_osx_create (const gchar *title,
GtkWindow *parent,
GeditFileChooserFlags flags,
- const gchar *cancel_label,
- const gchar *accept_label)
+ const gchar *accept_label,
+ const gchar *cancel_label)
{
GeditFileChooserDialogOSX *ret;
gchar *nomnem;
diff --git a/gedit/gedit-file-chooser-dialog.c b/gedit/gedit-file-chooser-dialog.c
index 7befe1ab6..6ded06e30 100644
--- a/gedit/gedit-file-chooser-dialog.c
+++ b/gedit/gedit-file-chooser-dialog.c
@@ -71,21 +71,21 @@ GeditFileChooserDialog *
gedit_file_chooser_dialog_create (const gchar *title,
GtkWindow *parent,
GeditFileChooserFlags flags,
- const gchar *cancel_label,
- const gchar *accept_label)
+ const gchar *accept_label,
+ const gchar *cancel_label)
{
#ifdef OS_OSX
return gedit_file_chooser_dialog_osx_create (title,
parent,
flags,
- cancel_label,
- accept_label);
+ accept_label,
+ cancel_label);
#else
return gedit_file_chooser_dialog_gtk_create (title,
parent,
flags,
- cancel_label,
- accept_label);
+ accept_label,
+ cancel_label);
#endif
}
diff --git a/gedit/gedit-file-chooser-dialog.h b/gedit/gedit-file-chooser-dialog.h
index 4ce1223f1..7032bd839 100644
--- a/gedit/gedit-file-chooser-dialog.h
+++ b/gedit/gedit-file-chooser-dialog.h
@@ -90,8 +90,8 @@ GeditFileChooserDialog *
gedit_file_chooser_dialog_create (const gchar *title,
GtkWindow *parent,
GeditFileChooserFlags flags,
- const gchar *cancel_label,
- const gchar *accept_label);
+ const gchar *accept_label,
+ const gchar *cancel_label);
void gedit_file_chooser_dialog_destroy (GeditFileChooserDialog *dialog);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]