From c6038f4b51e615a5311af1662070738689bf42be Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sat, 22 Feb 2014 19:16:34 -0700
Subject: [PATCH] Re-add NO_DTINFO blocks removed in NetBSD port patch

---
 cde/programs/types/dtwm.fp.src | 64 ++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 15 deletions(-)

diff --git a/cde/programs/types/dtwm.fp.src b/cde/programs/types/dtwm.fp.src
index 00562ec3..69ece3ef 100644
--- a/cde/programs/types/dtwm.fp.src
+++ b/cde/programs/types/dtwm.fp.src
@@ -182,6 +182,7 @@ CONTROL Applications
   HELP_VOLUME		FPanel
 }
 
+#ifdef NO_DTINFO
 CONTROL Help
 {
   TYPE                  icon
@@ -195,6 +196,21 @@ CONTROL Help
   HELP_TOPIC            FPOnItemHelpMgr
   HELP_VOLUME           FPanel
 }
+#else
+CONTROL InfoManager
+{
+  TYPE			icon
+  CONTAINER_NAME	Top
+  CONTAINER_TYPE	BOX
+  POSITION_HINTS	12
+  ICON			Dtinfo
+  LABEL			%|nls-18031-#Information Manager#|
+  PUSH_ACTION		DtLoadInfoLib
+  DROP_ACTION		DtLoadInfoLib
+  HELP_TOPIC		FPOnItemInfoMgr
+  HELP_VOLUME		FPanel
+}
+#endif
 
 CONTROL Trash
 {
@@ -333,16 +349,28 @@ CONTROL PrintManager
   HELP_VOLUME		Printmgr
 }
 
+#ifndef NO_DTINFO
+SUBPANEL InfoManagerSubpanel
+{
+  CONTAINER_NAME	InfoManager
+  TITLE			%|nls-18032-#Information#|
+}
+#else
 SUBPANEL HelpSubpanel
 {
   CONTAINER_NAME        Help
   TITLE                 %|nls-18019-#Help#|
 }
+#endif
 
 CONTROL HelpOverview
 {
   TYPE			icon
+#ifndef NO_DTINFO
+  CONTAINER_NAME	InfoManagerSubpanel
+#else
   CONTAINER_NAME        HelpSubpanel
+#endif
   CONTAINER_TYPE	SUBPANEL
   POSITION_HINTS	1
   ICON			Dthover
@@ -355,7 +383,11 @@ CONTROL HelpOverview
 CONTROL FPHelp
 {
   TYPE			icon
+#ifndef NO_DTINFO
+  CONTAINER_NAME	InfoManagerSubpanel
+#else
   CONTAINER_NAME	HelpSubpanel
+#endif
   CONTAINER_TYPE	SUBPANEL
   POSITION_HINTS	2
   ICON			Fpfphlp
@@ -365,6 +397,21 @@ CONTROL FPHelp
   HELP_VOLUME		FPanel
 }
 
+#ifndef NO_DTINFO
+CONTROL HelpMgr
+{
+  TYPE                  icon
+  CONTAINER_NAME	InfoManagerSubpanel
+  CONTAINER_TYPE	SUBPANEL
+  POSITION_HINTS	3
+  ICON                  Fphelp
+  LABEL                 %|nls-18009-#Help Manager#|
+  PUSH_ACTION           Dthelpview
+  HELP_TOPIC            FPOnItemHelpMgr
+  HELP_VOLUME           FPanel
+}
+#endif
+
 XCOMM 
 XCOMM  OnItem help uses a pseudo push action FPOnItemHelp.  Dtwm is looking for
 XCOMM  an exact match on this push action string.  Do not localize this push 
@@ -374,9 +421,9 @@ XCOMM
 CONTROL OnItem
 {
   TYPE			icon
-  CONTAINER_NAME	HelpSubpanel
+  CONTAINER_NAME	InfoManagerSubpanel
   CONTAINER_TYPE	SUBPANEL
-  POSITION_HINTS	3
+  POSITION_HINTS	4
   ICON			DthonFP
   LABEL			%|nls-18021-#On Item Help#|
   PUSH_ACTION		FPOnItemHelp
@@ -384,19 +431,6 @@ CONTROL OnItem
   HELP_VOLUME		FPanel
 }
 
-CONTROL InfoMgr
-{
-  TYPE                  icon
-  CONTAINER_NAME	HelpSubpanel
-  CONTAINER_TYPE	SUBPANEL
-  POSITION_HINTS	4
-  ICON                  Dtinfo
-  LABEL                 %|nls-18031-#Information Manager#|
-  PUSH_ACTION           DtLoadInfoLib
-  HELP_TOPIC            FPOnItemInfoMgr
-  HELP_VOLUME           FPanel
-}
-
 ANIMATION TrashDrop
 {
    ANIMATION	Fptrsh1		100
-- 
2.25.1