#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
#define DEBUG_FLAG EMPATHY_DEBUG_FT
#include <libempathy/empathy-debug.h>
#include "empathy-ft-manager.h"
-
-/**
- * SECTION:empathy-ft-manager
- * @short_description: File transfer dialog
- * @see_also: #EmpathyTpFile, empathy_dispatcher_send_file()
- * @include: libempthy-gtk/empathy-ft-manager.h
- *
- * The #EmpathyFTManager object represents the file transfer dialog,
- * it can show multiple file transfers at the same time (added
- * with empathy_ft_manager_add_tp_file()).
- */
-
enum
{
COL_PERCENT,
COL_FT_OBJECT
};
-/**
- * EmpathyFTManagerPriv:
- *
- * Private fields of the #EmpathyFTManager class.
- */
typedef struct {
GtkTreeModel *model;
GHashTable *ft_handler_to_row_ref;
GtkWidget *open_button;
GtkWidget *abort_button;
GtkWidget *clear_button;
-
- guint save_geometry_id;
} EmpathyFTManagerPriv;
enum
return FALSE;
}
-static char *
+static gchar *
ft_manager_format_progress_bytes_and_percentage (guint64 current,
guint64 total,
gdouble speed,
if (percentage != NULL)
{
- if (total != 0)
+ if (total != 0)
*percentage = current * 100 / total;
else
*percentage = -1;
return retval;
}
-static char *
+static gchar *
ft_manager_format_contact_info (EmpathyFTHandler *handler)
{
gboolean incoming;
return retval;
}
-static char *
+static gchar *
ft_manager_format_error_message (EmpathyFTHandler *handler,
const GError *error)
{
g_free (remaining_str);
}
+static void
+ft_manager_clear_handler_time (EmpathyFTManager *manager,
+ GtkTreeRowReference *row_ref)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
+ /* Set new value in the store */
+ path = gtk_tree_row_reference_get_path (row_ref);
+ gtk_tree_model_get_iter (priv->model, &iter, path);
+ gtk_list_store_set (GTK_LIST_STORE (priv->model),
+ &iter,
+ COL_REMAINING, NULL,
+ -1);
+
+ gtk_tree_path_free (path);
+}
+
static void
ft_handler_transfer_error_cb (EmpathyFTHandler *handler,
GError *error,
message = ft_manager_format_error_message (handler, error);
ft_manager_update_handler_message (manager, row_ref, message);
+ ft_manager_clear_handler_time (manager, row_ref);
ft_manager_update_buttons (manager);
g_free (message);
const char *contact_name;
const char *filename;
char *first_line, *second_line, *message;
+ char *uri;
gboolean incoming;
GtkTreeRowReference *row_ref;
+ GtkRecentManager *recent_manager;
+ GFile *file;
row_ref = ft_manager_get_row_from_handler (manager, handler);
g_return_if_fail (row_ref != NULL);
message = g_strdup_printf ("%s\n%s", first_line, second_line);
ft_manager_update_handler_message (manager, row_ref, message);
+ ft_manager_clear_handler_time (manager, row_ref);
/* update buttons */
ft_manager_update_buttons (manager);
g_free (first_line);
g_free (second_line);
+ recent_manager = gtk_recent_manager_get_default ();
+ file = empathy_ft_handler_get_gfile (handler);
+ uri = g_file_get_uri (file);
+
+ gtk_recent_manager_add_item (recent_manager, uri);
+
+ g_free (uri);
}
static void
EmpathyTpFile *tp_file,
EmpathyFTManager *manager)
{
- DEBUG ("Transfer done");
-
if (empathy_ft_handler_is_incoming (handler) &&
empathy_ft_handler_get_use_hash (handler))
{
+ DEBUG ("Transfer done, waiting for hashing-started");
+
/* connect to the signal and return early */
g_signal_connect (handler, "hashing-started",
G_CALLBACK (ft_handler_hashing_started_cb), manager);
return;
}
+ DEBUG ("Transfer done, no hashing");
+
do_real_transfer_done (manager, handler);
}
ft_manager_update_handler_time (manager, row_ref, remaining_time);
g_free (message);
+ g_free (first_line);
+ g_free (second_line);
}
static void
ft_manager_update_handler_message (manager, row_ref, message);
g_free (message);
+ g_free (first_line);
+ g_free (second_line);
}
static void
ft_handler_hashing_started_cb (EmpathyFTHandler *handler,
EmpathyFTManager *manager)
{
- char *message;
+ char *message, *first_line, *second_line;
GtkTreeRowReference *row_ref;
DEBUG ("Hashing started");
row_ref = ft_manager_get_row_from_handler (manager, handler);
g_return_if_fail (row_ref != NULL);
+ first_line = ft_manager_format_contact_info (handler);
+
if (empathy_ft_handler_is_incoming (handler))
- message = g_strdup_printf (_("Checking integrity of \"%s\""),
+ second_line = g_strdup_printf (_("Checking integrity of \"%s\""),
empathy_ft_handler_get_filename (handler));
else
- message = g_strdup_printf (_("Hashing \"%s\""),
+ second_line = g_strdup_printf (_("Hashing \"%s\""),
empathy_ft_handler_get_filename (handler));
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+
ft_manager_update_handler_message (manager, row_ref, message);
+ g_free (first_line);
+ g_free (second_line);
g_free (message);
}
g_object_unref (handler);
}
-static gboolean
-ft_manager_save_geometry_timeout_cb (EmpathyFTManager *manager)
-{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
- gint x, y, w, h;
-
- gtk_window_get_size (GTK_WINDOW (priv->window), &w, &h);
- gtk_window_get_position (GTK_WINDOW (priv->window), &x, &y);
-
- empathy_geometry_save ("ft-manager", x, y, w, h);
-
- priv->save_geometry_id = 0;
-
- return FALSE;
-}
-
-static gboolean
-ft_manager_configure_event_cb (GtkWidget *widget,
- GdkEventConfigure *event,
- EmpathyFTManager *manager)
-{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
-
- if (priv->save_geometry_id != 0)
- g_source_remove (priv->save_geometry_id);
-
- priv->save_geometry_id = g_timeout_add (500,
- (GSourceFunc) ft_manager_save_geometry_timeout_cb, manager);
-
- return FALSE;
-}
-
static void
ft_manager_response_cb (GtkWidget *widget,
gint response,
/* There is still FTs on flight, just hide the window */
DEBUG ("Hiding window");
gtk_widget_hide (widget);
- return TRUE;
+ return TRUE;
}
return FALSE;
g_object_unref (manager);
}
+static gboolean
+ft_manager_key_press_event_cb (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w)
+ || event->keyval == GDK_Escape)
+ {
+ gtk_widget_destroy (widget);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static void
ft_manager_build_ui (EmpathyFTManager *manager)
{
GtkBuilder *gui;
- gint x, y, w, h;
GtkTreeView *view;
GtkListStore *liststore;
GtkTreeViewColumn *column;
"ft_manager_dialog", "destroy", ft_manager_destroy_cb,
"ft_manager_dialog", "response", ft_manager_response_cb,
"ft_manager_dialog", "delete-event", ft_manager_delete_event_cb,
- "ft_manager_dialog", "configure-event", ft_manager_configure_event_cb,
+ "ft_manager_dialog", "key-press-event", ft_manager_key_press_event_cb,
NULL);
- g_object_unref (gui);
+ empathy_builder_unref_and_keep_widget (gui, priv->window);
/* Window geometry. */
- empathy_geometry_load ("ft-manager", &x, &y, &w, &h);
-
- if (x >= 0 && y >= 0)
- {
- /* Let the window manager position it if we don't have
- * good x, y coordinates. */
- gtk_window_move (GTK_WINDOW (priv->window), x, y);
- }
-
- if (w > 0 && h > 0)
- {
- /* Use the defaults from the ui file if we don't have
- * good w, h geometry. */
- gtk_window_resize (GTK_WINDOW (priv->window), w, h);
- }
+ empathy_geometry_bind (GTK_WINDOW (priv->window), "ft-manager");
/* Setup the tree view */
view = GTK_TREE_VIEW (priv->treeview);
g_hash_table_destroy (priv->ft_handler_to_row_ref);
- if (priv->save_geometry_id != 0)
- g_source_remove (priv->save_geometry_id);
-
G_OBJECT_CLASS (empathy_ft_manager_parent_class)->finalize (object);
}
projects / empathy.git / blobdiff