[gedit] io-error-info-bar: file_already_open_warning moved to Tepl
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] io-error-info-bar: file_already_open_warning moved to Tepl
- Date: Tue, 24 Mar 2020 06:36:36 +0000 (UTC)
commit 8ccb4566f6e5a4c9b2ddb9fe50e81114c236adba
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Mar 24 06:51:52 2020 +0100
io-error-info-bar: file_already_open_warning moved to Tepl
gedit/gedit-io-error-info-bar.c | 38 --------------------------------------
gedit/gedit-io-error-info-bar.h | 2 --
gedit/gedit-tab.c | 7 ++++---
3 files changed, 4 insertions(+), 43 deletions(-)
---
diff --git a/gedit/gedit-io-error-info-bar.c b/gedit/gedit-io-error-info-bar.c
index fc5653b15..f03286f2c 100644
--- a/gedit/gedit-io-error-info-bar.c
+++ b/gedit/gedit-io-error-info-bar.c
@@ -651,44 +651,6 @@ gedit_conversion_error_info_bar_get_encoding (GtkWidget *info_bar)
return NULL;
}
-GtkWidget *
-gedit_file_already_open_warning_info_bar_new (GFile *location)
-{
- TeplInfoBar *info_bar;
- gchar *uri;
- gchar *primary_msg;
-
- g_return_val_if_fail (G_IS_FILE (location), NULL);
-
- info_bar = tepl_info_bar_new ();
- tepl_info_bar_set_buttons_orientation (info_bar, GTK_ORIENTATION_HORIZONTAL);
-
- gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
- /* Translators: the mnemonic chosen for this string should be different
- from other headerbar mnemonics (Open, Save, ...). */
- _("_Edit Anyway"),
- GTK_RESPONSE_YES);
-
- gtk_info_bar_add_button (GTK_INFO_BAR (info_bar),
- /* Translators: the mnemonic chosen for this string should be different
- from other headerbar mnemonics (Open, Save, ...). */
- _("_Don’t Edit"),
- GTK_RESPONSE_CANCEL);
-
- gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar),
- GTK_MESSAGE_WARNING);
-
- uri = g_file_get_parse_name (location);
- primary_msg = g_strdup_printf (_("This file “%s” is already open in another window."), uri);
- tepl_info_bar_add_primary_message (info_bar, primary_msg);
- g_free (uri);
- g_free (primary_msg);
-
- tepl_info_bar_add_secondary_message (info_bar, _("Do you want to edit it anyway?"));
-
- return GTK_WIDGET (info_bar);
-}
-
GtkWidget *
gedit_externally_modified_saving_error_info_bar_new (GFile *location,
const GError *error)
diff --git a/gedit/gedit-io-error-info-bar.h b/gedit/gedit-io-error-info-bar.h
index 9784652c7..6d887eef3 100644
--- a/gedit/gedit-io-error-info-bar.h
+++ b/gedit/gedit-io-error-info-bar.h
@@ -39,8 +39,6 @@ GtkWidget *gedit_conversion_error_while_saving_info_bar_new (GFile
const GtkSourceEncoding
*gedit_conversion_error_info_bar_get_encoding (GtkWidget *info_bar);
-GtkWidget *gedit_file_already_open_warning_info_bar_new (GFile *location);
-
GtkWidget *gedit_externally_modified_saving_error_info_bar_new (GFile *location,
const GError *error);
diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c
index fcf5ec3e1..7fc6fa217 100644
--- a/gedit/gedit-tab.c
+++ b/gedit/gedit-tab.c
@@ -1749,18 +1749,19 @@ successful_load (GTask *loading_task)
if (!gtk_source_file_is_readonly (file) &&
file_already_opened (doc, location))
{
- GtkWidget *info_bar;
+ TeplInfoBar *info_bar;
set_editable (data->tab, FALSE);
- info_bar = gedit_file_already_open_warning_info_bar_new (location);
+ info_bar = tepl_io_error_info_bar_file_already_open_warning_new (location);
+ tepl_info_bar_set_buttons_orientation (info_bar, GTK_ORIENTATION_HORIZONTAL);
g_signal_connect (info_bar,
"response",
G_CALLBACK (file_already_open_warning_info_bar_response),
data->tab);
- set_info_bar (data->tab, info_bar, GTK_RESPONSE_CANCEL);
+ set_info_bar (data->tab, GTK_WIDGET (info_bar), GTK_RESPONSE_CANCEL);
}
/* When loading from stdin, the contents may not be saved, so set the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]