Fix #619: Man page disagrees with --remote-help

https://github.com/BestImageViewer/geeqie/issues/619

Standardize format for remote commands i.e. ensure all options start
with "--"

diff --git a/geeqie.1 b/geeqie.1
index 5de8c2d..416e30d 100644 (file)
--- a/geeqie.1
+++ b/geeqie.1
@@ -156,10 +156,18 @@ Get list of sidecars of FILE.
 Get destination path of FILE.
 .br
 .B
+.IP file:<FILE>
+Open FILE, bring Geeqie window to the top.
+.br
+.B
 .IP \-\-file:<FILE>
 Open FILE, bring Geeqie window to the top.
 .br
 .B
+.IP File:<FILE>
+Open FILE, do not bring Geeqie window to the top.
+.br
+.B
 .IP \-\-File:<FILE>
 Open FILE, do not bring Geeqie window to the top.
 .br
@@ -196,6 +204,10 @@ Get collection content.
 Get collection list.
 .br
 .B
+.IP view:<FILE>
+Open FILE in new window.
+.br
+.B
 .IP \-\-view:<FILE>
 Open FILE in new window.
 .br
@@ -212,6 +224,10 @@ Add FILE to command line collection list.
 Bring the Geeqie window to the top.
 .br
 .B
+.IP \-\-raise
+Bring the Geeqie window to the top.
+.br
+.B
 .IP \-\-id:<ID>
 Window ID for following commands.
 .br

diff --git a/src/remote.c b/src/remote.c
index 089507a..f281aea 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -1096,7 +1096,9 @@ static RemoteCommandEntry remote_commands[] = {
        { NULL, "--get-sidecars:",      gr_get_sidecars,        TRUE,  FALSE, N_("<FILE>"), N_("get list of sidecars of FILE") },
        { NULL, "--get-destination:",   gr_get_destination,     TRUE,  FALSE, N_("<FILE>"), N_("get destination path of FILE") },
        { NULL, "file:",                gr_file_load,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE, bring Geeqie window to the top") },
+       { NULL, "--file:",              gr_file_load,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE, bring Geeqie window to the top") },
        { NULL, "File:",                gr_file_load_no_raise,  TRUE,  FALSE, N_("<FILE>"), N_("open FILE, do not bring Geeqie window to the top") },
+       { NULL, "--File:",              gr_file_load_no_raise,  TRUE,  FALSE, N_("<FILE>"), N_("open FILE, do not bring Geeqie window to the top") },
        { NULL, "--tell",               gr_file_tell,           FALSE, FALSE, NULL, N_("print filename [and Collection] of current image") },
        { NULL, "--pixel-info",         gr_pixel_info,          FALSE, FALSE, NULL, N_("print pixel info of mouse pointer on current image") },
        { NULL, "--get-rectangle",      gr_rectangle,           FALSE, FALSE, NULL, N_("get rectangle co-ordinates") },
@@ -1106,9 +1108,11 @@ static RemoteCommandEntry remote_commands[] = {
        { NULL, "--get-collection:",    gr_collection,          TRUE,  FALSE, N_("<COLLECTION>"), N_("get collection content") },
        { NULL, "--get-collection-list", gr_collection_list,    FALSE, FALSE, NULL, N_("get collection list") },
        { NULL, "view:",                gr_file_view,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE in new window") },
+       { NULL, "--view:",              gr_file_view,           TRUE,  FALSE, N_("<FILE>"), N_("open FILE in new window") },
        { NULL, "--list-clear",         gr_list_clear,          FALSE, FALSE, NULL, N_("clear command line collection list") },
        { NULL, "--list-add:",          gr_list_add,            TRUE,  FALSE, N_("<FILE>"), N_("add FILE to command line collection list") },
        { NULL, "raise",                gr_raise,               FALSE, FALSE, NULL, N_("bring the Geeqie window to the top") },
+       { NULL, "--raise",              gr_raise,               FALSE, FALSE, NULL, N_("bring the Geeqie window to the top") },
        { NULL, "--id:",                gr_lw_id,               TRUE, FALSE, N_("<ID>"), N_("window id for following commands") },
        { NULL, "--new-window",         gr_new_window,          FALSE, FALSE, NULL, N_("new window") },
        { NULL, "--close-window",       gr_close_window,        FALSE, FALSE, NULL, N_("close window") },