[geany/geany] c8970e: info bars: Show additional save button for the "reload file?" info bar

[Thomas Martitz]

Branch:      refs/heads/master
Author:      Thomas Martitz <kugel at rockbox.org>
Committer:   Thomas Martitz <kugel at rockbox.org>
Date:        Sun, 29 Jun 2014 09:38:02 UTC
Commit:      c8970e23316fb41f06a20af310f4b109f5f059d3
             https://github.com/geany/geany/commit/c8970e23316fb41f06a20af310f4b109f5f059d3

Log Message:
-----------
info bars: Show additional save button for the "reload file?" info bar

This allows overwriting the file right from the info bar.


Modified Paths:
--------------
    src/document.c

Modified: src/document.c
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -3177,8 +3177,10 @@ static void on_monitor_reload_file_response(GtkWidget *bar, gint response_id, Ge
 	unprotect_document(doc);
 	doc->priv->info_bars[MSG_TYPE_RELOAD] = NULL;
 
-	if (response_id == GTK_RESPONSE_ACCEPT)
+	if (response_id == GTK_RESPONSE_REJECT)
 		document_reload_file(doc, doc->encoding);
+	else if (response_id == GTK_RESPONSE_ACCEPT)
+		document_save_file(doc, FALSE);
 }
 
 static gboolean on_sci_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
@@ -3227,9 +3229,9 @@ static void monitor_reload_file(GeanyDocument *doc)
 		GtkWidget *bar;
 
 		bar = document_show_message(doc, GTK_MESSAGE_QUESTION, on_monitor_reload_file_response,
-				_("_Reload"), GTK_RESPONSE_ACCEPT,
+				_("_Reload"), GTK_RESPONSE_REJECT,
+				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				NULL, GTK_RESPONSE_NONE,
 				_("Do you want to reload it?"),
 				_("The file '%s' on the disk is more recent than the current buffer."),
 				base_name);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).