[evince/wip/recent-view: 3/3] ev-window: Removed the recent menu list
- From: Germán Poó Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/wip/recent-view: 3/3] ev-window: Removed the recent menu list
- Date: Sun, 4 May 2014 16:44:57 +0000 (UTC)
commit f5da9da9c27800fb8d9eb764602fb09fb58dcb5c
Author: Aakash Goenka <aakash goenka gmail com>
Date: Thu Jul 25 21:00:07 2013 +0530
ev-window: Removed the recent menu list
Since we have EvRecentView now, there is no use of the menu of recent items.
Removing it.
shell/Makefile.am | 2 -
shell/ev-open-recent-action.c | 101 -----------------
shell/ev-open-recent-action.h | 52 ---------
shell/ev-window.c | 247 +----------------------------------------
shell/evince-ui.xml | 3 -
5 files changed, 1 insertions(+), 404 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index d6868c3..a88e59a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -45,8 +45,6 @@ evince_SOURCES= \
ev-properties-fonts.h \
ev-properties-license.c \
ev-properties-license.h \
- ev-open-recent-action.c \
- ev-open-recent-action.h \
ev-recent-view.c \
ev-recent-view.h \
ev-recent-view-toolbar.c \
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 16e66f6..8ea4ed2 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -62,7 +62,6 @@
#include "ev-loading-message.h"
#include "ev-message-area.h"
#include "ev-metadata.h"
-#include "ev-open-recent-action.h"
#include "ev-page-action.h"
#include "ev-history-action.h"
#include "ev-password-view.h"
@@ -177,8 +176,6 @@ struct _EvWindowPrivate {
GtkActionGroup *attachment_popup_action_group;
GtkActionGroup *zoom_selector_popup_action_group;
GtkRecentManager *recent_manager;
- GtkActionGroup *recent_action_group;
- guint recent_ui_id;
GtkActionGroup *bookmarks_action_group;
guint bookmarks_ui_id;
GtkUIManager *ui_manager;
@@ -285,8 +282,6 @@ struct _EvWindowPrivate {
#define EV_TOOLBARS_FILENAME "evince-toolbar.xml"
-#define MAX_RECENT_ITEM_LEN (40)
-
#define TOOLBAR_RESOURCE_PATH "/org/gnome/evince/shell/ui/toolbar.xml"
#define FULLSCREEN_POPUP_TIMEOUT 2
@@ -2572,217 +2567,11 @@ ev_window_cmd_file_open_copy (GtkAction *action, EvWindow *window)
}
static void
-ev_window_cmd_recent_file_activate (GtkAction *action,
- EvWindow *window)
-{
- GtkRecentInfo *info;
- const gchar *uri;
-
- info = g_object_get_data (G_OBJECT (action), "gtk-recent-info");
- g_assert (info != NULL);
-
- uri = gtk_recent_info_get_uri (info);
-
- ev_application_open_uri_at_dest (EV_APP, uri,
- gtk_window_get_screen (GTK_WINDOW (window)),
- NULL, 0, NULL, gtk_get_current_event_time ());
-}
-
-static void
-ev_window_open_recent_action_item_activated (EvOpenRecentAction *action,
- const gchar *uri,
- EvWindow *window)
-{
- ev_application_open_uri_at_dest (EV_APP, uri,
- gtk_window_get_screen (GTK_WINDOW (window)),
- NULL, 0, NULL, gtk_get_current_event_time ());
-}
-
-static void
ev_window_add_recent (EvWindow *window, const char *filename)
{
gtk_recent_manager_add_item (window->priv->recent_manager, filename);
}
-static gint
-compare_recent_items (GtkRecentInfo *a, GtkRecentInfo *b)
-{
- gboolean has_ev_a, has_ev_b;
- const gchar *evince = g_get_application_name ();
-
- has_ev_a = gtk_recent_info_has_application (a, evince);
- has_ev_b = gtk_recent_info_has_application (b, evince);
-
- if (has_ev_a && has_ev_b) {
- time_t time_a, time_b;
-
- time_a = gtk_recent_info_get_modified (a);
- time_b = gtk_recent_info_get_modified (b);
-
- return (time_b - time_a);
- } else if (has_ev_a) {
- return -1;
- } else if (has_ev_b) {
- return 1;
- }
-
- return 0;
-}
-
-/*
- * Doubles underscore to avoid spurious menu accels.
- */
-static gchar *
-ev_window_get_recent_file_label (gint index, const gchar *filename)
-{
- GString *str;
- gint length;
- const gchar *p;
- const gchar *end;
- gboolean is_rtl;
-
- is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
-
- g_return_val_if_fail (filename != NULL, NULL);
-
- length = strlen (filename);
- str = g_string_sized_new (length + 10);
- g_string_printf (str, "%s_%d. ", is_rtl ? "\xE2\x80\x8F" : "", index);
-
- p = filename;
- end = filename + length;
-
- while (p != end) {
- const gchar *next;
- next = g_utf8_next_char (p);
-
- switch (*p) {
- case '_':
- g_string_append (str, "__");
- break;
- default:
- g_string_append_len (str, p, next - p);
- break;
- }
-
- p = next;
- }
-
- return g_string_free (str, FALSE);
-}
-
-static void
-ev_window_recent_action_connect_proxy_cb (GtkActionGroup *action_group,
- GtkAction *action,
- GtkWidget *proxy,
- gpointer data)
-{
- GtkLabel *label;
-
- if (!GTK_IS_MENU_ITEM (proxy))
- return;
-
- label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (proxy)));
-
- gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
- gtk_label_set_max_width_chars (label, MAX_RECENT_ITEM_LEN);
-}
-
-static void
-ev_window_setup_recent (EvWindow *ev_window)
-{
- GList *items, *l;
- guint n_items = 0;
- const gchar *evince = g_get_application_name ();
- static guint i = 0;
-
- if (ev_window->priv->recent_ui_id > 0) {
- gtk_ui_manager_remove_ui (ev_window->priv->ui_manager,
- ev_window->priv->recent_ui_id);
- gtk_ui_manager_ensure_update (ev_window->priv->ui_manager);
- }
- ev_window->priv->recent_ui_id = gtk_ui_manager_new_merge_id (ev_window->priv->ui_manager);
-
- if (ev_window->priv->recent_action_group) {
- gtk_ui_manager_remove_action_group (ev_window->priv->ui_manager,
- ev_window->priv->recent_action_group);
- g_object_unref (ev_window->priv->recent_action_group);
- }
- ev_window->priv->recent_action_group = gtk_action_group_new ("RecentFilesActions");
- g_signal_connect (ev_window->priv->recent_action_group, "connect-proxy",
- G_CALLBACK (ev_window_recent_action_connect_proxy_cb), NULL);
-
- gtk_ui_manager_insert_action_group (ev_window->priv->ui_manager,
- ev_window->priv->recent_action_group, -1);
-
- items = gtk_recent_manager_get_items (ev_window->priv->recent_manager);
- items = g_list_sort (items, (GCompareFunc) compare_recent_items);
-
- for (l = items; l && l->data; l = g_list_next (l)) {
- GtkRecentInfo *info;
- GtkAction *action;
- gchar *action_name;
- gchar *label;
- const gchar *mime_type;
- gchar *content_type;
- GIcon *icon = NULL;
-
- info = (GtkRecentInfo *) l->data;
-
- if (!gtk_recent_info_has_application (info, evince))
- continue;
-
- action_name = g_strdup_printf ("RecentFile%u", i++);
- label = ev_window_get_recent_file_label (
- n_items + 1, gtk_recent_info_get_display_name (info));
-
- mime_type = gtk_recent_info_get_mime_type (info);
- content_type = g_content_type_from_mime_type (mime_type);
- if (content_type != NULL) {
- icon = g_content_type_get_icon (content_type);
- g_free (content_type);
- }
-
- action = g_object_new (GTK_TYPE_ACTION,
- "name", action_name,
- "label", label,
- "gicon", icon,
- "always-show-image", TRUE,
- NULL);
-
- g_object_set_data_full (G_OBJECT (action),
- "gtk-recent-info",
- gtk_recent_info_ref (info),
- (GDestroyNotify) gtk_recent_info_unref);
-
- g_signal_connect (action, "activate",
- G_CALLBACK (ev_window_cmd_recent_file_activate),
- (gpointer) ev_window);
-
- gtk_action_group_add_action (ev_window->priv->recent_action_group,
- action);
- g_object_unref (action);
-
- gtk_ui_manager_add_ui (ev_window->priv->ui_manager,
- ev_window->priv->recent_ui_id,
- "/ActionMenu/RecentFilesMenu/RecentFiles",
- label,
- action_name,
- GTK_UI_MANAGER_MENUITEM,
- FALSE);
- g_free (action_name);
- g_free (label);
- if (icon != NULL)
- g_object_unref (icon);
-
- if (++n_items == 5)
- break;
- }
-
- g_list_foreach (items, (GFunc) gtk_recent_info_unref, NULL);
- g_list_free (items);
-}
-
static gboolean
show_saving_progress (GFile *dst)
{
@@ -5886,22 +5675,12 @@ ev_window_dispose (GObject *object)
g_clear_object (&priv->zoom_selector_popup_action_group);
- if (priv->recent_action_group) {
- g_object_unref (priv->recent_action_group);
- priv->recent_action_group = NULL;
- }
-
if (priv->bookmarks_action_group) {
g_object_unref (priv->bookmarks_action_group);
priv->bookmarks_action_group = NULL;
}
- if (priv->recent_manager) {
- g_signal_handlers_disconnect_by_func (priv->recent_manager,
- ev_window_setup_recent,
- window);
- priv->recent_manager = NULL;
- }
+ priv->recent_manager = NULL;
if (priv->settings) {
g_object_unref (priv->settings);
@@ -5919,8 +5698,6 @@ ev_window_dispose (GObject *object)
priv->lockdown_settings = NULL;
}
- priv->recent_ui_id = 0;
-
if (priv->model) {
g_signal_handlers_disconnect_by_func (priv->model,
ev_window_page_changed_cb,
@@ -6473,20 +6250,6 @@ register_custom_actions (EvWindow *window, GtkActionGroup *group)
window->priv->history);
gtk_action_group_add_action (group, action);
g_object_unref (action);
-
- action = g_object_new (EV_TYPE_OPEN_RECENT_ACTION,
- "name", "FileOpenRecent",
- "label", _("_Open…"),
- "tooltip", _("Open an existing document"),
- "stock_id", GTK_STOCK_OPEN,
- NULL);
- g_signal_connect (action, "activate",
- G_CALLBACK (ev_window_cmd_file_open), window);
- g_signal_connect (action, "item_activated",
- G_CALLBACK (ev_window_open_recent_action_item_activated),
- window);
- gtk_action_group_add_action (group, action);
- g_object_unref (action);
}
static void
@@ -7536,12 +7299,6 @@ ev_window_init (EvWindow *ev_window)
g_object_unref (css_provider);
ev_window->priv->recent_manager = gtk_recent_manager_get_default ();
- ev_window->priv->recent_action_group = NULL;
- ev_window->priv->recent_ui_id = 0;
- g_signal_connect_swapped (ev_window->priv->recent_manager,
- "changed",
- G_CALLBACK (ev_window_setup_recent),
- ev_window);
ev_window->priv->toolbar = ev_toolbar_new (ev_window);
gtk_widget_set_no_show_all (ev_window->priv->toolbar, TRUE);
@@ -7856,8 +7613,6 @@ ev_window_init (EvWindow *ev_window)
ev_window_setup_default (ev_window);
/* Set it user interface params */
- ev_window_setup_recent (ev_window);
-
gtk_window_set_default_size (GTK_WINDOW (ev_window), 600, 600);
gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (ev_window), TRUE);
diff --git a/shell/evince-ui.xml b/shell/evince-ui.xml
index 97844b3..38ba288 100644
--- a/shell/evince-ui.xml
+++ b/shell/evince-ui.xml
@@ -2,9 +2,6 @@
<popup name="ActionMenu" accelerators="true">
<menuitem name="FileOpenMenu" action="FileOpen"/>
<menuitem name="FileOpenCopyMenu" action="FileOpenCopy"/>
- <menu name="RecentFilesMenu" action="RecentFiles">
- <placeholder name="RecentFiles"/>
- </menu>
<menuitem name="FileSaveAsMenu" action="FileSaveAs"/>
<menuitem name="FileSendToMenu" action="FileSendTo"/>
<menuitem name="FileOpenContainingFolderMenu" action="FileOpenContainingFolder"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
