From 9c00154f193cdd64c845e3d08e2569c690d2356f Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Wed, 11 Oct 2017 19:24:57 +0100 Subject: [PATCH] Rename External Editors to Plugins --- ...ng.xml => GuideImageManagementPlugins.xml} | 20 ++++---- doc/docbook/GuideIndex.xml | 4 +- doc/docbook/GuideMainWindowMenus.xml | 33 +++++++----- doc/docbook/GuideOptionsAdditional.xml | 2 +- ...itorsConfig.xml => GuidePluginsConfig.xml} | 51 +++++++++---------- doc/docbook/GuideSidebarsSortManager.xml | 2 +- plugins/template.desktop | 2 +- src/desktop_file.c | 4 +- src/editors.c | 2 +- src/layout_util.c | 10 ++-- 10 files changed, 66 insertions(+), 64 deletions(-) rename doc/docbook/{GuideImageManagementExternalEditing.xml => GuideImageManagementPlugins.xml} (60%) rename doc/docbook/{GuideEditorsConfig.xml => GuidePluginsConfig.xml} (79%) diff --git a/doc/docbook/GuideImageManagementExternalEditing.xml b/doc/docbook/GuideImageManagementPlugins.xml similarity index 60% rename from doc/docbook/GuideImageManagementExternalEditing.xml rename to doc/docbook/GuideImageManagementPlugins.xml index 3ef4df6d..2a3cb902 100644 --- a/doc/docbook/GuideImageManagementExternalEditing.xml +++ b/doc/docbook/GuideImageManagementPlugins.xml @@ -1,10 +1,9 @@ - - External Actions - Geeqie provides the facility to execute external commands. In Geeqie these are called external editors. - However these commands are not limited to editing images - any external command may be called via this facility. + + Plugins + Geeqie provides the facility to execute external commands - any external command may be called via this facility. Actions may be performed on a single file, or on a set of selected files. - External editors can do anything from running simple operations like symlink to activating fully featured programs like Gimp. Nor does the action have to be performed on files - you may, for instance, configure an editor to download images from your digital camera. + Plugins can do anything from running simple operations like symlink to activating fully featured programs like Gimp. Nor does the action have to be performed on files - you may, for instance, configure a plugin to download images from your digital camera. To perform these actions, Geeqie uses standard desktop @@ -12,25 +11,24 @@ It is not necessary to understand the details of desktop file specifications because the - + dialogue presents you with an easy-to-use template. This dialogue is accessed via Edit - Configure Editors + Configure Plugins . - Editors will appear in the menu + Plugins will appear in the menu - Edit - External Editors + Plugins , unless specified otherwise in the desktop file. Commands that are set to display their output in a window will show a dialogue when the command is executed. - The Result dialogue will display the command's text output. If the editor command will result in multiple runs of the same command for each file, you can use the Stop button to stop Geeqie from executing the command for remaining files. + The Result dialogue will display the command's text output. If the plugin command will result in multiple runs of the same command for each file, you can use the Stop button to stop Geeqie from executing the command for remaining files. Once all commands have completed, or if the Stop button was pressed and the pending command has completed, you can use the Close button, or press Escape diff --git a/doc/docbook/GuideIndex.xml b/doc/docbook/GuideIndex.xml index 8265699d..2cba5d8e 100644 --- a/doc/docbook/GuideIndex.xml +++ b/doc/docbook/GuideIndex.xml @@ -64,7 +64,7 @@ - + @@ -77,4 +77,4 @@ - + diff --git a/doc/docbook/GuideMainWindowMenus.xml b/doc/docbook/GuideMainWindowMenus.xml index 7fb1c799..7bca27ff 100644 --- a/doc/docbook/GuideMainWindowMenus.xml +++ b/doc/docbook/GuideMainWindowMenus.xml @@ -540,20 +540,6 @@
Edit menu - - - - External Editors - - - - - This submenu contains external editors that were found on the system. See - Editors section - for details. - - - @@ -909,6 +895,25 @@
+
+ Plugins menu + + + + + Plugins + + + + + This menu contains the plugins (desktop files) that were found on the system. See the + Plugins section + for details. + + + + +
View menu diff --git a/doc/docbook/GuideOptionsAdditional.xml b/doc/docbook/GuideOptionsAdditional.xml index 08383e06..a1186001 100644 --- a/doc/docbook/GuideOptionsAdditional.xml +++ b/doc/docbook/GuideOptionsAdditional.xml @@ -8,7 +8,7 @@ - + diff --git a/doc/docbook/GuideEditorsConfig.xml b/doc/docbook/GuidePluginsConfig.xml similarity index 79% rename from doc/docbook/GuideEditorsConfig.xml rename to doc/docbook/GuidePluginsConfig.xml index a50b90b9..6977b434 100644 --- a/doc/docbook/GuideEditorsConfig.xml +++ b/doc/docbook/GuidePluginsConfig.xml @@ -1,19 +1,19 @@ -
- External Editor Configuration +
+ Plugins Configuration -
- Editor Configuration Dialog +
+ Plugins Configuration Dialog - This dialog allows user to add new editors or modify the system ones. It is available in the menu + This dialog allows user to add new plugins or modify the system ones. It is available in the menu Edit - Configure Editors + Configure Plugins . - The Editors dialog shows list of all relevant editors i.e. all installed desktop files that are designated either: + The Plugins dialog shows list of all relevant plugins i.e. all installed desktop files that are designated either: > @@ -32,7 +32,7 @@ Name - Editor name as specified in desktop file, and is the name displayed in menus. + Plugin name as specified in desktop file, and is the name displayed in menus. @@ -40,7 +40,7 @@ Hidden - An editor can be + A plugin can be Hidden for one of these reasons: @@ -88,8 +88,8 @@
-
- Adding new editor +
+ Adding new plugin @@ -105,8 +105,8 @@
-
- Modifying an existing editor +
+ Modifying an existing plugin @@ -119,8 +119,8 @@ opens a text editor with existing desktop file. For desktop files that are not writable by user, it allows saving to a Geeqie specific directory, where it overrides the system file (but only for Geeqie).
-
- Deleting an editor +
+ Deleting a plugin @@ -135,8 +135,8 @@ , see above.
-
- Special editors +
+ Special plugins A desktop file with one of the following names has a special function. It will replace the corresponding internal command. @@ -159,10 +159,9 @@ - A menu path where the editor will appear, instead of in the default + A menu path where the plugin will appear, instead of in the default - Edit - External Editors + Plugins , can be set by including: X-Geeqie-Menu-Path=<FileMenuPath> @@ -184,12 +183,12 @@ SelectMenu/ClipboardSection SelectMenu/MarksSection EditMenu/EditMenu - EditMenu/ExternalMenu EditMenu/EditSection EditMenu/OrientationMenu EditMenu/RatingMenu EditMenu/PropertiesSection EditMenu/PreferencesSection + PluginsMenu ViewMenu ViewMenu/WindowSection ViewMenu/FileDirMenu @@ -210,7 +209,7 @@ - If you want an editor to use a user-definable path, the following entry must be made in the desktop file: + If you want a plugin to use a user-definable path, the following entry must be made in the desktop file: X-Geeqie-Filter=true @@ -218,7 +217,7 @@ . The path of the bookmark clicked will be used by the desktop file. - If the desktop file is called from the menu, when the external editor is executed you are presented with a dialogue which enables a path to be selected. The path selected, appended by the filename currently being processed, is made available to the editor script either as an environment variable or via a call to geeqie --remote. The following code demonstrates the use of both methods: + If the desktop file is called from the menu, when the plugin is executed you are presented with a dialogue which enables a path to be selected. The path selected, appended by the filename currently being processed, is made available to the shell script either as an environment variable or via a call to geeqie --remote. The following code demonstrates the use of both methods: for file in "$@" do @@ -230,15 +229,15 @@ - If you want to run an editor in full-screen mode and wish full-screen to be maintained, include the following entry in the desktop file: + If you want to run a plugin in full-screen mode and wish full-screen to be maintained, include the following entry in the desktop file: X-Geeqie-Keep-Fullscreen=true - Any terminal output from the editor command can be displayed with the following command: + Any terminal output from the plugin command can be displayed with the following command: X-Geeqie-Verbose=true - The editor can be restricted to run on only certain file types, for example: + The plugin can be restricted to run on only certain file types, for example: X-Geeqie-File-Extensions=.jpg; .cr2 The entries are case insensitive. diff --git a/doc/docbook/GuideSidebarsSortManager.xml b/doc/docbook/GuideSidebarsSortManager.xml index c2e77da5..36e41f5a 100644 --- a/doc/docbook/GuideSidebarsSortManager.xml +++ b/doc/docbook/GuideSidebarsSortManager.xml @@ -60,7 +60,7 @@ Copy, Move, Link and Desktop actions Copy, Move and Symbolic Link are available operations to use on the active image; they should be self explanatory. In some cases, Desktop files are also listed. This is detailed in - +
diff --git a/plugins/template.desktop b/plugins/template.desktop index 49e84378..276fe9b4 100644 --- a/plugins/template.desktop +++ b/plugins/template.desktop @@ -62,12 +62,12 @@ OnlyShowIn=X-Geeqie; # SelectMenu/ClipboardSection # SelectMenu/MarksSection # EditMenu -# EditMenu/ExternalMenu # EditMenu/EditSection # EditMenu/OrientationMenu # EditMenu/RatingMenu # EditMenu/PropertiesSection # EditMenu/PreferencesSection +# PluginsMenu # ViewMenu # ViewMenu/WindowSection # ViewMenu/FileDirMenu diff --git a/src/desktop_file.c b/src/desktop_file.c index f3f23a40..a6ad7705 100644 --- a/src/desktop_file.c +++ b/src/desktop_file.c @@ -385,7 +385,7 @@ static void editor_list_window_new_cb(GtkWidget *widget, gpointer data) static void editor_list_window_help_cb(GtkWidget *widget, gpointer data) { - help_window_show("GuideEditorsConfig.html"); + help_window_show("GuidePluginsConfig.html"); } static void editor_list_window_selection_changed_cb(GtkWidget *widget, gpointer data) @@ -464,7 +464,7 @@ static void editor_list_window_create(void) editor_list_window = ewl = g_new0(EditorListWindow, 1); - ewl->window = window_new(GTK_WINDOW_TOPLEVEL, "editors", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Editors")); + ewl->window = window_new(GTK_WINDOW_TOPLEVEL, "editors", PIXBUF_INLINE_ICON_CONFIG, NULL, _("Plugins")); gtk_window_set_type_hint(GTK_WINDOW(ewl->window), GDK_WINDOW_TYPE_HINT_DIALOG); g_signal_connect(G_OBJECT(ewl->window), "delete_event", G_CALLBACK(editor_list_window_delete), NULL); diff --git a/src/editors.c b/src/editors.c index b8d72594..1fee9c52 100644 --- a/src/editors.c +++ b/src/editors.c @@ -308,7 +308,7 @@ gboolean editor_read_desktop_file(const gchar *path) editor->exec = g_key_file_get_string(key_file, DESKTOP_GROUP, "Exec", NULL); editor->menu_path = g_key_file_get_string(key_file, DESKTOP_GROUP, "X-Geeqie-Menu-Path", NULL); - if (!editor->menu_path) editor->menu_path = g_strdup("EditMenu/ExternalMenu"); + if (!editor->menu_path) editor->menu_path = g_strdup("PluginsMenu"); editor->hotkey = g_key_file_get_string(key_file, DESKTOP_GROUP, "X-Geeqie-Hotkey", NULL); diff --git a/src/layout_util.c b/src/layout_util.c index fcc21b37..3495a374 100644 --- a/src/layout_util.c +++ b/src/layout_util.c @@ -1711,7 +1711,6 @@ static GtkActionEntry menu_entries[] = { { "SelectMenu", NULL, N_("_Select"), NULL, NULL, NULL }, { "OrientationMenu", NULL, N_("_Orientation"), NULL, NULL, NULL }, { "RatingMenu", NULL, N_("_Rating"), NULL, NULL, NULL }, - { "ExternalMenu", NULL, N_("E_xternal Editors"), NULL, NULL, NULL }, { "PreferencesMenu", NULL, N_("P_references"), NULL, NULL, NULL }, { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL }, { "FileDirMenu", NULL, N_("_Files and Folders"), NULL, NULL, NULL }, @@ -1721,6 +1720,7 @@ static GtkActionEntry menu_entries[] = { { "SplitMenu", NULL, N_("Spli_t"), NULL, NULL, NULL }, { "StereoMenu", NULL, N_("Stere_o"), NULL, NULL, NULL }, { "OverlayMenu", NULL, N_("Image _Overlay"), NULL, NULL, NULL }, + { "PluginsMenu", NULL, N_("_Plugins"), NULL, NULL, NULL }, { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, { "FirstImage", GTK_STOCK_GOTO_TOP, N_("_First Image"), "Home", N_("First Image"), CB(layout_menu_image_first_cb) }, @@ -1773,7 +1773,7 @@ static GtkActionEntry menu_entries[] = { { "SelectNone", NULL, N_("Select _none"), "A", N_("Select none"), CB(layout_menu_unselect_all_cb) }, { "SelectInvert", NULL, N_("_Invert Selection"), "I", N_("Invert Selection"), CB(layout_menu_invert_selection_cb) }, { "Preferences", GTK_STOCK_PREFERENCES, N_("P_references..."), "O", N_("Preferences..."), CB(layout_menu_config_cb) }, - { "Editors", GTK_STOCK_PREFERENCES, N_("Configure _Editors..."), NULL, N_("Configure Editors..."), CB(layout_menu_editors_cb) }, + { "Plugins", GTK_STOCK_PREFERENCES, N_("Configure _Plugins..."), NULL, N_("Configure Plugins..."), CB(layout_menu_editors_cb) }, { "LayoutConfig", GTK_STOCK_PREFERENCES, N_("_Configure this window..."), NULL, N_("Configure this window..."), CB(layout_menu_layout_config_cb) }, { "Maintenance", GTK_STOCK_FILE, N_("_Thumbnail maintenance..."), NULL, N_("Thumbnail maintenance..."), CB(layout_menu_remove_thumb_cb) }, { "Wallpaper", NULL, N_("Set as _wallpaper"), NULL, N_("Set as wallpaper"), CB(layout_menu_wallpaper_cb) }, @@ -1966,8 +1966,6 @@ static const gchar *menu_ui_description = " " " " " " -" " -" " " " " " " " @@ -1998,7 +1996,7 @@ static const gchar *menu_ui_description = " " " " " " -" " +" " " " " " " " @@ -2008,6 +2006,8 @@ static const gchar *menu_ui_description = #endif " " " " +" " +" " " " " " " " -- 2.20.1