1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

Remove dtinfo launcher and icons from the default front panel.

Use the help system instead.  Someday, if dtinfo can be made to work,
this can be undone easily.  Note, you may have to clear out your ~/.dt
dir to see the change.
This commit is contained in:
Jon Trulson 2012-06-19 19:22:08 -06:00
parent 4f5c5a65a7
commit f7e87eb7f3
2 changed files with 36 additions and 3 deletions

View file

@ -5,6 +5,8 @@ CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \
#if defined (SunArchitecture) #if defined (SunArchitecture)
LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun LOCAL_CPP_DEFINES = $(CPP_DEFINES) -D__sun
#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
LOCAL_CPP_DEFINES = $(CPP_DEFINES) -DNO_DTINFO
#else #else
LOCAL_CPP_DEFINES = $(CPP_DEFINES) LOCAL_CPP_DEFINES = $(CPP_DEFINES)
#endif #endif

View file

@ -182,7 +182,21 @@ CONTROL Applications
HELP_VOLUME FPanel HELP_VOLUME FPanel
} }
#ifdef NO_DTINFO
CONTROL Help
{
TYPE icon
CONTAINER_NAME Top
CONTAINER_TYPE BOX
POSITION_HINTS 12
ICON Fphelp
LABEL %|nls-18009-#Help Manager#|
PUSH_ACTION Dthelpview
DROP_ACTION Dthelpview
HELP_TOPIC FPOnItemHelpMgr
HELP_VOLUME FPanel
}
#else
CONTROL InfoManager CONTROL InfoManager
{ {
TYPE icon TYPE icon
@ -196,7 +210,7 @@ CONTROL InfoManager
HELP_TOPIC FPOnItemInfoMgr HELP_TOPIC FPOnItemInfoMgr
HELP_VOLUME FPanel HELP_VOLUME FPanel
} }
#endif
CONTROL Trash CONTROL Trash
{ {
@ -335,16 +349,28 @@ CONTROL PrintManager
HELP_VOLUME Printmgr HELP_VOLUME Printmgr
} }
#ifndef NO_DTINFO
SUBPANEL InfoManagerSubpanel SUBPANEL InfoManagerSubpanel
{ {
CONTAINER_NAME InfoManager CONTAINER_NAME InfoManager
TITLE %|nls-18032-#Information#| TITLE %|nls-18032-#Information#|
} }
#else
SUBPANEL HelpSubpanel
{
CONTAINER_NAME Help
TITLE %|nls-18019-#Help#|
}
#endif
CONTROL HelpOverview CONTROL HelpOverview
{ {
TYPE icon TYPE icon
#ifndef NO_DTINFO
CONTAINER_NAME InfoManagerSubpanel CONTAINER_NAME InfoManagerSubpanel
#else
CONTAINER_NAME HelpSubpanel
#endif
CONTAINER_TYPE SUBPANEL CONTAINER_TYPE SUBPANEL
POSITION_HINTS 1 POSITION_HINTS 1
ICON Dthover ICON Dthover
@ -357,7 +383,11 @@ CONTROL HelpOverview
CONTROL FPHelp CONTROL FPHelp
{ {
TYPE icon TYPE icon
#ifndef NO_DTINFO
CONTAINER_NAME InfoManagerSubpanel CONTAINER_NAME InfoManagerSubpanel
#else
CONTAINER_NAME HelpSubpanel
#endif
CONTAINER_TYPE SUBPANEL CONTAINER_TYPE SUBPANEL
POSITION_HINTS 2 POSITION_HINTS 2
ICON Fpfphlp ICON Fpfphlp
@ -367,6 +397,7 @@ CONTROL FPHelp
HELP_VOLUME FPanel HELP_VOLUME FPanel
} }
#ifndef NO_DTINFO
CONTROL HelpMgr CONTROL HelpMgr
{ {
TYPE icon TYPE icon
@ -379,7 +410,7 @@ CONTROL HelpMgr
HELP_TOPIC FPOnItemHelpMgr HELP_TOPIC FPOnItemHelpMgr
HELP_VOLUME FPanel HELP_VOLUME FPanel
} }
#endif
XCOMM XCOMM
XCOMM OnItem help uses a pseudo push action FPOnItemHelp. Dtwm is looking for XCOMM OnItem help uses a pseudo push action FPOnItemHelp. Dtwm is looking for