Changeset 1009

Timestamp:

Feb 1, 2017, 3:22:45 PM (8 years ago)

Author:

Alex Taylor

Message:

Enable use of different program name (for WPS objects, configuration files, etc.) if optional message is defined.

File:

• trunk/guitools/evfsgui/evfsgui.vrx (modified) (12 diffs)

trunk/guitools/evfsgui/evfsgui.vrx ¶

@@ -128 +128 @@
 
     /* OS Version */
-    if VRFileExists(SysBootDrive()||"\SYS\ARCANOAE.FLG" ) then do
-        OS = linein(SysBootDrive()||"\SYS\ARCANOAE.FLG")
+    if VRFileExists(SysBootDrive()||"\SYS\INSTALL\INSTALL.FLG" ) then do
+        OS = linein(SysBootDrive()||"\SYS\INSTALL\INSTALL.FLG")
         OS = subword(OS,1,2) '('translate(word(OS,3))')'
-        ok = stream(SysBootDrive()||"\SYS\ARCANOAE.FLG",'c','close')
+        ok = stream(SysBootDrive()||"\SYS\INSTALL\INSTALL.FLG",'c','close')
     end
     else if VRFileExists(SysBootDrive()||"\ECS\ECS_INST.FLG" ) then do
@@ -239 +239 @@
     /* GUI Version */
     DummyRH = VRMethod('CN_About', 'AddRecord')
-    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "EVFSGUI", About.ValFH, VRGet("Main", "HintText"))
-    AboutStr = AboutStr||'0D0A'x||"EVFSGUI "||'09'x || VRGet("Main", "HintText")||BR
+    ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, options.!appname_long, About.ValFH, VRGet("Main", "HintText"))
+    AboutStr = AboutStr||'0D0A'x||"options.!appname_long "||'09'x || VRGet("Main", "HintText")||BR
     call VRSet "SW_ABOUT", "Painting", 1
 return
@@ -551 +551 @@
 _CreateSmbConf:
     if options.!debug == 1 then say time()' '||"_CreateSmbConf started"
-    call lineout samba.!smbconf, '# Samba config file created using EVFSGUI ver. 'word(VRGet("Main","Hinttext"),2)
+    call lineout samba.!smbconf, '# Samba config file created using' options.!appname_long 'ver. 'word(VRGet("Main","Hinttext"),2)
     call lineout samba.!smbconf, '# from 'value("USER",,'OS2ENVIRONMENT')'@'value("HOSTNAME",,'OS2ENVIRONMENT')
     call lineout samba.!smbconf, '# Date: 'date()' 'time()
@@ -884 +884 @@
     inipath = VRParseFilePath( os2_ini, 'DP')
     IF inipath == '' THEN inipath = SysBootDrive() || '\OS2'
-    settings.!ini = inipath'\evfsgui.ini'
+    settings.!ini = inipath'\'options.!appname_short'.INI'
     drop os2_ini inipath
-    if options.!debug == 1 then say '  EVFSGUI INIfile = "'settings.!ini'"'
+    if options.!debug == 1 then say '  'options.!appname_long' INIfile = "'settings.!ini'"'
 
     settings.!network = ""
@@ -1260 +1260 @@
         then xxx = "VX-REXX IDE: "strip(translate(word(sourceline(SIGL-1),4),'  ',"',"))
         else xxx = 'A'
-    call VRMessage 'Main', xxx' REXX function library DLL is missing or unloadable!', "EVFSGUI fatal error", "E"
+    call VRMessage 'Main', xxx' REXX function library DLL is missing or unloadable!', options.!appname_long "fatal error", "E"
     IF options.!debug == 1 then say time()' _LoadotherFuncs() error handler finished, program will be terminated.'
 signal Quit
@@ -1603 +1603 @@
     options.!tracmark   = 0
 
+    app_name_msg = NLVGetMessage( 0 )
+    IF app_name_msg == '' | WORD( app_name_msg, 1 ) == '[Missing' THEN 
+        app_name_msg = 'EVFSGUI EVFSGUI'
+
+    /* These values are used in things like config files, WPS objects, etc.
+     */
+    options.!appname_short = TRANSLATE( SUBWORD( app_name_msg, 1, 1 ))
+    options.!appname_long = SUBWORD( app_name_msg, 2 )
+
     if options.!debug == 1 then say '  initializing vfs. '
     vfs.!drive      = ''
@@ -1826 +1835 @@
         ok = SysFileDelete(SysBootDrive()'\ndpsmb.dbg')
     else do
-        call lineout SysBootDrive()'\ndpsmb.dbg','EVFS debug flag file'
+        call lineout SysBootDrive()'\ndpsmb.dbg','NDPSMB debug flag file'
         ok = stream(SysBootDrive()'\ndpsmb.dbg','c','close')
     end
@@ -2807 +2816 @@
 */
 Main_Create:
-    options.!debug    = 1
+    options.!debug    = 0
     if options.!debug == 1 then do
         ok = VRRedirectStdIO("ON")
@@ -3327 +3336 @@
     if ExeName = "" then do
         parse source . . script
-        ExeName = VRParseFilename(script,'DP')'\EVFSGUI.EXE'
+        ExeName = VRParseFilename(script,'DP')'\'options.!appname_short'.EXE'
     end
     StartupDir = VRParseFileName(VRget("Application","Program"),'DP')
@@ -3351 +3360 @@
             'CCVIEW=DEFAULT;'||,
             'DEFAULTVIEW=DEFAULT;'||,
-            'OBJECTID=<EVFSGUI_AUTOSTART>',,
+            'OBJECTID=<'options.!appname_short'_AUTOSTART>',,
         'REPLACE' )
 
@@ -3378 +3387 @@
 */
 Menu_File_Autostart_Deactivate_Click:
-    ok = SysDestroyObject("<EVFSGUI_AUTOSTART>")
+    ok = SysDestroyObject("<'options.!appname_short'_AUTOSTART>")
     IF ok == 1 THEN do
         Text = NLVGetMessage( 79 )
@@ -4859 +4868 @@
     CALL VRSet 'CB_TRAC', 'Set', options.!tracmark
 
-    ok = VRSet("DT_About","Caption", Program' (c) 2007-2016 Alexander Taylor'||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
+    ok = VRSet("DT_About","Caption", Program' (c) 2007-2017 Alexander Taylor'||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
 
     About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )