From f4572a376bfa5f79b4225f75e61a507a4c9fb5f1 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sat, 25 Jun 2005 17:27:41 +0000
Subject: [PATCH] r3983: Made --top, --bottom, --left and --right work as
 before. -b is now short for --border instead of --bottom.

---
 ROX-Filer/Help/Changes |  9 ++++-----
 ROX-Filer/src/main.c   | 33 ++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 6b009407..2ddde64a 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -4,11 +4,10 @@
 
 25-Jun-2005
 ~~~~~~~~~~~
-Panel side is now stored with the panel file, and is reused on start-up.
-Replaced --top, --bottom, --left and --right options with --border, which
-uses the value in the file. The old options still work for compatibility.
-The panel menu has a new 'Panel Options...' choice to let you change which
-edge to use (Thomas Leonard).
+Panel side is now stored with the panel file, and is reused on start-up if
+you use --border in place of the old --top, --bottom, --left and --right
+(which still work). The panel menu has a new 'Panel Options...' choice to let
+you change which edge to use (Thomas Leonard).
 
 11-Jun-2005
 ~~~~~~~~~~~
diff --git a/ROX-Filer/src/main.c b/ROX-Filer/src/main.c
index ffff0dc6..a10d153e 100644
--- a/ROX-Filer/src/main.c
+++ b/ROX-Filer/src/main.c
@@ -117,17 +117,20 @@ GtkTooltips *tooltips = NULL;
        "Open each directory or file listed, or the current working\n"	\
        "directory if no arguments are given.\n\n"			\
        "  -b, --border=PANEL	open PANEL as a border panel\n"	\
-       "  -B, --remove-panel=SIDE  remove panel (Top|Bottom|Left|Right)\n"  \
+       "  -b, --bottom=PANEL	open PAN as a bottom-edge panel\n"	\
        "  -c, --client-id=ID	used for session management\n"		\
        "  -d, --dir=DIR		open DIR as directory (not application)\n"  \
        "  -D, --close=DIR	close DIR and its subdirectories\n"     \
        "  -h, --help		display this help and exit\n"		\
+       "  -l, --left=PANEL	open PAN as a left-edge panel\n"	\
        "  -m, --mime-type=FILE	print MIME type of FILE and exit\n" \
        "  -n, --new		start new copy; for debugging the filer\n"  \
        "  -p, --pinboard=PIN	use pinboard PIN as the pinboard\n"	\
+       "  -r, --right=PANEL	open PAN as a right-edge panel\n"	\
        "  -R, --RPC		invoke method call read from stdin\n"	\
        "  -s, --show=FILE	open a directory showing FILE\n"	\
        "  -S, --rox-session	use default panel and pinboard options, and -n\n"\
+       "  -t, --top=PANEL	open PANEL as a top-edge panel\n"	\
        "  -u, --user		show user name in each window \n"	\
        "  -v, --version		display the version information and exit\n"   \
        "  -x, --examine=FILE	FILE has changed - re-examine it\n"	\
@@ -141,8 +144,7 @@ static struct option long_opts[] =
 {
 	{"dir", 1, NULL, 'd'},
 	{"top", 1, NULL, 't'},
-	{"remove-panel", 1, NULL, 'B'},
-	{"bottom", 1, NULL, 'b'},
+	{"bottom", 1, NULL, 'B'},
 	{"border", 1, NULL, 'b'},
 	{"left", 1, NULL, 'l'},
 	{"override", 0, NULL, 'o'},
@@ -435,19 +437,24 @@ int main(int argc, char **argv)
 			case 'l':
 			case 'r':
 			case 't':
-			case 'b':
-				/* We used to have --top, --bottom,
-				 * --left and --right. Now, treat them all
-				 * as --border.
-				 */
-
+			case 'B':
 				/* Argument is a leaf (or starts with /) */
 				soap_add(body, "Panel", "Name", VALUE,
-					 NULL, NULL);
+					 "Side", c == 'l' ? "Left" :
+						 c == 'r' ? "Right" :
+						 c == 't' ? "Top" :
+						 c == 'B' ? "Bottom" :
+						 "Unkown");
 				break;
-			case 'B':
-				soap_add(body, "Panel", "Side", VALUE,
-					 NULL, NULL);
+			case 'b':
+				/* Argument is a leaf (or starts with /) */
+				if (*VALUE)
+					soap_add(body, "Panel", "Name", VALUE,
+							NULL, NULL);
+				else
+					soap_add(body, "Panel",
+							"Side", "Bottom",
+							NULL, NULL);
 				break;
 			case 'p':
 				soap_add(body, "Pinboard",
-- 
2.11.4.GIT