Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/Makefile.am7
-rw-r--r--shell/ev-application.h4
-rw-r--r--shell/ev-sidebar-links.c1
-rw-r--r--shell/ev-sidebar-links.h1
-rw-r--r--shell/ev-tooltip.c205
-rw-r--r--shell/ev-tooltip.h68
-rw-r--r--shell/ev-utils.c65
-rw-r--r--shell/ev-utils.h6
-rw-r--r--shell/ev-view.c3
-rw-r--r--shell/ev-window.c1
-rw-r--r--shell/main.c2
11 files changed, 353 insertions, 10 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3033504..3bdfee8 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,11 +1,10 @@
INCLUDES= \
-DDATADIR=\"$(pkgdatadir)\" \
-DGNOMEDATADIR=\"$(datadir)\" \
- -I$(top_srcdir)/lib \
-I$(top_srcdir)/cut-n-paste/zoom-control/ \
-I$(top_srcdir)/cut-n-paste/toolbar-editor/ \
-I$(top_srcdir)/cut-n-paste/totem-screensaver/ \
- -I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libdocument \
-I$(top_srcdir)/properties \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
@@ -81,6 +80,8 @@ evince_SOURCES= \
ev-sidebar-thumbnails.h \
ev-stock-icons.c \
ev-stock-icons.h \
+ ev-tooltip.c \
+ ev-tooltip.h \
main.c
@@ -96,7 +97,7 @@ evince_LDADD= \
$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \
$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \
$(top_builddir)/properties/libevproperties.la \
- $(top_builddir)/lib/libev.la \
+ $(top_builddir)/libdocument/libevbackend.la \
$(SHELL_LIBS) \
$(GNOME_PRINT_LIBS)
diff --git a/shell/ev-application.h b/shell/ev-application.h
index 53e97c2..e0d068a 100644
--- a/shell/ev-application.h
+++ b/shell/ev-application.h
@@ -23,6 +23,10 @@
#ifndef EV_APPLICATION_H
#define EV_APPLICATION_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <glib/gerror.h>
#include <glib-object.h>
diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 4639401..fbf1b73 100644
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -33,7 +33,6 @@
#include "ev-job-queue.h"
#include "ev-document-links.h"
#include "ev-window.h"
-#include "ev-gui.h"
struct _EvSidebarLinksPrivate {
GtkWidget *tree_view;
diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h
index 71b408d..36fb1da 100644
--- a/shell/ev-sidebar-links.h
+++ b/shell/ev-sidebar-links.h
@@ -26,6 +26,7 @@
#include <gtk/gtkvbox.h>
#include "ev-document.h"
+#include "ev-utils.h"
G_BEGIN_DECLS
diff --git a/shell/ev-tooltip.c b/shell/ev-tooltip.c
new file mode 100644
index 0000000..f66f22f
--- /dev/null
+++ b/shell/ev-tooltip.c
@@ -0,0 +1,205 @@
+/* this file is part of evince, a gnome document viewer
+ *
+ * Copyright (C) 2004 Red Hat, Inc.
+ *
+ * Author:
+ * Marco Pesenti Gritti <marco@gnome.org>
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ev-tooltip.h"
+
+#include <gtk/gtklabel.h>
+
+#define DEFAULT_DELAY 500
+#define STICKY_DELAY 500
+#define STICKY_REVERT_DELAY 1000
+#define SPACE_FROM_CURSOR 10
+
+struct _EvTooltipPrivate {
+ GtkWidget *label;
+ GTimeVal last_deactivate;
+ int timer_tag;
+ gboolean active;
+};
+
+G_DEFINE_TYPE (EvTooltip, ev_tooltip, GTK_TYPE_WINDOW)
+
+#define EV_TOOLTIP_GET_PRIVATE(object) \
+ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_TOOLTIP, EvTooltipPrivate))
+
+static gboolean
+ev_tooltip_expose_event (GtkWidget *widget,
+ GdkEventExpose *event)
+{
+ gtk_paint_flat_box (widget->style, widget->window,
+ GTK_STATE_NORMAL, GTK_SHADOW_OUT,
+ NULL, widget, "tooltip", 0, 0,
+ widget->allocation.width, widget->allocation.height);
+
+ return GTK_WIDGET_CLASS (ev_tooltip_parent_class)->expose_event (widget, event);
+}
+
+static void
+ev_tooltip_dispose (GObject *object)
+{
+ EvTooltip *tooltip = EV_TOOLTIP (object);
+
+ if (tooltip->priv->timer_tag) {
+ g_source_remove (tooltip->priv->timer_tag);
+ tooltip->priv->timer_tag = 0;
+ }
+}
+
+static void
+ev_tooltip_class_init (EvTooltipClass *class)
+{
+ GObjectClass *g_object_class = G_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+ g_object_class->dispose = ev_tooltip_dispose;
+ widget_class->expose_event = ev_tooltip_expose_event;
+
+ g_type_class_add_private (g_object_class, sizeof (EvTooltipPrivate));
+}
+
+static void
+ev_tooltip_init (EvTooltip *tooltip)
+{
+ GtkWidget *window = GTK_WIDGET (tooltip);
+ GtkWidget *label;
+
+ tooltip->priv = EV_TOOLTIP_GET_PRIVATE (tooltip);
+
+ gtk_widget_set_app_paintable (GTK_WIDGET (tooltip), TRUE);
+ gtk_window_set_resizable (GTK_WINDOW (tooltip), FALSE);
+ gtk_widget_set_name (window, "gtk-tooltips");
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_container_add (GTK_CONTAINER (window), label);
+ gtk_container_set_border_width (GTK_CONTAINER (window), 3);
+ tooltip->priv->label = label;
+
+ gtk_widget_show (label);
+}
+
+/* Public functions */
+
+GtkWidget *
+ev_tooltip_new (GtkWidget *parent)
+{
+ GtkWidget *tooltip;
+ GtkWidget *toplevel;
+
+ tooltip = g_object_new (EV_TYPE_TOOLTIP, NULL);
+
+ GTK_WINDOW (tooltip)->type = GTK_WINDOW_POPUP;
+ EV_TOOLTIP (tooltip)->parent = parent;
+
+ toplevel = gtk_widget_get_toplevel (parent);
+ gtk_window_set_transient_for (GTK_WINDOW (tooltip), GTK_WINDOW (toplevel));
+
+ return tooltip;
+}
+
+void
+ev_tooltip_set_text (EvTooltip *tooltip, const char *text)
+{
+ gtk_label_set_text (GTK_LABEL (tooltip->priv->label), text);
+}
+
+void
+ev_tooltip_set_position (EvTooltip *tooltip, int x, int y)
+{
+ int root_x, root_y;
+
+ if (tooltip->parent != NULL) {
+ gdk_window_get_origin (tooltip->parent->window, &root_x, &root_y);
+ }
+
+ gtk_window_move (GTK_WINDOW (tooltip),
+ x + root_x + SPACE_FROM_CURSOR,
+ y + root_y + SPACE_FROM_CURSOR);
+}
+
+static gboolean
+ev_tooltip_recently_shown (EvTooltip *tooltip)
+{
+ GTimeVal now;
+ glong msec;
+
+ g_get_current_time (&now);
+
+ msec = (now.tv_sec - tooltip->priv->last_deactivate.tv_sec) * 1000 +
+ (now.tv_usec - tooltip->priv->last_deactivate.tv_usec) / 1000;
+
+ return (msec < STICKY_REVERT_DELAY);
+}
+
+static gint
+ev_tooltip_timeout (gpointer data)
+{
+ GtkWidget *tooltip = GTK_WIDGET (data);
+
+ gtk_widget_show (tooltip);
+
+ return FALSE;
+}
+
+void
+ev_tooltip_activate (EvTooltip *tooltip)
+{
+ int delay;
+
+ if (tooltip->priv->active) {
+ return;
+ } else {
+ tooltip->priv->active = TRUE;
+ }
+
+ if (ev_tooltip_recently_shown (tooltip)) {
+ delay = STICKY_DELAY;
+ } else {
+ delay = DEFAULT_DELAY;
+ }
+
+ tooltip->priv->timer_tag = g_timeout_add (delay, ev_tooltip_timeout,
+ (gpointer)tooltip);
+}
+
+void
+ev_tooltip_deactivate (EvTooltip *tooltip)
+{
+ if (!tooltip->priv->active) {
+ return;
+ } else {
+ tooltip->priv->active = FALSE;
+ }
+
+ if (tooltip->priv->timer_tag) {
+ g_source_remove (tooltip->priv->timer_tag);
+ tooltip->priv->timer_tag = 0;
+ }
+
+ gtk_widget_hide (GTK_WIDGET (tooltip));
+
+ g_get_current_time (&tooltip->priv->last_deactivate);
+}
diff --git a/shell/ev-tooltip.h b/shell/ev-tooltip.h
new file mode 100644
index 0000000..89d064c
--- /dev/null
+++ b/shell/ev-tooltip.h
@@ -0,0 +1,68 @@
+/* ev-sidebar.h
+ * this file is part of evince, a gnome document viewer
+ *
+ * Copyright (C) 2005 Red Hat, Inc.
+ *
+ * Author:
+ * Marco Pesenti Gritti <mpg@redhat.com>
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __EV_TOOLTIP_H__
+#define __EV_TOOLTIP_H__
+
+#include <gtk/gtkwindow.h>
+
+G_BEGIN_DECLS
+
+typedef struct _EvTooltip EvTooltip;
+typedef struct _EvTooltipClass EvTooltipClass;
+typedef struct _EvTooltipPrivate EvTooltipPrivate;
+
+#define EV_TYPE_TOOLTIP (ev_tooltip_get_type())
+#define EV_TOOLTIP(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_TOOLTIP, EvTooltip))
+#define EV_TOOLTIP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_TOOLTIP, EvTooltipClass))
+#define EV_IS_TOOLTIP(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_TOOLTIP))
+#define EV_IS_TOOLTIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EV_TYPE_TOOLTIP))
+#define EV_TOOLTIP_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_TOOLTIP, EvTooltipClass))
+
+struct _EvTooltip {
+ GtkWindow base_instance;
+
+ GtkWidget *parent;
+
+ EvTooltipPrivate *priv;
+};
+
+struct _EvTooltipClass {
+ GtkWindowClass base_class;
+};
+
+GType ev_tooltip_get_type (void);
+GtkWidget *ev_tooltip_new (GtkWidget *parent);
+void ev_tooltip_set_text (EvTooltip *tooltip,
+ const char *text);
+void ev_tooltip_set_position (EvTooltip *tooltip,
+ int x,
+ int y);
+void ev_tooltip_activate (EvTooltip *tooltip);
+void ev_tooltip_deactivate (EvTooltip *tooltip);
+
+G_END_DECLS
+
+#endif /* __EV_TOOLTIP_H__ */
+
+
diff --git a/shell/ev-utils.c b/shell/ev-utils.c
index 38281f6..9021726 100644
--- a/shell/ev-utils.c
+++ b/shell/ev-utils.c
@@ -304,3 +304,68 @@ save_print_config_to_file (GnomePrintConfig *config)
}
#endif /* WITH_GNOME_PRINT */
+static void
+ev_gui_sanitise_popup_position (GtkMenu *menu,
+ GtkWidget *widget,
+ gint *x,
+ gint *y)
+{
+ GdkScreen *screen = gtk_widget_get_screen (widget);
+ gint monitor_num;
+ GdkRectangle monitor;
+ GtkRequisition req;
+
+ g_return_if_fail (widget != NULL);
+
+ gtk_widget_size_request (GTK_WIDGET (menu), &req);
+
+ monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
+ gtk_menu_set_monitor (menu, monitor_num);
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+ *x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
+ *y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
+}
+
+void
+ev_gui_menu_position_tree_selection (GtkMenu *menu,
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data)
+{
+ GtkTreeSelection *selection;
+ GList *selected_rows;
+ GtkTreeModel *model;
+ GtkTreeView *tree_view = GTK_TREE_VIEW (user_data);
+ GtkWidget *widget = GTK_WIDGET (user_data);
+ GtkRequisition req;
+ GdkRectangle visible;
+
+ gtk_widget_size_request (GTK_WIDGET (menu), &req);
+ gdk_window_get_origin (widget->window, x, y);
+
+ *x += (widget->allocation.width - req.width) / 2;
+
+ /* Add on height for the treeview title */
+ gtk_tree_view_get_visible_rect (tree_view, &visible);
+ *y += widget->allocation.height - visible.height;
+
+ selection = gtk_tree_view_get_selection (tree_view);
+ selected_rows = gtk_tree_selection_get_selected_rows (selection, &model);
+ if (selected_rows)
+ {
+ GdkRectangle cell_rect;
+
+ gtk_tree_view_get_cell_area (tree_view, selected_rows->data,
+ NULL, &cell_rect);
+
+ *y += CLAMP (cell_rect.y + cell_rect.height, 0, visible.height);
+
+ g_list_foreach (selected_rows, (GFunc)gtk_tree_path_free, NULL);
+ g_list_free (selected_rows);
+ }
+
+ ev_gui_sanitise_popup_position (menu, widget, x, y);
+}
+
diff --git a/shell/ev-utils.h b/shell/ev-utils.h
index 1d7e882..5afb5a6 100644
--- a/shell/ev-utils.h
+++ b/shell/ev-utils.h
@@ -34,6 +34,12 @@ GdkPixbuf* ev_pixbuf_add_shadow (GdkPixbuf *src, int size,
void ev_print_region_contents (GdkRegion *region);
+void ev_gui_menu_position_tree_selection (GtkMenu *menu,
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data);
+
#ifdef WITH_GNOME_PRINT
GnomePrintConfig* load_print_config_from_file (void);
void save_print_config_to_file (GnomePrintConfig *config);
diff --git a/shell/ev-view.c b/shell/ev-view.c
index 1e156d5..549c256 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -39,7 +39,6 @@
#include "ev-document-find.h"
#include "ev-document-transition.h"
#include "ev-document-misc.h"
-#include "ev-debug.h"
#include "ev-job-queue.h"
#include "ev-page-cache.h"
#include "ev-pixbuf-cache.h"
@@ -2947,8 +2946,6 @@ ev_view_finalize (GObject *object)
{
EvView *view = EV_VIEW (object);
- LOG ("Finalize");
-
g_free (view->status);
g_free (view->find_status);
diff --git a/shell/ev-window.c b/shell/ev-window.c
index c0adf8e..0bba71d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -68,7 +68,6 @@
#include "ev-metadata-manager.h"
#include "ev-file-helpers.h"
#include "ev-utils.h"
-#include "ev-debug.h"
#include "ev-history.h"
#include "ev-image.h"
diff --git a/shell/main.c b/shell/main.c
index fba38a7..3c5a83d 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -38,7 +38,6 @@
#endif
#include "ev-stock-icons.h"
-#include "ev-debug.h"
#include "ev-job-queue.h"
#include "ev-file-helpers.h"
@@ -367,7 +366,6 @@ main (int argc, char *argv[])
g_set_application_name (_("Evince Document Viewer"));
ev_file_helpers_init ();
- ev_debug_init ();
ev_stock_icons_init ();
gtk_window_set_default_icon_name ("evince");
generated by cgit v0.9.1 at 2024-04-18 12:18:40 (GMT)