dropped show_copy_path option

diff --git a/src/collect-table.c b/src/collect-table.c
index 8471970..bdb6478 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -895,9 +895,8 @@ static GtkWidget *collection_table_popup_menu(CollectTable *ct, gboolean over_ic
                        G_CALLBACK(collection_table_popup_rename_cb), ct);
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, over_icon,
                        G_CALLBACK(collection_table_popup_delete_cb), ct);
-       if (options->show_copy_path)
-               menu_item_add_sensitive(menu, _("_Copy path"), over_icon,
-                                       G_CALLBACK(collection_table_popup_copy_path_cb), ct);
+       menu_item_add_sensitive(menu, _("_Copy path"), over_icon,
+                               G_CALLBACK(collection_table_popup_copy_path_cb), ct);
        menu_item_add_divider(menu);
 
        submenu_add_sort(menu, G_CALLBACK(collection_table_popup_sort_cb), ct, FALSE, TRUE, FALSE, 0);

diff --git a/src/dupe.c b/src/dupe.c
index 16e60a2..0fd442d 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -2278,9 +2278,8 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di)
                                G_CALLBACK(dupe_menu_rename_cb), dw);
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
                                G_CALLBACK(dupe_menu_delete_cb), dw);
-       if (options->show_copy_path)
-               menu_item_add_sensitive(menu, _("_Copy path"), on_row,
-                                       G_CALLBACK(dupe_menu_copy_path_cb), dw);
+       menu_item_add_sensitive(menu, _("_Copy path"), on_row,
+                               G_CALLBACK(dupe_menu_copy_path_cb), dw);
        menu_item_add_divider(menu);
        menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
                                G_CALLBACK(dupe_menu_remove_cb), dw);

diff --git a/src/img-view.c b/src/img-view.c
index 75fa74d..11f386f 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1296,8 +1296,7 @@ static GtkWidget *view_popup_menu(ViewWindow *vw)
        menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);
        menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
        menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
-       if (options->show_copy_path)
-               menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
+       menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
 
        menu_item_add_divider(menu);
 

diff --git a/src/layout_image.c b/src/layout_image.c
index 7c9110c..d2a80b9 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -522,11 +522,8 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)
        item = menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(li_pop_menu_delete_cb), lw);
        if (!path) gtk_widget_set_sensitive(item, FALSE);
        
-       if (options->show_copy_path)
-               {
-               item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw);
-               if (!path) gtk_widget_set_sensitive(item, FALSE);
-       }
+       item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw);
+       if (!path) gtk_widget_set_sensitive(item, FALSE);
 
        menu_item_add_divider(menu);
 

diff --git a/src/layout_util.c b/src/layout_util.c
index 472b99c..e25c4ef 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1129,38 +1129,6 @@ void layout_recent_add_path(const gchar *path)
        layout_recent_update_all();
 }
 
-/*
- *-----------------------------------------------------------------------------
- * copy path
- *-----------------------------------------------------------------------------
- */
-
-static void layout_copy_path_update(LayoutWindow *lw)
-{
-       GtkWidget *item = gtk_ui_manager_get_widget(lw->ui_manager, "/MainMenu/FileMenu/CopyPath");
-
-       if (!item) return;
-       
-       if (options->show_copy_path)
-               gtk_widget_show(item);
-       else
-               gtk_widget_hide(item);
-}
-
-void layout_copy_path_update_all(void)
-{
-       GList *work;
-
-       work = layout_window_list;
-       while (work)
-               {
-               LayoutWindow *lw = work->data;
-               work = work->next;
-
-               layout_copy_path_update(lw);
-               }
-}
-
 /*
  *-----------------------------------------------------------------------------
  * menu
@@ -1771,7 +1739,6 @@ void layout_actions_setup(LayoutWindow *lw)
        
        layout_actions_setup_marks(lw);
        layout_actions_setup_editors(lw);
-       layout_copy_path_update(lw);
 
        layout_actions_add_window(lw, lw->window);
 }

diff --git a/src/options.c b/src/options.c
index 4186b42..5d6f204 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -104,7 +104,6 @@ ConfOptions *init_options(ConfOptions *options)
        options->metadata.confirm_on_image_change = FALSE;
        options->metadata.confirm_on_dir_change = TRUE;
        
-       options->show_copy_path = TRUE;
        options->show_icon_names = TRUE;
 
        options->slideshow.delay = 50;

diff --git a/src/options.h b/src/options.h
index 8f1fb0c..d76ab40 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -21,7 +21,6 @@ struct _ConfOptions
        gboolean place_dialogs_under_mouse;
        gboolean mousewheel_scrolls;
        gboolean show_icon_names;
-       gboolean show_copy_path;
 
        /* various */
        gboolean tree_descend_subdirs;

