From d557db4eb27ae795e95c64606dc829c143c85e30 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 19 Jul 2018 20:39:58 -0600 Subject: [PATCH] Rename "dtapp" to "dtopen" A great suggestion by Matthew Trower. --- cde/.gitignore | 2 +- cde/databases/CDE-RUN.udb | 24 ++++++------- cde/programs/Imakefile | 2 +- cde/programs/{dtapp => dtopen}/Imakefile | 6 ++-- .../{dtapp/dtapp.src => dtopen/dtopen.src} | 34 +++++++++---------- cde/programs/types/DisplayImage.dt | 4 +-- cde/programs/types/DisplayPDF.dt | 4 +-- cde/programs/types/DisplayPS.dt | 4 +-- cde/programs/types/DisplayVideo.dt | 4 +-- 9 files changed, 42 insertions(+), 42 deletions(-) rename cde/programs/{dtapp => dtopen}/Imakefile (68%) rename cde/programs/{dtapp/dtapp.src => dtopen/dtopen.src} (77%) diff --git a/cde/.gitignore b/cde/.gitignore index 0869c789..9d102689 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -145,7 +145,7 @@ config/util/xmkmf examples/tt/broadcast # Compiled binaries and misc generated program files -programs/dtapp/dtapp +programs/dtopen/dtopen programs/dsdm/dsdm programs/dtaction/dtaction programs/dtappintegrate/dtappintegrate diff --git a/cde/databases/CDE-RUN.udb b/cde/databases/CDE-RUN.udb index 3f9471d2..39ea2bff 100644 --- a/cde/databases/CDE-RUN.udb +++ b/cde/databases/CDE-RUN.udb @@ -2613,34 +2613,34 @@ programs/localized/ja_JP.dt-eucJP/dtsr/jpn.knj # #>>----------------------------- # -# dtapp entries +# dtopen entries # #<<----------------------------- # # -programs/dtapp/dtapp +programs/dtopen/dtopen { default - install_target = /usr/dt/bin/dtapp + install_target = /usr/dt/bin/dtopen mode = 0555 } -# Now the dtapp symlinks -./dtapp +# Now the dtopen symlinks +./dtopen { default - install_target = /usr/dt/bin/dtapp_vimage + install_target = /usr/dt/bin/dtopen_image type = sym_link } -./dtapp +./dtopen { default - install_target = /usr/dt/bin/dtapp_vpdf + install_target = /usr/dt/bin/dtopen_pdf type = sym_link } -./dtapp +./dtopen { default - install_target = /usr/dt/bin/dtapp_vps + install_target = /usr/dt/bin/dtopen_ps type = sym_link } -./dtapp +./dtopen { default - install_target = /usr/dt/bin/dtapp_vvideo + install_target = /usr/dt/bin/dtopen_video type = sym_link } diff --git a/cde/programs/Imakefile b/cde/programs/Imakefile index f0506c97..fd6abf08 100644 --- a/cde/programs/Imakefile +++ b/cde/programs/Imakefile @@ -5,7 +5,7 @@ XCOMM $XConsortium: Imakefile /main/17 1996/10/06 17:13:20 rws $ #if UseNSGMLS NSGMLSDIR = nsgmls #endif -EXTRADIRS = types localized tttypes $(NSGMLSDIR) util dtapp +EXTRADIRS = types localized tttypes $(NSGMLSDIR) util dtopen XCOMM some of these cannot be built on linux yet. XCOMM dtinfo diff --git a/cde/programs/dtapp/Imakefile b/cde/programs/dtopen/Imakefile similarity index 68% rename from cde/programs/dtapp/Imakefile rename to cde/programs/dtopen/Imakefile index 571b9dbf..2347d75d 100644 --- a/cde/programs/dtapp/Imakefile +++ b/cde/programs/dtopen/Imakefile @@ -1,13 +1,13 @@ -XCOMM make dtapp fro dtapp.src +XCOMM make dtopen fro dtopen.src #define PassCDebugFlags -AllTarget(dtapp) +AllTarget(dtopen) LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP) \ -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \ -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) -CppScriptTarget(dtapp,dtapp.src,$(LOCAL_CPP_DEFINES),) +CppScriptTarget(dtopen,dtopen.src,$(LOCAL_CPP_DEFINES),) depend:: diff --git a/cde/programs/dtapp/dtapp.src b/cde/programs/dtopen/dtopen.src similarity index 77% rename from cde/programs/dtapp/dtapp.src rename to cde/programs/dtopen/dtopen.src index 7b1cec18..ff7476fb 100755 --- a/cde/programs/dtapp/dtapp.src +++ b/cde/programs/dtopen/dtopen.src @@ -1,47 +1,47 @@ XCOMM!/bin/ksh XCOMM -XCOMM dtapp - provide an interface for some useful applications. +XCOMM dtopen - provide an interface for some useful applications. XCOMM XCOMM ############################################################# XCOMM #set -x # uncomment for debugging XCOMM ############################################################### XCOMM Init -DTAPP="dtapp" # Identity crisis +DTOPEN="dtopen" # Identity crisis APPNAME="$(basename $0)" # the app to locate/run XCOMM apps to look for, given an action (based on APPNAME - see MAIN) XCOMM image viewing -if [ -z "$DTAPP_VIMAGE" ] +if [ -z "$DTOPEN_VIMAGE" ] then VIMAGE="xv display gimp" else - VIMAGE="$DTAPP_VIMAGE" + VIMAGE="$DTOPEN_VIMAGE" fi XCOMM video viewing -if [ -z "$DTAPP_VVIDEO" ] +if [ -z "$DTOPEN_VVIDEO" ] then VVIDEO="vlc ffplay" else - VVIDEO="$DTAPP_VVIDEO" + VVIDEO="$DTOPEN_VVIDEO" fi XCOMM postscript viewing -if [ -z "$DTAPP_VPS" ] +if [ -z "$DTOPEN_VPS" ] then VPS="mgv gv" else - VPS="$DTAPP_VPS" + VPS="$DTOPEN_VPS" fi XCOMM PDF viewing -if [ -z "$DTAPP_VPDF" ] +if [ -z "$DTOPEN_VPDF" ] then VPDF="okular xpdf" else - VPDF="$DTAPP_VPDF" + VPDF="$DTOPEN_VPDF" fi XCOMM ############################################################## @@ -101,7 +101,7 @@ DoSimpleCmd() if [ $didone -eq 0 ] then # couldn't find a viewer ErrorMsg "Helper not found" \ - "${DTAPP}: Could not find any of the following\ncommands for this file type:\n\n$cmds" + "${DTOPEN}: Could not find any of the following\ncommands for this file type:\n\n$cmds" fi return 0 @@ -115,24 +115,24 @@ XCOMM # We'll just look at our args and decide what to do... XCOMM # Commands we'll recognize -COMMANDS="dtapp_vimage dtapp_vweb dtapp_vpdf dtapp_vps dtapp_vvideo" +COMMANDS="dtopen_image dtopen_pdf dtopen_ps dtopen_video" case $APPNAME in - dtapp_vimage) + dtopen_image) DoSimpleCmd "$VIMAGE" $* ;; - dtapp_vpdf) + dtopen_pdf) DoSimpleCmd "$VPDF" $* ;; - dtapp_vps) + dtopen_ps) DoSimpleCmd "$VPS" $* ;; - dtapp_vvideo) + dtopen_video) DoSimpleCmd "$VVIDEO" $* ;; *) # Unknown - ErrorMsg "${DTAPP}: Unknown Helper Application" \ + ErrorMsg "${DTOPEN}: Unknown Helper Application" \ "\"$APPNAME\" is not a recognized Helper Application. \nKnown Helper Applications are:\n\n$COMMANDS" ;; esac diff --git a/cde/programs/types/DisplayImage.dt b/cde/programs/types/DisplayImage.dt index b27a8d11..adb847f7 100644 --- a/cde/programs/types/DisplayImage.dt +++ b/cde/programs/types/DisplayImage.dt @@ -11,7 +11,7 @@ ACTION DisplayImage ICON camera EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT 0 - EXEC_STRING dtapp_vimage %(File)"Name of image file to display:"% + EXEC_STRING dtopen_image %(File)"Name of image file to display:"% WINDOW_TYPE NO_STDIO DESCRIPTION Display image } @@ -24,7 +24,7 @@ ACTION DisplayImage ICON camera EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT >0 - EXEC_STRING dtapp_vimage %(File)Args% + EXEC_STRING dtopen_image %(File)Args% WINDOW_TYPE NO_STDIO DESCRIPTION Edit image file. } diff --git a/cde/programs/types/DisplayPDF.dt b/cde/programs/types/DisplayPDF.dt index 110ecf9f..abde59b6 100644 --- a/cde/programs/types/DisplayPDF.dt +++ b/cde/programs/types/DisplayPDF.dt @@ -11,7 +11,7 @@ ACTION DisplayPDF ICON camera EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT 0 - EXEC_STRING dtapp_vpdf %(File)"Name of PDF file to display:"% + EXEC_STRING dtopen_pdf %(File)"Name of PDF file to display:"% WINDOW_TYPE NO_STDIO DESCRIPTION Display image } @@ -24,7 +24,7 @@ ACTION DisplayPDF ICON camera EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT >0 - EXEC_STRING dtapp_vpdf %(File)Args% + EXEC_STRING dtopen_pdf %(File)Args% WINDOW_TYPE NO_STDIO DESCRIPTION Edit image file. } diff --git a/cde/programs/types/DisplayPS.dt b/cde/programs/types/DisplayPS.dt index 9bc825ad..d5a7b321 100644 --- a/cde/programs/types/DisplayPS.dt +++ b/cde/programs/types/DisplayPS.dt @@ -11,7 +11,7 @@ ACTION DisplayPS ICON camera EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT 0 - EXEC_STRING dtapp_vps %(File)"Name of PS file to display:"% + EXEC_STRING dtopen_ps %(File)"Name of PS file to display:"% WINDOW_TYPE NO_STDIO DESCRIPTION Display image } @@ -24,7 +24,7 @@ ACTION DisplayPS ICON camera EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT >0 - EXEC_STRING dtapp_vps %(File)Args% + EXEC_STRING dtopen_ps %(File)Args% WINDOW_TYPE NO_STDIO DESCRIPTION Edit image file. } diff --git a/cde/programs/types/DisplayVideo.dt b/cde/programs/types/DisplayVideo.dt index 9ce561da..7faafeea 100644 --- a/cde/programs/types/DisplayVideo.dt +++ b/cde/programs/types/DisplayVideo.dt @@ -11,7 +11,7 @@ ACTION DisplayVideo ICON video EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT 0 - EXEC_STRING dtapp_vvideo %(File)"Name of video file to display:"% + EXEC_STRING dtopen_video %(File)"Name of video file to display:"% WINDOW_TYPE NO_STDIO DESCRIPTION Play video file } @@ -24,7 +24,7 @@ ACTION DisplayVideo ICON video EXEC_HOST %DatabaseHost%, %LocalHost% ARG_COUNT >0 - EXEC_STRING dtapp_vvideo %(File)Args% + EXEC_STRING dtopen_video %(File)Args% WINDOW_TYPE NO_STDIO DESCRIPTION Play video file. } -- 2.25.1