diff options
Diffstat (limited to 'src/eom-window.c')
| -rw-r--r-- | src/eom-window.c | 518 |
1 files changed, 259 insertions, 259 deletions
diff --git a/src/eom-window.c b/src/eom-window.c index fb56d69..c039d67 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -496,38 +496,40 @@ update_status_bar (EomWindow *window) priv = window->priv; - if (priv->image != NULL && - eom_image_has_data (priv->image, EOM_IMAGE_DATA_DIMENSION)) { - int zoom, width, height; - goffset bytes = 0; + if (priv->image != NULL) + { + if ( eom_image_has_data (priv->image, EOM_IMAGE_DATA_DIMENSION)) + { + int zoom, width, height; + goffset bytes = 0; - zoom = floor (100 * eom_scroll_view_get_zoom (EOM_SCROLL_VIEW (priv->view)) + 0.5); + zoom = floor (100 * eom_scroll_view_get_zoom (EOM_SCROLL_VIEW (priv->view)) + 0.5); - eom_image_get_size (priv->image, &width, &height); + eom_image_get_size (priv->image, &width, &height); - bytes = eom_image_get_bytes (priv->image); + bytes = eom_image_get_bytes (priv->image); - if ((width > 0) && (height > 0)) { - char *size_string; + if ((width > 0) && (height > 0)) { + char *size_string; - size_string = g_format_size (bytes); + size_string = g_format_size (bytes); - /* Translators: This is the string displayed in the statusbar - * The tokens are from left to right: - * - image width - * - image height - * - image size in bytes - * - zoom in percent */ - str = g_strdup_printf (ngettext("%i × %i pixel %s %i%%", - "%i × %i pixels %s %i%%", height), - width, - height, - size_string, - zoom); + /* Translators: This is the string displayed in the statusbar + * The tokens are from left to right: + * - image width + * - image height + * - image size in bytes + * - zoom in percent */ + str = g_strdup_printf (ngettext("%i × %i pixel %s %i%%", + "%i × %i pixels %s %i%%", height), + width, + height, + size_string, + zoom); - g_free (size_string); + g_free (size_string); + } } - update_image_pos (window); } @@ -574,7 +576,6 @@ update_action_groups_state (EomWindow *window) GtkAction *action_sshow; GtkAction *action_print; gboolean print_disabled = FALSE; - gboolean show_image_collection = FALSE; gint n_images = 0; g_return_if_fail (EOM_IS_WINDOW (window)); @@ -633,6 +634,8 @@ update_action_groups_state (EomWindow *window) priv->status = EOM_WINDOW_STATUS_NORMAL; } } else { + gboolean show_image_collection; + if (priv->flags & EOM_STARTUP_DISABLE_COLLECTION) { g_settings_set_boolean (priv->ui_settings, EOM_CONF_UI_IMAGE_COLLECTION, FALSE); @@ -860,7 +863,8 @@ image_file_changed_cb (EomImage *img, EomWindow *window) eom_window_set_message_area (window, info_bar); g_signal_connect (info_bar, "response", - G_CALLBACK (file_changed_info_bar_response), window); + G_CALLBACK (file_changed_info_bar_response), + window); } static void @@ -879,13 +883,12 @@ eom_window_display_image (EomWindow *window, EomImage *image) priv = window->priv; if (image != NULL) { - g_signal_connect (image, - "thumbnail_changed", - G_CALLBACK (image_thumb_changed_cb), - window); + g_signal_connect (image, "thumbnail_changed", + G_CALLBACK (image_thumb_changed_cb), + window); g_signal_connect (image, "file-changed", - G_CALLBACK (image_file_changed_cb), - window); + G_CALLBACK (image_file_changed_cb), + window); image_thumb_changed_cb (image, window); } @@ -1030,10 +1033,9 @@ eom_window_update_openwith_menu (EomWindow *window, EomImage *image) g_object_set_data_full (G_OBJECT (action), "app", app, (GDestroyNotify) g_object_unref); - g_signal_connect (action, - "activate", - G_CALLBACK (open_with_launch_application_cb), - image); + g_signal_connect (action, "activate", + G_CALLBACK (open_with_launch_application_cb), + image); G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_action_group_add_action (priv->actions_open_with, action); @@ -1112,12 +1114,12 @@ eom_window_clear_load_job (EomWindow *window) eom_job_queue_remove_job (priv->load_job); g_signal_handlers_disconnect_by_func (priv->load_job, - eom_job_progress_cb, - window); + eom_job_progress_cb, + window); g_signal_handlers_disconnect_by_func (priv->load_job, - eom_job_load_cb, - window); + eom_job_load_cb, + window); eom_image_cancel_load (EOM_JOB_LOAD (priv->load_job)->image); @@ -1308,11 +1310,11 @@ eom_job_load_cb (EomJobLoad *job, gpointer data) if (priv->image != NULL) { g_signal_handlers_disconnect_by_func (priv->image, - image_thumb_changed_cb, - window); + image_thumb_changed_cb, + window); g_signal_handlers_disconnect_by_func (priv->image, - image_file_changed_cb, - window); + image_file_changed_cb, + window); g_object_unref (priv->image); } @@ -1337,10 +1339,9 @@ eom_job_load_cb (EomJobLoad *job, gpointer data) eom_image_get_caption (job->image), EOM_JOB (job)->error); - g_signal_connect (message_area, - "response", - G_CALLBACK (eom_window_error_message_area_response), - window); + g_signal_connect (message_area, "response", + G_CALLBACK (eom_window_error_message_area_response), + window); gtk_window_set_icon (GTK_WINDOW (window), NULL); gtk_window_set_title (GTK_WINDOW (window), @@ -1373,10 +1374,9 @@ eom_job_load_cb (EomJobLoad *job, gpointer data) if (window->priv->status == EOM_WINDOW_STATUS_INIT) { window->priv->status = EOM_WINDOW_STATUS_NORMAL; - g_signal_handlers_disconnect_by_func - (job->image, - G_CALLBACK (eom_window_obtain_desired_size), - window); + g_signal_handlers_disconnect_by_func (job->image, + eom_window_obtain_desired_size, + window); } G_GNUC_BEGIN_IGNORE_DEPRECATIONS; @@ -1402,8 +1402,8 @@ eom_window_clear_transform_job (EomWindow *window) eom_job_queue_remove_job (priv->transform_job); g_signal_handlers_disconnect_by_func (priv->transform_job, - eom_job_transform_cb, - window); + eom_job_transform_cb, + window); g_object_unref (priv->transform_job); priv->transform_job = NULL; } @@ -1455,15 +1455,13 @@ apply_transformation (EomWindow *window, EomTransform *trans) priv->transform_job = eom_job_transform_new (images, trans); - g_signal_connect (priv->transform_job, - "finished", - G_CALLBACK (eom_job_transform_cb), - window); + g_signal_connect (priv->transform_job, "finished", + G_CALLBACK (eom_job_transform_cb), + window); - g_signal_connect (priv->transform_job, - "progress", - G_CALLBACK (eom_job_progress_cb), - window); + g_signal_connect (priv->transform_job, "progress", + G_CALLBACK (eom_job_progress_cb), + window); eom_job_queue_add_job (priv->transform_job); } @@ -1518,23 +1516,20 @@ handle_image_selection_changed_cb (EomThumbView *thumbview, EomWindow *window) } if (priv->status == EOM_WINDOW_STATUS_INIT) { - g_signal_connect (image, - "size-prepared", - G_CALLBACK (eom_window_obtain_desired_size), - window); + g_signal_connect (image, "size-prepared", + G_CALLBACK (eom_window_obtain_desired_size), + window); } priv->load_job = eom_job_load_new (image, EOM_IMAGE_DATA_ALL); - g_signal_connect (priv->load_job, - "finished", - G_CALLBACK (eom_job_load_cb), - window); + g_signal_connect (priv->load_job, "finished", + G_CALLBACK (eom_job_load_cb), + window); - g_signal_connect (priv->load_job, - "progress", - G_CALLBACK (eom_job_progress_cb), - window); + g_signal_connect (priv->load_job, "progress", + G_CALLBACK (eom_job_progress_cb), + window); eom_job_queue_add_job (priv->load_job); @@ -1633,15 +1628,17 @@ eom_window_update_fullscreen_action (EomWindow *window) action = gtk_action_group_get_action (window->priv->actions_image, "ViewFullscreen"); - g_signal_handlers_block_by_func - (action, G_CALLBACK (eom_window_cmd_fullscreen), window); + g_signal_handlers_block_by_func (action, + eom_window_cmd_fullscreen, + window); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), window->priv->mode == EOM_WINDOW_MODE_FULLSCREEN); G_GNUC_END_IGNORE_DEPRECATIONS; - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (eom_window_cmd_fullscreen), window); + g_signal_handlers_unblock_by_func (action, + eom_window_cmd_fullscreen, + window); } static void @@ -1653,15 +1650,17 @@ eom_window_update_slideshow_action (EomWindow *window) action = gtk_action_group_get_action (window->priv->actions_collection, "ViewSlideshow"); - g_signal_handlers_block_by_func - (action, G_CALLBACK (eom_window_cmd_slideshow), window); + g_signal_handlers_block_by_func (action, + eom_window_cmd_slideshow, + window); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), window->priv->mode == EOM_WINDOW_MODE_SLIDESHOW); G_GNUC_END_IGNORE_DEPRECATIONS; - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (eom_window_cmd_slideshow), window); + g_signal_handlers_unblock_by_func (action, + eom_window_cmd_slideshow, + window); } static void @@ -1673,15 +1672,17 @@ eom_window_update_pause_slideshow_action (EomWindow *window) action = gtk_action_group_get_action (window->priv->actions_image, "PauseSlideshow"); - g_signal_handlers_block_by_func - (action, G_CALLBACK (eom_window_cmd_pause_slideshow), window); + g_signal_handlers_block_by_func (action, + eom_window_cmd_pause_slideshow, + window); gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), window->priv->mode != EOM_WINDOW_MODE_SLIDESHOW); G_GNUC_END_IGNORE_DEPRECATIONS; - g_signal_handlers_unblock_by_func - (action, G_CALLBACK (eom_window_cmd_pause_slideshow), window); + g_signal_handlers_unblock_by_func (action, + eom_window_cmd_pause_slideshow, + window); } static void @@ -1908,8 +1909,8 @@ eom_window_get_exit_fullscreen_button (EomWindow *window) gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("view-restore", GTK_ICON_SIZE_BUTTON)); g_signal_connect (button, "clicked", - G_CALLBACK (exit_fullscreen_button_clicked_cb), - window); + G_CALLBACK (exit_fullscreen_button_clicked_cb), + window); return button; } @@ -1944,13 +1945,12 @@ eom_window_create_fullscreen_popup (EomWindow *window) screen = gtk_widget_get_screen (GTK_WIDGET (window)); g_signal_connect_object (screen, "size-changed", - G_CALLBACK (screen_size_changed_cb), - window, 0); + G_CALLBACK (screen_size_changed_cb), + window, 0); - g_signal_connect (popup, - "enter-notify-event", - G_CALLBACK (fullscreen_leave_notify_cb), - window); + g_signal_connect (popup, "enter-notify-event", + G_CALLBACK (fullscreen_leave_notify_cb), + window); gtk_window_set_screen (GTK_WINDOW (popup), screen); @@ -2096,25 +2096,21 @@ eom_window_run_fullscreen (EomWindow *window, gboolean slideshow) g_assert (GTK_IS_WIDGET (menubar)); gtk_widget_hide (menubar); - g_signal_connect (priv->view, - "motion-notify-event", - G_CALLBACK (fullscreen_motion_notify_cb), - window); + g_signal_connect (priv->view, "motion-notify-event", + G_CALLBACK (fullscreen_motion_notify_cb), + window); - g_signal_connect (priv->view, - "leave-notify-event", - G_CALLBACK (fullscreen_leave_notify_cb), - window); + g_signal_connect (priv->view, "leave-notify-event", + G_CALLBACK (fullscreen_leave_notify_cb), + window); - g_signal_connect (priv->thumbview, - "motion-notify-event", - G_CALLBACK (fullscreen_motion_notify_cb), - window); + g_signal_connect (priv->thumbview, "motion-notify-event", + G_CALLBACK (fullscreen_motion_notify_cb), + window); - g_signal_connect (priv->thumbview, - "leave-notify-event", - G_CALLBACK (fullscreen_leave_notify_cb), - window); + g_signal_connect (priv->thumbview, "leave-notify-event", + G_CALLBACK (fullscreen_leave_notify_cb), + window); fullscreen_set_timeout (window); @@ -2178,20 +2174,20 @@ eom_window_stop_fullscreen (EomWindow *window, gboolean slideshow) } g_signal_handlers_disconnect_by_func (priv->view, - (gpointer) fullscreen_motion_notify_cb, - window); + fullscreen_motion_notify_cb, + window); g_signal_handlers_disconnect_by_func (priv->view, - (gpointer) fullscreen_leave_notify_cb, + fullscreen_leave_notify_cb, window); g_signal_handlers_disconnect_by_func (priv->thumbview, - (gpointer) fullscreen_motion_notify_cb, - window); + fullscreen_motion_notify_cb, + window); g_signal_handlers_disconnect_by_func (priv->thumbview, - (gpointer) fullscreen_leave_notify_cb, - window); + fullscreen_leave_notify_cb, + window); update_ui_visibility (window); @@ -2261,7 +2257,8 @@ eom_window_print (EomWindow *window) _("Error printing file:\n%s"), error->message); g_signal_connect (dialog, "response", - G_CALLBACK (gtk_widget_destroy), NULL); + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); g_error_free (error); } else if (res == GTK_PRINT_OPERATION_RESULT_APPLY) { @@ -2326,8 +2323,8 @@ eom_window_cmd_file_open (GtkAction *action, gpointer user_data) } g_signal_connect (dlg, "response", - G_CALLBACK (file_open_dialog_response_cb), - window); + G_CALLBACK (file_open_dialog_response_cb), + window); gtk_widget_show_all (dlg); } @@ -2338,8 +2335,8 @@ eom_job_close_save_cb (EomJobSave *job, gpointer user_data) EomWindow *window = EOM_WINDOW (user_data); g_signal_handlers_disconnect_by_func (job, - eom_job_close_save_cb, - window); + eom_job_close_save_cb, + window); gtk_widget_destroy (GTK_WIDGET (window)); } @@ -2360,10 +2357,9 @@ close_confirmation_dialog_response_handler (EomCloseConfirmationDialog *dlg, /* save selected images */ selected_images = eom_close_confirmation_dialog_get_selected_images (dlg); if (eom_window_save_images (window, selected_images)) { - g_signal_connect (priv->save_job, - "finished", - G_CALLBACK (eom_job_close_save_cb), - window); + g_signal_connect (priv->save_job, "finished", + G_CALLBACK (eom_job_close_save_cb), + window); eom_job_queue_add_job (priv->save_job); } @@ -2422,10 +2418,9 @@ eom_window_unsaved_images_confirm (EomWindow *window) list); g_list_free (list); - g_signal_connect (dialog, - "response", - G_CALLBACK (close_confirmation_dialog_response_handler), - window); + g_signal_connect (dialog, "response", + G_CALLBACK (close_confirmation_dialog_response_handler), + window); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); gtk_widget_show (dialog); @@ -2558,10 +2553,9 @@ eom_window_cmd_edit_toolbar (GtkAction *action, gpointer *user_data) g_object_set_data (G_OBJECT (dialog), "EggToolbarEditor", editor); - g_signal_connect (dialog, - "response", - G_CALLBACK (eom_window_cmd_edit_toolbar_cb), - window); + g_signal_connect (dialog, "response", + G_CALLBACK (eom_window_cmd_edit_toolbar_cb), + window); gtk_widget_show_all (dialog); } @@ -2640,12 +2634,12 @@ eom_window_cmd_about (GtkAction *action, gpointer user_data) "version", VERSION, "copyright", _("Copyright \xc2\xa9 2000-2010 Free Software Foundation, Inc.\n" "Copyright \xc2\xa9 2011 Perberos\n" - "Copyright \xc2\xa9 2012-2020 MATE developers"), + "Copyright \xc2\xa9 2012-2021 MATE developers"), "comments",_("Eye of MATE is a simple graphics viewer for the MATE Desktop Environment."), "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), - "website", "http://www.mate-desktop.org/", + "website", PACKAGE_URL, "logo-icon-name", "eom", "wrap-license", TRUE, "license", license_trans, @@ -2823,12 +2817,12 @@ eom_window_set_wallpaper (EomWindow *window, const gchar *filename, const gchar gtk_widget_show_all (hbox); gtk_widget_show (info_bar); - eom_window_set_message_area (window, info_bar); gtk_info_bar_set_default_response (GTK_INFO_BAR (info_bar), GTK_RESPONSE_YES); g_signal_connect (info_bar, "response", - G_CALLBACK (wallpaper_info_bar_response), window); + G_CALLBACK (wallpaper_info_bar_response), + window); } static void @@ -2838,12 +2832,12 @@ eom_job_save_cb (EomJobSave *job, gpointer user_data) GtkAction *action_save; g_signal_handlers_disconnect_by_func (job, - eom_job_save_cb, - window); + eom_job_save_cb, + window); g_signal_handlers_disconnect_by_func (job, - eom_job_save_progress_cb, - window); + eom_job_save_progress_cb, + window); g_object_unref (window->priv->save_job); window->priv->save_job = NULL; @@ -2916,15 +2910,13 @@ eom_window_save_images (EomWindow *window, GList *images) priv->save_job = eom_job_save_new (images); - g_signal_connect (priv->save_job, - "finished", - G_CALLBACK (eom_job_save_cb), - window); + g_signal_connect (priv->save_job, "finished", + G_CALLBACK (eom_job_save_cb), + window); - g_signal_connect (priv->save_job, - "progress", - G_CALLBACK (eom_job_save_progress_cb), - window); + g_signal_connect (priv->save_job, "progress", + G_CALLBACK (eom_job_save_progress_cb), + window); return TRUE; } @@ -3060,15 +3052,13 @@ eom_window_cmd_save_as (GtkAction *action, gpointer user_data) return; } - g_signal_connect (priv->save_job, - "finished", - G_CALLBACK (eom_job_save_cb), - window); + g_signal_connect (priv->save_job, "finished", + G_CALLBACK (eom_job_save_cb), + window); - g_signal_connect (priv->save_job, - "progress", - G_CALLBACK (eom_job_save_progress_cb), - window); + g_signal_connect (priv->save_job, "progress", + G_CALLBACK (eom_job_save_progress_cb), + window); eom_job_queue_add_job (priv->save_job); } @@ -3232,12 +3222,12 @@ eom_window_cmd_wallpaper (GtkAction *action, gpointer user_data) if (filename == NULL || !eom_util_file_is_persistent (file)) { GList *files = NULL; - GtkAction *action; + GtkAction *action_set_as_wp; G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - action = gtk_action_group_get_action (window->priv->actions_image, - "ImageSetAsWallpaper"); - gtk_action_set_sensitive (action, FALSE); + action_set_as_wp = gtk_action_group_get_action (window->priv->actions_image, + "ImageSetAsWallpaper"); + gtk_action_set_sensitive (action_set_as_wp, FALSE); G_GNUC_END_IGNORE_DEPRECATIONS; priv->copy_file_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (priv->statusbar), @@ -3248,14 +3238,12 @@ eom_window_cmd_wallpaper (GtkAction *action, gpointer user_data) files = g_list_append (files, eom_image_get_file (image)); priv->copy_job = eom_job_copy_new (files, g_get_user_data_dir ()); - g_signal_connect (priv->copy_job, - "finished", - G_CALLBACK (eom_job_copy_cb), - window); - g_signal_connect (priv->copy_job, - "progress", - G_CALLBACK (eom_job_progress_cb), - window); + g_signal_connect (priv->copy_job, "finished", + G_CALLBACK (eom_job_copy_cb), + window); + g_signal_connect (priv->copy_job, "progress", + G_CALLBACK (eom_job_progress_cb), + window); eom_job_queue_add_job (priv->copy_job); g_object_unref (file); @@ -3770,12 +3758,12 @@ eom_window_cmd_go_random (GtkAction *action, gpointer user_data) } static const GtkActionEntry action_entries_window[] = { - { "Image", NULL, N_("_Image") }, - { "Edit", NULL, N_("_Edit") }, - { "View", NULL, N_("_View") }, - { "Go", NULL, N_("_Go") }, - { "Tools", NULL, N_("_Tools") }, - { "Help", NULL, N_("_Help") }, + { "Image", NULL, N_("_Image"), NULL, NULL, NULL }, + { "Edit", NULL, N_("_Edit"), NULL, NULL, NULL }, + { "View", NULL, N_("_View"), NULL, NULL, NULL }, + { "Go", NULL, N_("_Go"), NULL, NULL, NULL }, + { "Tools", NULL, N_("_Tools"), NULL, NULL, NULL }, + { "Help", NULL, N_("_Help"), NULL, NULL, NULL }, { "ImageOpen", "document-open", N_("_Open…"), "<control>O", N_("Open a file"), @@ -3960,9 +3948,11 @@ connect_proxy_cb (GtkUIManager *manager, if (GTK_IS_MENU_ITEM (proxy)) { disconnect_proxy_cb (manager, action, proxy, window); g_signal_connect (proxy, "select", - G_CALLBACK (menu_item_select_cb), window); + G_CALLBACK (menu_item_select_cb), + window); g_signal_connect (proxy, "deselect", - G_CALLBACK (menu_item_deselect_cb), window); + G_CALLBACK (menu_item_deselect_cb), + window); } } @@ -3973,10 +3963,12 @@ disconnect_proxy_cb (GtkUIManager *manager, EomWindow *window) { if (GTK_IS_MENU_ITEM (proxy)) { - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (menu_item_select_cb), window); - g_signal_handlers_disconnect_by_func - (proxy, G_CALLBACK (menu_item_deselect_cb), window); + g_signal_handlers_disconnect_by_func (proxy, + menu_item_select_cb, + window); + g_signal_handlers_disconnect_by_func (proxy, + menu_item_deselect_cb, + window); } } @@ -3989,11 +3981,11 @@ set_action_properties (GtkActionGroup *window_group, G_GNUC_BEGIN_IGNORE_DEPRECATIONS; action = gtk_action_group_get_action (collection_group, "GoPrevious"); - g_object_set (action, "short_label", _("Previous"), NULL); + g_object_set (action, "short_label", _("_Previous"), NULL); g_object_set (action, "is-important", TRUE, NULL); action = gtk_action_group_get_action (collection_group, "GoNext"); - g_object_set (action, "short_label", _("Next"), NULL); + g_object_set (action, "short_label", _("_Next"), NULL); g_object_set (action, "is-important", TRUE, NULL); action = gtk_action_group_get_action (image_group, "EditRotate90"); @@ -4079,9 +4071,9 @@ eom_window_update_recent_files_menu (EomWindow *window) actions = gtk_action_group_list_actions (priv->actions_recent); for (li = actions; li != NULL; li = li->next) { - g_signal_handlers_disconnect_by_func (GTK_ACTION (li->data), - G_CALLBACK(eom_window_open_recent_cb), - window); + g_signal_handlers_disconnect_by_func (li->data, + eom_window_open_recent_cb, + window); gtk_action_group_remove_action (priv->actions_recent, GTK_ACTION (li->data)); @@ -4140,8 +4132,8 @@ eom_window_update_recent_files_menu (EomWindow *window) g_object_set (G_OBJECT (action), "icon-name", "image-x-generic", NULL); g_signal_connect (action, "activate", - G_CALLBACK (eom_window_open_recent_cb), - window); + G_CALLBACK (eom_window_open_recent_cb), + window); G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_action_group_add_action (priv->actions_recent, action); @@ -4333,7 +4325,8 @@ eom_window_open_editor (GtkAction *action, { GdkAppLaunchContext *context; GAppInfo *app_info; - GList files; + GList *files = NULL; + GFile *file; app_info = get_appinfo_for_editor (window); @@ -4349,15 +4342,14 @@ eom_window_open_editor (GtkAction *action, gdk_app_launch_context_set_timestamp (context, gtk_get_current_event_time ()); - { - GList f = { eom_image_get_file (window->priv->image) }; - files = f; - } + file = eom_image_get_file (window->priv->image); + files = g_list_append (files, file); - g_app_info_launch (app_info, &files, + g_app_info_launch (app_info, files, G_APP_LAUNCH_CONTEXT (context), NULL); - g_object_unref (files.data); + g_list_free (files); + g_object_unref (file); g_object_unref (context); } @@ -4386,7 +4378,8 @@ eom_window_add_open_editor_action (EomWindow *window) gtk_action_set_is_important (action, TRUE); g_signal_connect (action, "activate", - G_CALLBACK (eom_window_open_editor), window); + G_CALLBACK (eom_window_open_editor), + window); gtk_action_group_add_action (window->priv->actions_image, action); G_GNUC_END_IGNORE_DEPRECATIONS; @@ -4421,8 +4414,10 @@ eom_window_construct_ui (EomWindow *window) G_GNUC_BEGIN_IGNORE_DEPRECATIONS; priv->actions_window = gtk_action_group_new ("MenuActionsWindow"); +#ifdef ENABLE_NLS gtk_action_group_set_translation_domain (priv->actions_window, GETTEXT_PACKAGE); +#endif /* ENABLE_NLS */ gtk_action_group_add_actions (priv->actions_window, action_entries_window, @@ -4439,8 +4434,10 @@ eom_window_construct_ui (EomWindow *window) G_GNUC_BEGIN_IGNORE_DEPRECATIONS; priv->actions_image = gtk_action_group_new ("MenuActionsImage"); +#ifdef ENABLE_NLS gtk_action_group_set_translation_domain (priv->actions_image, GETTEXT_PACKAGE); +#endif /* ENABLE_NLS */ gtk_action_group_add_actions (priv->actions_image, action_entries_image, @@ -4459,8 +4456,10 @@ eom_window_construct_ui (EomWindow *window) G_GNUC_BEGIN_IGNORE_DEPRECATIONS; priv->actions_collection = gtk_action_group_new ("MenuActionsCollection"); +#ifdef ENABLE_NLS gtk_action_group_set_translation_domain (priv->actions_collection, GETTEXT_PACKAGE); +#endif /* ENABLE_NLS */ gtk_action_group_add_actions (priv->actions_collection, action_entries_collection, @@ -4487,9 +4486,12 @@ eom_window_construct_ui (EomWindow *window) } g_signal_connect (priv->ui_mgr, "connect_proxy", - G_CALLBACK (connect_proxy_cb), window); + G_CALLBACK (connect_proxy_cb), + window); + g_signal_connect (priv->ui_mgr, "disconnect_proxy", - G_CALLBACK (disconnect_proxy_cb), window); + G_CALLBACK (disconnect_proxy_cb), + window); menubar = gtk_ui_manager_get_widget (priv->ui_mgr, "/MainMenu"); g_assert (GTK_IS_WIDGET (menubar)); @@ -4542,13 +4544,15 @@ eom_window_construct_ui (EomWindow *window) G_GNUC_BEGIN_IGNORE_DEPRECATIONS; priv->actions_recent = gtk_action_group_new ("RecentFilesActions"); +#ifdef ENABLE_NLS gtk_action_group_set_translation_domain (priv->actions_recent, GETTEXT_PACKAGE); +#endif /* ENABLE_NLS */ G_GNUC_END_IGNORE_DEPRECATIONS; g_signal_connect (gtk_recent_manager_get_default (), "changed", - G_CALLBACK (eom_window_recent_manager_changed_cb), - window); + G_CALLBACK (eom_window_recent_manager_changed_cb), + window); eom_window_update_recent_files_menu (window); @@ -4582,25 +4586,21 @@ eom_window_construct_ui (EomWindow *window) gtk_widget_set_size_request (priv->sidebar, 210, -1); - g_signal_connect_after (priv->sidebar, - "show", - G_CALLBACK (eom_window_sidebar_visibility_changed), - window); + g_signal_connect_after (priv->sidebar, "show", + G_CALLBACK (eom_window_sidebar_visibility_changed), + window); - g_signal_connect_after (priv->sidebar, - "hide", - G_CALLBACK (eom_window_sidebar_visibility_changed), - window); + g_signal_connect_after (priv->sidebar, "hide", + G_CALLBACK (eom_window_sidebar_visibility_changed), + window); - g_signal_connect_after (priv->sidebar, - "page-added", - G_CALLBACK (eom_window_sidebar_page_added), - window); + g_signal_connect_after (priv->sidebar, "page-added", + G_CALLBACK (eom_window_sidebar_page_added), + window); - g_signal_connect_after (priv->sidebar, - "page-removed", - G_CALLBACK (eom_window_sidebar_page_removed), - window); + g_signal_connect_after (priv->sidebar, "page-removed", + G_CALLBACK (eom_window_sidebar_page_removed), + window); priv->view = eom_scroll_view_new (); @@ -4609,10 +4609,9 @@ eom_window_construct_ui (EomWindow *window) GTK_WIDGET (eom_metadata_sidebar_new (window))); gtk_widget_set_size_request (GTK_WIDGET (priv->view), 100, 100); - g_signal_connect (G_OBJECT (priv->view), - "zoom_changed", - G_CALLBACK (view_zoom_changed_cb), - window); + g_signal_connect (priv->view, "zoom_changed", + G_CALLBACK (view_zoom_changed_cb), + window); g_settings_bind (priv->view_settings, EOM_CONF_VIEW_SCROLL_WHEEL_ZOOM, priv->view, "scrollwheel-zoom", G_SETTINGS_BIND_GET); @@ -4643,8 +4642,9 @@ eom_window_construct_ui (EomWindow *window) gtk_icon_view_set_margin (GTK_ICON_VIEW (priv->thumbview), 4); gtk_icon_view_set_row_spacing (GTK_ICON_VIEW (priv->thumbview), 0); - g_signal_connect (G_OBJECT (priv->thumbview), "selection_changed", - G_CALLBACK (handle_image_selection_changed_cb), window); + g_signal_connect (priv->thumbview, "selection_changed", + G_CALLBACK (handle_image_selection_changed_cb), + window); priv->nav = eom_thumb_nav_new (priv->thumbview, EOM_THUMB_NAV_MODE_ONE_ROW, @@ -4688,7 +4688,9 @@ static void eom_window_init (EomWindow *window) { GdkGeometry hints; +#if defined(HAVE_LCMS) && defined(GDK_WINDOWING_X11) GdkScreen *screen; +#endif EomWindowPrivate *priv; eom_debug (DEBUG_WINDOW); @@ -4701,8 +4703,6 @@ eom_window_init (EomWindow *window) hints.min_width = EOM_WINDOW_MIN_WIDTH; hints.min_height = EOM_WINDOW_MIN_HEIGHT; - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - priv = window->priv = eom_window_get_instance_private (window); priv->view_settings = g_settings_new (EOM_CONF_VIEW); @@ -4710,10 +4710,9 @@ eom_window_init (EomWindow *window) priv->fullscreen_settings = g_settings_new (EOM_CONF_FULLSCREEN); priv->lockdown_settings = g_settings_new (EOM_CONF_LOCKDOWN_SCHEMA); - g_signal_connect (priv->lockdown_settings, - "changed::" EOM_CONF_LOCKDOWN_CAN_SAVE, - G_CALLBACK (eom_window_can_save_changed_cb), - window); + g_signal_connect (priv->lockdown_settings, "changed::" EOM_CONF_LOCKDOWN_CAN_SAVE, + G_CALLBACK (eom_window_can_save_changed_cb), + window); window->priv->store = NULL; window->priv->image = NULL; @@ -4741,6 +4740,7 @@ eom_window_init (EomWindow *window) window->priv->status = EOM_WINDOW_STATUS_UNKNOWN; #if defined(HAVE_LCMS) && defined(GDK_WINDOWING_X11) + screen = gtk_widget_get_screen (GTK_WIDGET (window)); window->priv->display_profile = eom_window_get_display_profile (screen); #endif @@ -4789,29 +4789,29 @@ eom_window_dispose (GObject *object) /* Disconnect so we don't get any unwanted callbacks * when the thumb view is disposed. */ g_signal_handlers_disconnect_by_func (priv->thumbview, - G_CALLBACK (handle_image_selection_changed_cb), - window); + handle_image_selection_changed_cb, + window); g_clear_object (&priv->thumbview); } if (priv->store != NULL) { g_signal_handlers_disconnect_by_func (priv->store, - eom_window_list_store_image_added, - window); + eom_window_list_store_image_added, + window); g_signal_handlers_disconnect_by_func (priv->store, - eom_window_list_store_image_removed, - window); + eom_window_list_store_image_removed, + window); g_object_unref (priv->store); priv->store = NULL; } if (priv->image != NULL) { g_signal_handlers_disconnect_by_func (priv->image, - image_thumb_changed_cb, - window); + image_thumb_changed_cb, + window); g_signal_handlers_disconnect_by_func (priv->image, - image_file_changed_cb, - window); + image_file_changed_cb, + window); g_object_unref (priv->image); priv->image = NULL; } @@ -4852,8 +4852,8 @@ eom_window_dispose (GObject *object) eom_window_uninhibit_screensaver (window); g_signal_handlers_disconnect_by_func (gtk_recent_manager_get_default (), - G_CALLBACK (eom_window_recent_manager_changed_cb), - window); + eom_window_recent_manager_changed_cb, + window); priv->recent_menu_id = 0; @@ -5241,9 +5241,11 @@ eom_window_constructor (GType type, peas_extension_set_call (priv->extensions, "activate"); g_signal_connect (priv->extensions, "extension-added", - G_CALLBACK (on_extension_added), object); + G_CALLBACK (on_extension_added), + object); g_signal_connect (priv->extensions, "extension-removed", - G_CALLBACK (on_extension_removed), object); + G_CALLBACK (on_extension_removed), + object); return object; } @@ -5327,9 +5329,10 @@ eom_window_class_init (EomWindowClass *class) * @flags: the initialization parameters for the new window. * * - * Creates a new and empty #EomWindow. Use @flags to indicate - * if the window should be initialized fullscreen, in slideshow mode, - * and/or without the thumbnails collection visible. See #EomStartupFlags. + * Creates a new and empty #EomWindow. Use @flags to indicate if the window + * should be initialized fullscreen, in slideshow mode, and/or without the + * thumbnails collection visible. Use preserve-order to maintain + * the order of input parameters instead of sorting. See #EomStartupFlags. * * Returns: a newly created #EomWindow. **/ @@ -5413,15 +5416,13 @@ eom_job_model_cb (EomJobModel *job, gpointer data) eom_thumb_view_set_model (EOM_THUMB_VIEW (priv->thumbview), priv->store); - g_signal_connect (G_OBJECT (priv->store), - "row-inserted", - G_CALLBACK (eom_window_list_store_image_added), - window); + g_signal_connect (priv->store, "row-inserted", + G_CALLBACK (eom_window_list_store_image_added), + window); - g_signal_connect (G_OBJECT (priv->store), - "row-deleted", - G_CALLBACK (eom_window_list_store_image_removed), - window); + g_signal_connect (priv->store, "row-deleted", + G_CALLBACK (eom_window_list_store_image_removed), + window); if (n_images == 0) { gint n_files; @@ -5471,12 +5472,11 @@ eom_window_open_file_list (EomWindow *window, GSList *file_list) g_slist_foreach (file_list, (GFunc) g_object_ref, NULL); window->priv->file_list = file_list; - job = eom_job_model_new (file_list); + job = eom_job_model_new (file_list, !!(window->priv->flags & EOM_STARTUP_PRESERVE_ORDER)); - g_signal_connect (job, - "finished", - G_CALLBACK (eom_job_model_cb), - window); + g_signal_connect (job, "finished", + G_CALLBACK (eom_job_model_cb), + window); eom_job_queue_add_job (job); g_object_unref (job); |