From afbc95910bb9af29f5be17fff55464acda295c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 28 Feb 2018 13:52:20 -0500
Subject: [PATCH] chatview: set default filename when accepting a file
Change-Id: Ie2ef8df3a4f348c646d8cb8465e6852267ec8c08
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
---
src/chatview.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/chatview.cpp b/src/chatview.cpp
index 8d126b77..efdef4d4 100644
--- a/src/chatview.cpp
+++ b/src/chatview.cpp
@@ -164,7 +164,7 @@ button_add_to_conversations_clicked(ChatView *self)
}
static gchar*
-file_to_manipulate(GtkWindow* top_window, bool send)
+file_to_manipulate(GtkWindow* top_window, bool send, const std::string& displayName = "")
{
GtkWidget* dialog;
GtkFileChooserAction action = send? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SAVE;
@@ -179,6 +179,9 @@ file_to_manipulate(GtkWindow* top_window, bool send)
send? _("_Open"): _("_Save"),
GTK_RESPONSE_ACCEPT,
nullptr);
+ // Set default save name
+ if (!send)
+ gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER(dialog), displayName.c_str());
res = gtk_dialog_run (GTK_DIALOG(dialog));
@@ -216,7 +219,11 @@ webkit_chat_container_script_dialog(G_GNUC_UNUSED GtkWidget* webview, gchar *int
if (auto model = priv->accountContainer_->info.conversationModel.get()) {
try {
auto interactionId = std::stoull(order.substr(std::string("ACCEPT_FILE:").size()));
- if (auto filename = file_to_manipulate(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(self))), false))
+
+ lrc::api::datatransfer::Info info = {};
+ priv->accountContainer_->info.conversationModel->getTransferInfo(interactionId, info);
+
+ if (auto filename = file_to_manipulate(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(self))), false, info.displayName))
model->acceptTransfer(priv->conversation_->uid, interactionId, filename);
else
model->cancelTransfer(priv->conversation_->uid, interactionId);
--
GitLab