diff --git a/src/pan-view.c b/src/pan-view.c
index 557b485..7cf4531 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -2828,9 +2828,8 @@ static GtkWidget *pan_popup_menu(PanWindow *pw)
                                G_CALLBACK(pan_rename_cb), pw);
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
                                      G_CALLBACK(pan_delete_cb), pw);
-       if (options->show_copy_path)
-               menu_item_add_sensitive(menu, _("_Copy path"), active,
-                                       G_CALLBACK(pan_copy_path_cb), pw);
+       menu_item_add_sensitive(menu, _("_Copy path"), active,
+                               G_CALLBACK(pan_copy_path_cb), pw);
 
        menu_item_add_divider(menu);
        item = menu_item_add_check(menu, _("Sort by E_xif date"), pw->exif_date_enable,

diff --git a/src/preferences.c b/src/preferences.c
index 0754297..5503429 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -315,12 +315,6 @@ static void config_window_apply(void)
        options->open_recent_list_maxsize = c_options->open_recent_list_maxsize;
        options->dnd_icon_size = c_options->dnd_icon_size;
        
-       if (options->show_copy_path != c_options->show_copy_path)
-               {
-               options->show_copy_path = c_options->show_copy_path;
-               layout_copy_path_update_all();
-               }
-
        options->metadata.save_in_image_file = c_options->metadata.save_in_image_file;
        options->metadata.save_legacy_IPTC = c_options->metadata.save_legacy_IPTC;
        options->metadata.warn_on_write_problems = c_options->metadata.warn_on_write_problems;
@@ -1505,9 +1499,6 @@ static void config_tab_behavior(GtkWidget *notebook)
        pref_checkbox_new_int(group, _("In place renaming"),
                              options->file_ops.enable_in_place_rename, &c_options->file_ops.enable_in_place_rename);
 
-       pref_checkbox_new_int(group, _("Show \"Copy path\" menu item which write the path of selected files to clipboard"),
-                             options->show_copy_path, &c_options->show_copy_path);
-
        pref_spin_new_int(group, _("Open recent list maximum size"), NULL,
                          1, 50, 1, options->open_recent_list_maxsize, &c_options->open_recent_list_maxsize);
        

diff --git a/src/rcfile.c b/src/rcfile.c
index 5ce2fae..92c88c1 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -262,7 +262,6 @@ static void write_global_attributes(GString *outstr, gint indent)
 //     WRITE_SUBTITLE("General Options");
 
        WRITE_NL(); WRITE_BOOL(*options, show_icon_names);
-       WRITE_NL(); WRITE_BOOL(*options, show_copy_path);
        WRITE_SEPARATOR();
 
        WRITE_NL(); WRITE_BOOL(*options, tree_descend_subdirs);
@@ -573,7 +572,6 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
 
                /* general options */
                if (READ_BOOL(*options, show_icon_names)) continue;
-               if (READ_BOOL(*options, show_copy_path)) continue;
 
                if (READ_BOOL(*options, tree_descend_subdirs)) continue;
                if (READ_BOOL(*options, lazy_image_sync)) continue;

diff --git a/src/search.c b/src/search.c
index 1e457c9..cf6aa9a 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1027,9 +1027,8 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e
                                G_CALLBACK(sr_menu_rename_cb), sd);
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
                                      G_CALLBACK(sr_menu_delete_cb), sd);
-       if (options->show_copy_path)
-               menu_item_add_sensitive(menu, _("_Copy path"), on_row,
-                                       G_CALLBACK(sr_menu_copy_path_cb), sd);
+       menu_item_add_sensitive(menu, _("_Copy path"), on_row,
+                               G_CALLBACK(sr_menu_copy_path_cb), sd);
        menu_item_add_divider(menu);
        menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
                                      G_CALLBACK(sr_menu_remove_cb), sd);

diff --git a/src/view_dir.c b/src/view_dir.c
index 331e0c3..a4418f9 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -620,9 +620,8 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, rename_delete_active,
                                      G_CALLBACK(vd_pop_menu_delete_cb), vd);
 
-       if (options->show_copy_path)
-               menu_item_add(menu, _("_Copy path"),
-                             G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
+       menu_item_add(menu, _("_Copy path"),
+                     G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
 
        menu_item_add_divider(menu);
 

diff --git a/src/view_file.c b/src/view_file.c
index 86e4401..d317199 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -580,9 +580,8 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                                G_CALLBACK(vf_pop_menu_rename_cb), vf);
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
                                      G_CALLBACK(vf_pop_menu_delete_cb), vf);
-       if (options->show_copy_path)
-               menu_item_add_sensitive(menu, _("_Copy path"), active,
-                                       G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
+       menu_item_add_sensitive(menu, _("_Copy path"), active,
+                               G_CALLBACK(vf_pop_menu_copy_path_cb), vf);
 
        menu_item_add_divider(menu);