[gtranslator: 1/2] Add save file dialog on open from dl
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtranslator: 1/2] Add save file dialog on open from dl
- Date: Thu, 30 Apr 2020 07:00:25 +0000 (UTC)
commit ce2eb50f630a59aaf749347a32c691a639648c20
Author: Shafack Amanda <shafack likhene gmail com>
Date: Thu Apr 30 07:00:14 2020 +0000
Add save file dialog on open from dl
src/gtr-actions-file.c | 55 +++++++++++++++++++++++++++++++++------------
src/gtr-application.c | 61 +++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 89 insertions(+), 27 deletions(-)
---
diff --git a/src/gtr-actions-file.c b/src/gtr-actions-file.c
index 741926ce..f7d27c3c 100644
--- a/src/gtr-actions-file.c
+++ b/src/gtr-actions-file.c
@@ -181,7 +181,6 @@ gtr_file_chooser_analyse (gpointer dialog,
}
}
-
/*
* The "Open file" dialog.
*/
@@ -195,22 +194,50 @@ gtr_open_file_dialog (GtkAction * action, GtrWindow * window)
if (list != NULL)
{
GtkWidget *dialog;
- gint res;
+ gint res = 0;
+ GtrTab *tab;
+ GtrPo *po;
+ GFile *location;
+ gchar *filename;
+
+ tab = gtr_window_get_active_tab (window);
+ po = gtr_tab_get_po (tab);
+ location = gtr_po_get_location (po);
+ filename = g_file_get_path (location);
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
- _("Do you want to save the changes?"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Warning"));
- g_list_free (list);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_NONE, NULL);
+
+ filename = g_strdup_printf("<span weight=\"bold\" size=\"large\">%s</span>",
+ _("Do you want to save changes to this file ?"));
+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), filename);
+ g_free(filename);
+
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dialog),
+ _("If you don't save, all your unsaved changes will be
permanently lost."));
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ _("Save and open"), GTK_RESPONSE_YES,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("Continue without saving"), GTK_RESPONSE_NO,
+ NULL);
+
res = gtk_dialog_run (GTK_DIALOG (dialog));
+ g_list_free (list);
gtk_widget_destroy (dialog);
if (res == GTK_RESPONSE_YES)
- {
- gtr_save_current_file_dialog (NULL, window);
- }
+ {
+ gtr_save_current_file_dialog (NULL, window);
+ gtr_open_file_dialog (NULL, window);
+ return;
+ }
+ else if (res == GTK_RESPONSE_CANCEL)
+ {
+ return;
+ }
}
if (dialog != NULL)
@@ -226,7 +253,7 @@ gtr_open_file_dialog (GtkAction * action, GtrWindow * window)
/*
* With the gettext parser/writer API, we can't currently read/write
* to remote files with gnome-vfs. Eventually, we should intercept
- * remote requests and use gnome-vfs to retrieve a temporary file to
+ * remote requests and use gnome-vfs to retrieve a temporary file to
* work on, and transmit it back when saved.
*/
//gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), TRUE);
@@ -397,7 +424,8 @@ gtr_save_current_file_dialog (GtkWidget * widget, GtrWindow * window)
dialog = gtk_message_dialog_new (GTK_WINDOW (window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
- GTK_BUTTONS_OK, "%s", error->message);
+ GTK_BUTTONS_OK,
+ "%s", error->message);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
g_clear_error (&error);
@@ -806,4 +834,3 @@ _gtr_actions_file_save_all (GtkAction * action, GtrWindow * window)
g_list_free (list);
}
-
diff --git a/src/gtr-application.c b/src/gtr-application.c
index 4ad84cf8..7c1e8020 100644
--- a/src/gtr-application.c
+++ b/src/gtr-application.c
@@ -183,6 +183,12 @@ gtr_application_init (GtrApplication *application)
if (!g_file_test (profiles_file, G_FILE_TEST_EXISTS))
priv->first_run = TRUE;
g_free (profiles_file);
+
+ /* Custom css */
+ priv->provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_resource (priv->provider, "/org/gnome/translator/styles.css");
+
+ load_accels ();
}
static void
@@ -387,26 +393,62 @@ dl_activated (GSimpleAction *action,
GtrApplicationPrivate *priv = gtr_application_get_instance_private (app);
GtrTab *active_tab = gtr_window_get_active_tab (priv->active_window);
+ GtrPo *po = gtr_tab_get_po (active_tab);
GtrPoState state = gtr_po_get_state (gtr_tab_get_po (active_tab));
+ GtkWidget *dialog = NULL;
if (state == GTR_PO_STATE_MODIFIED)
{
GtkWidget *dialog;
- gint res;
+ gint res = 0;
+ GFile *location;
+ gchar *filename;
+
+ po = gtr_tab_get_po (active_tab);
+ location = gtr_po_get_location (po);
+ filename = g_file_get_path (location);
+ g_object_unref (location);
dialog = gtk_message_dialog_new (GTK_WINDOW (priv->active_window),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
- _("Do you want to save the changes?"));
- gtk_window_set_title (GTK_WINDOW (dialog), _("Warning"));
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_NONE,NULL);
+
+ filename = g_strdup_printf("<span weight=\"bold\" size=\"large\">%s</span>",
+ _("Do you want to save changes to this file ?"));
+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dialog), filename);
+ g_free(filename);
+
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG (dialog),
+ _("If you don't save, all your unsaved changes will be
permanently lost."));
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ _("Save and open"), GTK_RESPONSE_YES,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ _("Continue without saving"), GTK_RESPONSE_NO,
+ NULL);
+
res = gtk_dialog_run (GTK_DIALOG (dialog));
+
gtk_widget_destroy (dialog);
if (res == GTK_RESPONSE_YES)
+ {
gtr_save_current_file_dialog (NULL, priv->active_window);
+ gtr_window_show_dlteams (priv->active_window);
+ return;
+ }
+
+ else if (res == GTK_RESPONSE_CANCEL){
+ return;
+ }
}
+ if (dialog != NULL)
+ {
+ gtk_window_present (GTK_WINDOW (dialog));
+ return;
+ }
gtr_window_show_dlteams (priv->active_window);
}
@@ -596,13 +638,6 @@ gtr_application_startup (GApplication *application)
g_set_application_name (_("Translation Editor"));
gtk_window_set_default_icon_name (PACKAGE_APPID);
-
- /* Custom css */
- priv->provider = gtk_css_provider_new ();
- gtk_css_provider_load_from_resource (priv->provider, "/org/gnome/translator/styles.css");
-
- load_accels ();
-
/* We set the default icon dir */
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
gtr_dirs_get_gtr_pixmaps_dir ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]