diff options
| author | infirit <[email protected]> | 2014-07-26 12:23:32 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-07-26 12:48:43 +0200 |
| commit | 7fa6cab49b3623a30bca876dc08c1ecf0443f4de (patch) | |
| tree | cc7ee97940f30434b8dc7f922a9842b1737e5dd2 /src/eom-window.c | |
| parent | e4177ed4c0de5eaa4294c756a43e072f1373cb0f (diff) | |
| download | eom-7fa6cab49b3623a30bca876dc08c1ecf0443f4de.tar.bz2 eom-7fa6cab49b3623a30bca876dc08c1ecf0443f4de.tar.xz | |
Unite copy to clipboard functions in a single menu entry
Also assign a shortcut and icon to it.
Based on eog commit 031908baeeac94a398e44e53253ee8454f834242
From Felix Riemann <[email protected]>
Diffstat (limited to 'src/eom-window.c')
| -rw-r--r-- | src/eom-window.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/src/eom-window.c b/src/eom-window.c index 8be70e4..7e8008f 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -3513,37 +3513,6 @@ move_to_trash_real (EomImage *image, GError **error) } static void -eom_window_cmd_copy_path (GtkAction *action, gpointer user_data) -{ - EomWindow *window; - EomWindowPrivate *priv; - EomImage *image; - GFile *file; - char *filename = NULL; - GtkClipboard *clipboard; - - g_return_if_fail (EOM_IS_WINDOW (user_data)); - - window = EOM_WINDOW (user_data); - priv = window->priv; - - image = eom_thumb_view_get_first_selected_image (EOM_THUMB_VIEW (priv->thumbview)); - - g_return_if_fail (EOM_IS_IMAGE (image)); - - file = eom_image_get_file (image); - - filename = g_file_get_path (file); - - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, filename, -1); - - g_object_unref (file); - g_free (filename); - -} - -static void eom_window_cmd_copy_image (GtkAction *action, gpointer user_data) { GtkClipboard *clipboard; @@ -3952,11 +3921,8 @@ static const GtkActionEntry action_entries_image[] = { { "EditMoveToTrash", "user-trash", N_("Move to _Trash"), NULL, N_("Move the selected image to the trash folder"), G_CALLBACK (eom_window_cmd_move_to_trash) }, - { "EditCopyPath", NULL, N_("Copy _Path"), NULL, - N_("Copy the image file path to the clipboard"), - G_CALLBACK (eom_window_cmd_copy_path) }, - { "EditCopyImage", NULL, N_("Copy _Image"), NULL, - N_("Copy the image to the clipboard"), + { "EditCopyImage", "edit-copy", N_("_Copy"), "<control>C", + N_("Copy the selected image to the clipboard"), G_CALLBACK (eom_window_cmd_copy_image) }, { "ViewZoomIn", GTK_STOCK_ZOOM_IN, N_("_Zoom In"), "<control>plus", N_("Enlarge the image"), |