Revision: 1609
http://geeqie.svn.sourceforge.net/geeqie/?rev=1609&view=rev
Author: nadvornik
Date: 2009-04-04 22:09:50 +0000 (Sat, 04 Apr 2009)
Log Message:
-----------
dropped show_copy_path option
Modified Paths:
--------------
trunk/src/collect-table.c
trunk/src/dupe.c
trunk/src/img-view.c
trunk/src/layout_image.c
trunk/src/layout_util.c
trunk/src/options.c
trunk/src/options.h
trunk/src/pan-view.c
trunk/src/preferences.c
trunk/src/rcfile.c
trunk/src/search.c
trunk/src/view_dir.c
trunk/src/view_file.c
Modified: trunk/src/collect-table.c
===================================================================
--- trunk/src/collect-table.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/collect-table.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -895,9 +895,8 @@
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);
Modified: trunk/src/dupe.c
===================================================================
--- trunk/src/dupe.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/dupe.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -2278,9 +2278,8 @@
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);
Modified: trunk/src/img-view.c
===================================================================
--- trunk/src/img-view.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/img-view.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -1296,8 +1296,7 @@
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);
Modified: trunk/src/layout_image.c
===================================================================
--- trunk/src/layout_image.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/layout_image.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -522,11 +522,8 @@
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);
Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/layout_util.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -1131,38 +1131,6 @@
/*
*-----------------------------------------------------------------------------
- * 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 @@
layout_actions_setup_marks(lw);
layout_actions_setup_editors(lw);
- layout_copy_path_update(lw);
layout_actions_add_window(lw, lw->window);
}
Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/options.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -104,7 +104,6 @@
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;
Modified: trunk/src/options.h
===================================================================
--- trunk/src/options.h 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/options.h 2009-04-04 22:09:50 UTC (rev 1609)
@@ -21,7 +21,6 @@
gboolean place_dialogs_under_mouse;
gboolean mousewheel_scrolls;
gboolean show_icon_names;
- gboolean show_copy_path;
/* various */
gboolean tree_descend_subdirs;
Modified: trunk/src/pan-view.c
===================================================================
--- trunk/src/pan-view.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/pan-view.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -2828,9 +2828,8 @@
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,
Modified: trunk/src/preferences.c
===================================================================
--- trunk/src/preferences.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/preferences.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -315,12 +315,6 @@
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 @@
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);
Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/rcfile.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -262,7 +262,6 @@
// 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 @@
/* 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;
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/search.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -1027,9 +1027,8 @@
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);
Modified: trunk/src/view_dir.c
===================================================================
--- trunk/src/view_dir.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/view_dir.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -620,9 +620,8 @@
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);
Modified: trunk/src/view_file.c
===================================================================
--- trunk/src/view_file.c 2009-04-04 21:53:12 UTC (rev 1608)
+++ trunk/src/view_file.c 2009-04-04 22:09:50 UTC (rev 1609)
@@ -580,9 +580,8 @@
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);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
