* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "ev-application.h"
#include "ev-utils.h"
#include "ev-file-helpers.h"
#include <string.h>
+static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
+
struct _EvApplication {
GObject base_instance;
EggToolbarsModel *toolbars_model;
-#ifndef HAVE_GTK_RECENT
- EggRecentModel *recent_model;
-#endif
-
TotemScrsaver *scr_saver;
gchar *last_chooser_uri;
-#ifdef WITH_GTK_PRINT
GtkPrintSettings *print_settings;
#if GTK_CHECK_VERSION (2, 11, 0)
gchar *print_settings_file;
#endif
-#endif
};
struct _EvApplicationClass {
return dest;
}
+static const gchar *
+get_find_string_from_args (GHashTable *args)
+{
+ GValue *value = NULL;
+
+ g_assert (args != NULL);
+
+ value = g_hash_table_lookup (args, "find-string");
+
+ return value ? g_value_get_string (value) : NULL;
+}
+
/**
* get_unlink_temp_file_from_args:
* @args: a #GHashTable with data passed to the application.
return unlink_temp_file;
}
+static const gchar *
+get_print_settings_from_args (GHashTable *args)
+{
+ const gchar *print_settings = NULL;
+ GValue *value = NULL;
+
+ g_assert (args != NULL);
+
+ value = g_hash_table_lookup (args, "print-settings");
+ if (value) {
+ print_settings = g_value_get_string (value);
+ }
+
+ return print_settings;
+}
+
/**
* ev_application_open_window:
* @application: The instance of the application.
if (screen) {
gtk_window_set_screen (GTK_WINDOW (new_window), screen);
}
+ ev_application_add_icon_path_for_screen (screen);
gtk_widget_show (new_window);
return uri_window;
}
-/**
- * ev_application_open_uri_at_dest:
- * @application: The instance of the application.
- * @uri: The uri to be opened.
- * @screen: Thee screen where the link will be shown.
- * @dest: The #EvLinkDest of the document.
- * @mode: The run mode of the window.
- * @unlink_temp_file: The unlink_temp_file option value.
- * @timestamp: Current time value.
- */
-void
-ev_application_open_uri_at_dest (EvApplication *application,
- const char *uri,
- GdkScreen *screen,
- EvLinkDest *dest,
- EvWindowRunMode mode,
- gboolean unlink_temp_file,
- guint timestamp)
+static void
+ev_application_add_icon_path_for_screen (GdkScreen *screen)
{
- EvWindow *new_window;
GtkIconTheme *icon_theme;
- g_return_if_fail (uri != NULL);
-
icon_theme = gtk_icon_theme_get_for_screen (screen);
if (icon_theme) {
gchar **path = NULL;
g_free (ev_icons_path);
g_strfreev (path);
}
+}
+
+/**
+ * ev_application_open_uri_at_dest:
+ * @application: The instance of the application.
+ * @uri: The uri to be opened.
+ * @screen: Thee screen where the link will be shown.
+ * @dest: The #EvLinkDest of the document.
+ * @mode: The run mode of the window.
+ * @unlink_temp_file: The unlink_temp_file option value.
+ * @timestamp: Current time value.
+ */
+void
+ev_application_open_uri_at_dest (EvApplication *application,
+ const char *uri,
+ GdkScreen *screen,
+ EvLinkDest *dest,
+ EvWindowRunMode mode,
+ const gchar *search_string,
+ gboolean unlink_temp_file,
+ const gchar *print_settings,
+ guint timestamp)
+{
+ EvWindow *new_window;
+
+ g_return_if_fail (uri != NULL);
+
+ ev_application_add_icon_path_for_screen (screen);
new_window = ev_application_get_uri_window (application, uri);
/* We need to load uri before showing the window, so
we can restore window size without flickering */
- ev_window_open_uri (new_window, uri, dest, mode, unlink_temp_file);
+ ev_window_open_uri (new_window, uri, dest, mode, search_string,
+ unlink_temp_file, print_settings);
ev_document_fc_mutex_lock ();
gtk_widget_show (GTK_WIDGET (new_window));
{
EvLinkDest *dest = NULL;
EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL;
+ const gchar *search_string = NULL;
gboolean unlink_temp_file = FALSE;
+ const gchar *print_settings = NULL;
GdkScreen *screen = NULL;
if (args) {
screen = get_screen_from_args (args);
dest = get_destination_from_args (args);
mode = get_window_run_mode_from_args (args);
+ search_string = get_find_string_from_args (args);
unlink_temp_file = (mode == EV_WINDOW_MODE_PREVIEW &&
get_unlink_temp_file_from_args (args));
+ print_settings = get_print_settings_from_args (args);
}
ev_application_open_uri_at_dest (application, uri, screen,
- dest, mode, unlink_temp_file,
- timestamp);
+ dest, mode, search_string,
+ unlink_temp_file,
+ print_settings, timestamp);
if (dest)
g_object_unref (dest);
for (l = uri_list; l != NULL; l = l->next) {
ev_application_open_uri_at_dest (application, (char *)l->data,
- screen, NULL, 0, FALSE,
- timestamp);
+ screen, NULL, 0, NULL,
+ FALSE, NULL, timestamp);
}
}
application->toolbars_file = NULL;
}
-#ifndef HAVE_GTK_RECENT
- if (application->recent_model) {
- g_object_unref (application->recent_model);
- application->recent_model = NULL;
- }
-#endif
-
-#ifdef WITH_GTK_PRINT
#if GTK_CHECK_VERSION (2, 11, 0)
if (application->print_settings_file) {
if (application->print_settings) {
application->print_settings = NULL;
}
#endif /* GTK 2.11.0 */
-#endif /* WITH_GTK_PRINT */
g_free (application->last_chooser_uri);
g_object_unref (application);
static void
ev_application_init (EvApplication *ev_application)
{
+ gint i;
+
#if WITH_GNOME
init_session (ev_application);
#endif
DATADIR"/evince-toolbar.xml");
}
+ /* Open item doesn't exist anymore,
+ * convert it to OpenRecent for compatibility
+ */
+ for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) {
+ const gchar *item;
+
+ item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i);
+ if (g_ascii_strcasecmp (item, "FileOpen") == 0) {
+ egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i);
+ egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i,
+ "FileOpenRecent");
+ ev_application_save_toolbars_model (ev_application);
+ break;
+ }
+ }
+
egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
- EGG_TB_MODEL_NOT_REMOVABLE);
-
-#ifndef HAVE_GTK_RECENT
- ev_application->recent_model = egg_recent_model_new (EGG_RECENT_MODEL_SORT_MRU);
- /* FIXME we should add a mime type filter but current eggrecent
- has only a varargs style api which does not work well when
- the list of mime types is dynamic */
- egg_recent_model_set_limit (ev_application->recent_model, 5);
- egg_recent_model_set_filter_groups (ev_application->recent_model,
- "Evince", NULL);
-#endif /* HAVE_GTK_RECENT */
+ EGG_TB_MODEL_NOT_REMOVABLE);
}
/**
return application->toolbars_model;
}
-#ifndef HAVE_GTK_RECENT
-EggRecentModel *
-ev_application_get_recent_model (EvApplication *application)
-{
- return application->recent_model;
-}
-#endif
-
void
ev_application_save_toolbars_model (EvApplication *application)
{
totem_scrsaver_disable (application->scr_saver);
}
-#ifdef WITH_GTK_PRINT
GtkPrintSettings *
ev_application_get_print_settings (EvApplication *application)
{
application->print_settings = g_object_ref (settings);
}
-#endif /* WITH_GTK_PRINT */
+
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff