Changeset 894

Timestamp:

Mar 12, 2016, 2:44:59 PM (9 years ago)

Author:

Alex Taylor

Message:

Various UI tweaks, see changes for details. Enabled detection of Blue Lion system. Added some missing icons.

Location:

trunk/guitools

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.vrp (modified) (1 diff)
• evfsgui/evfsgui.vrx (modified) (150 diffs)
• evfsgui/evfsgui.vry (modified) ( previous)
• evfsgui/rc/icons/green-off-16.bmp (added)
• evfsgui/rc/icons/green-on-16.bmp (added)
• evfsgui/rc/icons/smbwait.ico (added)
• shared/nlv.vrs (modified) (6 diffs)

trunk/guitools/evfsgui/changes

@@ -13 +13 @@
   under all conditions
   
-Version 2.5.0 2014-??-??
+Version 2.5.0 2016-??-??
++ Added: [ALT] Now detects whether running under Blue Lion OS
++ Added: [ALT] "Trac wiki markup" setting on About window now saved in INI
+! Fixed: [ALT] "Trac wiki markup" setting on About window is now honoured correctly
++ Added: [ALT] Implemented better fallback logic for locating plugin when look4dll
+               is not present
+* Changed: [ALT] Copying About string to clipboard now adds tabs for readability
+* Changed: [ALT] Removed enforcement of minimum frame size and replaced with logic
+                 to switch from resizing to clipping below a certain size; this
+                 fixes nasty jittering and inconsistent sizing behaviour when 
+                 resizing, especially on low resolution screens.
+* Changed: [ALT] Language file stem is now limited to the first 6 characters of
+                 the executable name.
 + Added: Detect when master browser suffers from broken databases
 + Added: If browsing is not allowed for user, retry as guest (useful for print 

trunk/guitools/evfsgui/evfsgui.vrp

@@ -3 +3 @@
 VRX: wps_open.VRX
 VXOFile: VROBJEX
+VXOFile: VRSPLIT
 ClassFile: VRSPLITB.DLL
-MacroPath: VRM:U:\Develop\Samba\trunk\guitools\evfsgui
+MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
 EXEPath: 
 RunParameters: 
-RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
-VRXWindow: __VREMainWindow,1,1963,2361,1012,7841
-VRXWindow: __VREFileListWindow,1,2204,7950,2665,3358
-VRXWindow: __VRESectionListWindow,1,1168,12382,12238,6914
-VRXWindow: __VREToolsWindow,1,3084,12479,5468,1665
-VRXWindow: __VREWindListWindow,1,650,10262,4963,3150
+RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
+VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
+VRXWindow: __VREFileListWindow,1,2072,7950,2665,3358
+VRXWindow: __VRESectionListWindow,1,217,13057,12238,6914
+VRXWindow: __VREToolsWindow,1,2951,12479,5468,1669
+VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: SW_ADVANCED,1
+UserWindow: SW_LOGIN,1
+UserWindow: SW_MOUNTPOINT,1
+UserWindow: SW_SETTINGS,1
+UserWindow: SW_ABOUT,1
+UserWindow: SW_SMBTREE,1
+UserWindow: SW_CONDET,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -91 +91 @@
 __VXREXX____APPENDS__:
 /*
-#append U:\Develop\Samba\trunk\guitools\shared\cltinit.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\inittempdir.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\nlv.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\rexx_md5.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\smbtree.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\textini.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\usercredmem.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\rxrpclib.vrs
+#append ..\shared\cltinit.vrs
+#append ..\shared\inittempdir.vrs
+#append ..\shared\nlv.vrs
+#append ..\shared\rexx_md5.vrs
+#append ..\shared\smbtree.vrs
+#append ..\shared\textini.vrs
+#append ..\shared\usercredmem.vrs
+#append ..\shared\rxrpclib.vrs
 */
 return
 /*:VRX         _AboutSambaClientGetInfo
 */
-_AboutSambaClientGetInfo: 
+_AboutSambaClientGetInfo:
     call VRSet "SW_ABOUT", "Painting", 0
-    if VRGet("CB_TRAC","set") then BR = '[[BR]]'
-                              else BR = ''
-
-    ok = VRMethod( "CN_About", "RemoveRecord", "All" ) 
+    BR = ''
+
+    ok = VRMethod( "CN_About", "RemoveRecord", "All" )
 
     /* OS Version */
-    if VRFileExists(SysBootDrive()||"\ECS\ECS_INST.FLG" ) then do
+    if VRFileExists(SysBootDrive()||"\SYS\ARCANOAE.FLG" ) then do
+        OS = linein(SysBootDrive()||"\SYS\ARCANOAE.FLG")
+        OS = subword(OS,1,2) '('translate(word(OS,3))')'
+        ok = stream(SysBootDrive()||"\SYS\ARCANOAE.FLG",'c','close')
+    end
+    else if VRFileExists(SysBootDrive()||"\ECS\ECS_INST.FLG" ) then do
         OS = linein(SysBootDrive()||"\ECS\ECS_INST.FLG")
-        OS = strip(left(OS,pos(word(OS,4),OS)-1))
+        OS = subword(OS,1,3)
         ok = stream(SysBootDrive()||"\ECS\ECS_INST.FLG",'c','close')
     end
@@ -125 +129 @@
     ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "File system", About.ValFH, fs.!name' Version 'fs.!version)
     ABoutStr = "Samba Client Versions:"||BR
-    AboutStr = AboutStr||'0D0A'x||"File system "||fs.!name' Version 'fs.!version||BR
+    AboutStr = AboutStr||'0D0A'x||"File system "||'09'x||fs.!name' Version 'fs.!version||BR
     plugindll. =""
 
+    /* Plugin */
     address cmd 'look4dll.exe ndpsmb.dll >'samba.!msg
     if RC <> 0 then do
-        /* Plugin */
-        NDFSDir = value("NDFSDIR",,"OS2ENVIRONMENT")
-        if NDFSDir = "" then NDFSDir = SysBootDrive()'\ecs\dll'
-        ok = SysFileTree(NDFSDir'\ndpsmb.dll', "plugindll.", 'FOS')
+        /* Look4DLL not installed or failed, try fallback search */
+        if rc == 1041 then do   /* look4dll not found, use REXX-based search */
+            pluginpath = _DLLSearch('ndpsmb.dll')
+            if pluginpath <> '' then do
+                plugindll.0 = 1
+                plugindll.1 = pluginpath
+            end
+        end
+        else plugindll.0 = 0
+        /* DLL is not in libpath; as a last resort, check some well-known places */
+        if plugindll.0 < 1 then do
+            NDFSDir = value("NDFSDIR",,"OS2ENVIRONMENT")
+            if NDFSDir = "" then do
+                OSDir = value("OSDIR",,"OS2ENVIRONMENT")
+                if OSDir == '' then OSDir = SysBootDrive()'\os2'
+                NDFSDir = OSDir'\dll'
+            end
+            ok = SysFileTree(NDFSDir'\ndpsmb.dll', "plugindll.", 'FOS')
+        end
     end
     else do
@@ -149 +169 @@
         DummyRH.1 = VRMethod('CN_About', 'AddRecord')
         ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH.1, About.DscFH, "Plugin file", About.ValFH, plugindll.J)
-        AboutStr = AboutStr||'0D0A'x||"Plugin file "plugindll.J||BR
+        AboutStr = AboutStr||'0D0A'x||"Plugin file "||'09'x||plugindll.J||BR
 
         address cmd 'bldlevel.exe 'plugindll.J' >'samba.!msg
@@ -172 +192 @@
                 DummyRH = VRMethod('CN_About', 'AddRecord')
                 ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Plugin "Desc, About.ValFH, strip(Vers))
-                AboutStr = AboutStr||'0D0A'x||"Plugin "Desc" "strip(Vers)||BR
+                AboutStr = AboutStr||'0D0A'x||"Plugin "Desc '09'x||strip(Vers)||BR
             end
         end
@@ -197 +217 @@
     DummyRH = VRMethod('CN_About', 'AddRecord')
     ok = VRMethod("CN_ABOUT", "SetFieldData", DummyRH, About.DscFH, "Commandline utilities", About.ValFH, ClutVer)
-    AboutStr = AboutStr||'0D0A'x||"Commandline utilities "||ClutVer||BR
+    AboutStr = AboutStr||'0D0A'x||"Commandline utilities "||'09'x||ClutVer||BR
 
     /* 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"||VRGet("Main", "HintText")||BR
+    AboutStr = AboutStr||'0D0A'x||"EVFSGUI "||'09'x || VRGet("Main", "HintText")||BR
     call VRSet "SW_ABOUT", "Painting", 1
 return
@@ -215 +235 @@
 /*:VRX         _BrowseBuildPath
 */
-_BrowseBuildPath: procedure expose options. icons. samba. sharerh 
+_BrowseBuildPath: procedure expose options. icons. samba. sharerh
     if options.!debug == 1 then say time()' _BrowseBuildPath started'
     rh = arg(1)
@@ -221 +241 @@
     finished = 0
     BrowsePathStr = ''
-    
+
     do while \finished
         parentrh = VRMethod("CN_SMBTREE","GetRecordAttr",rh,"Parent")
@@ -230 +250 @@
         resname = strip(resname)
         /* say "  Not connected - cannot open!" */
-        select 
+        select
             when udatatype = "SERVER" then do
                 BrowsePathStr = '\\'resname'\'BrowsePathStr
@@ -254 +274 @@
 */
 _BrowseDirectory: /* This must not be a procedure */
-    if options.!debug == 1 then say time()' _BrowseDirectory started' 
+    if options.!debug == 1 then say time()' _BrowseDirectory started'
 
     /* Turn off painting */
@@ -261 +281 @@
 
     /* Make sure credentials are usable */
-    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'    
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
 
     /* We have to remove the double % for smbclient.exe - not entirely clear why */
@@ -275 +295 @@
     address cmd samba.!smbclientexe' \\'machine'\'sharename' 'UserCred' --command="dir 'browsepath'" 'debuglevel' 2>NUL 1>'samba.!msg
 
-    if UserCred   = '-N' then UserCred = ''    
+    if UserCred   = '-N' then UserCred = ''
 
     if OldUserCred <> "" then do
@@ -329 +349 @@
                         when wordpos(Ext, 'ZIP') > 0                 then ficon = icons.!zip
                         when wordpos(Ext, 'INF HLP') > 0             then ficon = icons.!view
-                        when wordpos(Ext, 'TXT') > 0                 then ficon = icons.!paintext
+                        when wordpos(Ext, 'TXT') > 0                 then ficon = icons.!plaintext
                         otherwise ficon = icons.!defaultfile /* default file icon */
                     end
@@ -340 +360 @@
 
                 ok = VRmethod("CN_SMBTREE", "SetRecordAttr", fh.I, "userdata", ftype'|'fsize' Bytes 'fday'-'fmonth'-'fyear' 'ftime,'icon',Ficon)
-            
+
             end
             otherwise nop /* no other line type */
@@ -353 +373 @@
     call VRSet VRWindow(), 'Pointer', '<default>'
     ok = VRSet("CN_SMBTREE","Painting", 1 )
-    if options.!debug == 1 then say time()' _BrowseDirectory done' 
+    if options.!debug == 1 then say time()' _BrowseDirectory done'
 return
 
 /*:VRX         _BrowseObjectOpen
 */
-_BrowseObjectOpen: procedure expose samba. options. cd. icons. 
+_BrowseObjectOpen: procedure expose samba. options. cd. icons.
     machine    = arg(1)
     sharename  = arg(2)
@@ -368 +388 @@
 
     DO i = 1 TO records.0
-        if VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.StatusFH) = icons.!active then do 
+        if VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.StatusFH) = icons.!active then do
             if options.!debug == 1 then say '  'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.StatusFH)' 'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.MPointFH)' 'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ServerFH)' 'VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ShareFH)
             if machine = VRMethod( "CN_CONDET", "GetFieldData", records.i, CD.ServerFH) &,
@@ -389 +409 @@
 
     /* Remove all files and directories whose parent is our share */
-    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "All", "AllRH." ) 
+    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "All", "AllRH." )
     do I = 1 to AllRH.0
         AllParentRH  = VRMethod("CN_SMBTREE","GetRecordAttr",AllRH.I,"Parent")
-        if AllParentRH = rh then ok = VRMethod( "CN_SMBTREE", "RemoveRecord", AllRH.I ) 
+        if AllParentRH = rh then ok = VRMethod( "CN_SMBTREE", "RemoveRecord", AllRH.I )
     end
     ok = VRSet("CN_SMBTREE","Painting", 1 )
@@ -451 +471 @@
     NBFH       = VRMethod( "CN_smbtree", "AddField", "String", "NetBIOS name" )
     IpFH       = VRMethod( "CN_smbtree", "AddField", "String", "IP"  )
-    MBFH       = VRMethod( "CN_smbtree", "AddField", "String", "Role" )    
-    OSFH       = VRMethod( "CN_smbtree", "AddField", "String", "OS" )    
+    MBFH       = VRMethod( "CN_smbtree", "AddField", "String", "Role" )
+    OSFH       = VRMethod( "CN_smbtree", "AddField", "String", "OS" )
     VersionFH  = VRMethod( "CN_SmbTree", "AddField", "String", "Version" )
     CommentFH  = VRMethod( "CN_smbtree", "AddField", "String", "Comment" )
@@ -468 +488 @@
 /*:VRX         _ContextMenuSelectedSet
 */
-_ContextMenuSelectedSet: 
+_ContextMenuSelectedSet:
     /* Fixme: This routine only works for CN_SMBTREE right now */
 
@@ -485 +505 @@
     ok = VRSet("Menu_Selected_DetailsView","Visible",1)
  */
-    select 
+    select
         when SMBObj.udatatype = "DISK" then do
             ok = VRSet("Menu_Selected_Connect", "Visible", 1)
@@ -544 +564 @@
 /*:VRX         _DelSMBObjectShares
 */
-_DelSMBObjectShares: procedure expose samba. options. SMBObj. rh 
+_DelSMBObjectShares: procedure expose samba. options. SMBObj. rh
     /* Purpose: Delete shares for a given Object (as handle) */
 
-    rh = arg(1)   
+    rh = arg(1)
 
     ok = VRMethod("CN_smbtree", "GetRecordList", "All", rh.)
@@ -555 +575 @@
 
         if ParentRH = rh then do /* we found a share belonging to our server */
-            ok = VRMethod("CN_SMBTree", "RemoveRecord", rh.J ) 
+            ok = VRMethod("CN_SMBTree", "RemoveRecord", rh.J )
         end
     end
@@ -591 +611 @@
 return
 
+/*:VRX         _DLLSearch
+*/
+_DLLSearch: PROCEDURE
+    PARSE ARG dname
+    _bd = SysBootDrive()
+
+    IF _bd == '' THEN
+        _bd = FILESPEC('DRIVE', VALUE('COMSPEC',,'OS2ENVIRONMENT'))
+    _csys = _bd'\CONFIG.SYS'
+
+    CALL SysFileSearch 'LIBPATH=', _csys, 'match.'
+    DO i = 1 TO match.0
+        PARSE UPPER VAR match.i _lead 'LIBPATH=' _lpath
+        IF (_lead == '') & (_lpath <> '') THEN LEAVE
+    END
+
+    _lpath = SysQueryExtLIBPATH('B') || ';'_lpath';' || SysQueryExtLIBPATH('E')
+
+    CALL SETLOCAL
+    _testenv = 'TEST_'dname'_LIBPATH'
+    CALL VALUE _testenv, _lpath, 'OS2ENVIRONMENT'
+    location = SysSearchPath( _testenv, dname )
+    CALL ENDLOCAL
+
+RETURN location
+
 /*:VRX         _dropdeprecated
 */
-_dropdeprecated: 
+_dropdeprecated:
     /* The stem-less counterparts of these variables are considered deprecated and should be removed wherever possible
        The _dropdeprecated routine will drop any value in order to make sure the stem actually works
        If another variable is added to the stem, ensure to also drop it in dropdeprecated otherwise it will not be exported
      */
-    drop rh     
-    drop parentrh     
+    drop rh
+    drop parentrh
     drop gparentrh
-    drop icon      
-    drop resname   
-    drop comment   
-    drop udatatype 
-    drop udatamsg  
+    drop icon
+    drop resname
+    drop comment
+    drop udatatype
+    drop udatamsg
 return
 
@@ -618 +664 @@
 /*:VRX         _GetSMBObjectProperties
 */
-_GetSMBObjectProperties: procedure expose samba. options. SMBObj. rh icon resname udatatype udatamsg parentrh icons. 
+_GetSMBObjectProperties: procedure expose samba. options. SMBObj. rh icon resname udatatype udatamsg parentrh icons.
     if options.!debug == 1 then say time()' _GetSMBObjectProperties started'
 
@@ -649 +695 @@
 
     SMBObj.parentrh = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.rh, "Parent")
-    if SMBObj.parentrh = "" 
+    if SMBObj.parentrh = ""
         then SMBObj.gparentrh = ""
         else SMBObj.gparentrh = VRMethod("CN_SMBTREE", "GetRecordAttr", SMBObj.parentrh, "Parent")
@@ -678 +724 @@
 /*:VRX         _GetSMBObjectShares
 */
-_GetSMBObjectShares: procedure expose samba. options. SMBObj. rh 
+_GetSMBObjectShares: procedure expose samba. options. SMBObj. rh
     /* Purpose: Return stem with shares for a given Object (as handle) */
 
-    rh = arg(1)   
+    rh = arg(1)
 
     SmbObj.shares. = ''
@@ -782 +828 @@
     if (mtype.1 = '' & mtype.2 = '' & mtype.3 = '' & mtype.4 = '') THEN DO /* we do not seem to have an NLV file */
         /* we fill the array with the list predefined directly in the GUI control */
-        ok = VRMethod( "CB_MOUNT", "GetStringList", "mtype." ) 
+        ok = VRMethod( "CB_MOUNT", "GetStringList", "mtype." )
     end
 
@@ -790 +836 @@
     CALL NLVSetText 'PB_SMBTREE_HELP',                "Caption", 4
     CALL NLVSetText 'CN_SMBTREE',                     "Caption", 140
+/** Use AutoSize property instead
     ok = VRSet("Pict_Throbber","Width",  VRMethod( "Screen", "PixelsToTwips", 32 ))
     ok = VRSet("Pict_Throbber","Height", VRMethod( "Screen", "PixelsToTwips", 32 ))
-
+**/
     /* Condet */
     CALL NLVSetText 'PB_CONDET_SAVE',     "Caption", 30
@@ -819 +866 @@
     IF inipath == '' THEN inipath = SysBootDrive() || '\OS2'
     settings.!ini = inipath'\evfsgui.ini'
-    drop os2_ini inipath 
+    drop os2_ini inipath
     if options.!debug == 1 then say '  EVFSGUI INIfile = "'settings.!ini'"'
 
@@ -877 +924 @@
 
         /* Load font settings */
-        IF VRFileExists( SysBootDrive() || '\OS2DBCS') == 1 
+        IF VRFileExists( SysBootDrive() || '\OS2DBCS') == 1
             THEN default_font = '9.WarpSans Combined'
             ELSE default_font = '9.WarpSans'
@@ -912 +959 @@
         IF advanced.!lmhosts    == '' THEN advanced.!lmhosts    = 1
 
-        options.!storecreds = VRGetIni('Settings', 'StoreCreds', settings.!ini)
+        options.!storecreds = VRGetIni('Settings', 'StoreCreds', settings.!ini, 'NoClose')
 say "options.!storecreds = "options.!storecreds
         IF options.!storecreds == '' then options.!storecreds = 1
-                                     
+
 say "options.!storecreds = "options.!storecreds
-        IF _ucChkObj() = 0 then options.!storecreds = 0            
+        IF _ucChkObj() = 0 then options.!storecreds = 0
 say "options.!storecreds = "options.!storecreds
 
+        options.!tracmark = VRGetIni('Settings', 'TracMarkup', settings.!ini, 'NoClose')
         options.!debug = VRGetIni('Settings', 'Debug', settings.!ini)
         IF options.!debug == '' THEN options.!debug = 0       /* Turn off debug by default for release builds */
@@ -1029 +1077 @@
     CALL VRSetIni 'Settings', 'Debug',         options.!debug       , settings.!ini, 'NoClose'
     CALL VRSetIni 'Settings', 'MiniIcons',     advanced.!miniicons  , settings.!ini, 'NoClose'
+    CALL VRSetIni 'Settings', 'TracMarkup',    options.!tracmark    , settings.!ini, 'NoClose'
 
     /* Advanced */
@@ -1076 +1125 @@
 /*:VRX         _LMHostsRead
 */
-_LMHostsRead: 
+_LMHostsRead:
     ok = file2stem(samba.!lmhosts,'lmhosts.', 'NoDel')
     lmname. = "#"
@@ -1084 +1133 @@
     lmapp.0  = lmhosts.0
     do I = 1 to lmhosts.0
-        if left(lmhosts.I,1) = "#" then iterate        
+        if left(lmhosts.I,1) = "#" then iterate
         parse var lmhosts.I lmip.I ' ' lmname.I '#' lmapp.I
         lmip.I = strip(lmip.I)
@@ -1095 +1144 @@
 /*:VRX         _LMHostsReset
 */
-_LMHostsReset: 
+_LMHostsReset:
     ok = SysFileDelete(samba.!lmhosts)
-    
+
     Buttons.1 = NLVGetMessage(2)
     Buttons.0 = 1
@@ -1110 +1159 @@
 /*:VRX         _LMHostsUpdate
 */
-_LMHostsUpdate: 
+_LMHostsUpdate:
     ok = VRMethod( "CN_SMBTREE", "GetRecordList", "Visible", "rh." )
     do I = 1 to rh.0
@@ -1139 +1188 @@
                     lmname.new = SmbObj.resname
                     lmip.0 = new
-                    lmip.new = IP                    
+                    lmip.new = IP
                 end
             end
@@ -1149 +1198 @@
     call lineout samba.!lmhosts,left('# IP-address',25)||left('NetBIOS-name',16)' [Role]'
     do I = 1 to lmname.0
-        if left(lmname.I,1) = "#" then iterate 
+        if left(lmname.I,1) = "#" then iterate
         call lineout samba.!lmhosts,left(lmip.I,25)||left(lmname.I,16)' 'lmapp.I
     end
@@ -1157 +1206 @@
 /*:VRX         _LMHostsWrite
 */
-_LMHostsWrite: 
+_LMHostsWrite:
 
 return
@@ -1163 +1212 @@
 /*:VRX         _LoadOtherFuncs
 */
-_LoadOtherFuncs: 
+_LoadOtherFuncs:
     IF options.!debug == 1 then say time()' _LoadotherFuncs() started'
     SIGNAL ON SYNTAX
@@ -1187 +1236 @@
     Fatal = 1
     parse source . . InVXIDE
-    if left(InVXIDE,length(Tempdir)+5) = TempDir||'__tmp' 
+    if left(InVXIDE,length(Tempdir)+5) = TempDir||'__tmp'
         then xxx = "VX-REXX IDE: "strip(translate(word(sourceline(SIGL-1),4),'  ',"',"))
         else xxx = 'A'
@@ -1399 +1448 @@
 /*:VRX         _PrinterInfo
 */
-_PrinterInfo: 
+_PrinterInfo:
     if \_SMBpdrInstalled() then do
         /* SMB.PDR is not installed */
@@ -1406 +1455 @@
     else do /* SMB.pdr is installed */
         /* shared queue name */
-        p_printer = SMBObj.resname 
+        p_printer = SMBObj.resname
 
         /* printer server */
@@ -1423 +1472 @@
         LDescStr = length(DescStr)
 
-        /* Enumerate all SMB ports */        
+        /* Enumerate all SMB ports */
         ok = SysIni('SYSTEM','PM_SPOOLER_PORT',"All:",'ports')
         if ports.0 = 0 then do
@@ -1482 +1531 @@
 /*:VRX         _SmbConfCreateShadowCopy
 */
-_SmbConfCreateShadowCopy: 
+_SmbConfCreateShadowCopy:
     if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy started'
     /* we create a complete version of smb.conf in temporary directory for reading purposes */
@@ -1529 +1578 @@
     options.!timesync   = 0
     options.!timesrv    = ''
+
+    options.!tracmark   = 0
 
     if options.!debug == 1 then say '  initializing vfs. '
@@ -1607 +1658 @@
 /*:VRX         _TabbedDialogSetup
 */
-_TabbedDialogSetup: 
+_TabbedDialogSetup:
     if options.!debug == 1 then say time()' _TabbedDialogSetup started'
 
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_DIALOG" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(13)" ") 
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(13)" ")
     ok = VRMethod( "TDL_1", "SetStatusText", 1, NLVGetMessage(132,"1","2"))
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_ADVANCED" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"- "NLVGetMessage(40)" ") 
+    ok = VRMethod( "TDL_1", "InsertPage", w,"- "NLVGetMessage(40)" ")
     ok = VRMethod( "TDL_1", "SetStatusText", 2, NLVGetMessage(132,"2","2"))
 
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBTREE" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(39)" ") 
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(39)" ")
 
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_CONDET" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(63)" ") 
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(63)" ")
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
-    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(47)" ") 
+    ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(47)" ")
     if options.!debug == 1 then say time()' _TabbedDialogSetup done'
 return
@@ -1630 +1681 @@
 /*:VRX         _TabFix
 */
-_TabFix: 
-    ok = VRMethod( "TDL_1", "SetTabText", arg(1), " "strip(VRMethod( "TDL_1", "GetTabText", arg(1)))" ")     
+_TabFix:
+    ok = VRMethod( "TDL_1", "SetTabText", arg(1), " "strip(VRMethod( "TDL_1", "GetTabText", arg(1)))" ")
 return
 
 /*:VRX         _TabsStrip
 */
-_TabsStrip: 
-    ok = VRMethod( "TDL_1", "SetTabText", 1, strip(VRMethod( "TDL_1", "GetTabText", 1))) 
+_TabsStrip:
+    ok = VRMethod( "TDL_1", "SetTabText", 1, strip(VRMethod( "TDL_1", "GetTabText", 1)))
     ok = VRMethod( "TDL_1", "SetTabText", 2, strip(VRMethod( "TDL_1", "GetTabText", 2)))
-    ok = VRMethod( "TDL_1", "SetTabText", 3, strip(VRMethod( "TDL_1", "GetTabText", 3))) 
-    ok = VRMethod( "TDL_1", "SetTabText", 4, strip(VRMethod( "TDL_1", "GetTabText", 4))) 
-    ok = VRMethod( "TDL_1", "SetTabText", 5, strip(VRMethod( "TDL_1", "GetTabText", 5))) 
+    ok = VRMethod( "TDL_1", "SetTabText", 3, strip(VRMethod( "TDL_1", "GetTabText", 3)))
+    ok = VRMethod( "TDL_1", "SetTabText", 4, strip(VRMethod( "TDL_1", "GetTabText", 4)))
+    ok = VRMethod( "TDL_1", "SetTabText", 5, strip(VRMethod( "TDL_1", "GetTabText", 5)))
 return
 
 /*:VRX         _TimeSync
 */
-_TimeSync: 
+_TimeSync:
     if options.!debug == 1 then say time()' _TimeSync started, "'options.!timesrv'"'
     TimeMsg.1 = NLVGetMessage(141)' 'time()
@@ -1669 +1720 @@
 /*:VRX         _UpdateObject
 */
-_UpdateObject: procedure 
+_UpdateObject: procedure
     Object   = arg(1)
     ObjValue = arg(2)
@@ -1765 +1816 @@
         END
         OTHERWISE DO
-            id = VRMessage( "", 'unknown mount type here >>'mount'<< mtype1=>>'mtype.1'<<', "Mount change error", "E", ) 
-        END        
+            id = VRMessage( "", 'unknown mount type here >>'mount'<< mtype1=>>'mtype.1'<<', "Mount change error", "E", )
+        END
     END
     if options.!debug == 1 then say time()' '||"CB_MOUNT_Change done"
@@ -1829 +1880 @@
     /* Herwig B. */
     CALL VRSet "TM_AUTOCLOSE", "ENABLED", 0
-    ok = VRSet("Menu_Selected_Default_Workgroup","Visible", 0) 
+    ok = VRSet("Menu_Selected_Default_Workgroup","Visible", 0)
 
     rh = VRInfo('Record')
@@ -1848 +1899 @@
     end
 
-    if p_string = "" 
+    if p_string = ""
         then infotext = fs.!name' 'fs.!version
         else infotext = p_string
@@ -1859 +1910 @@
         CALL VRSet 'PB_UNMOUNT',               'Enabled', 1
         CALL VRSet 'MENU_CONTEXT_UNMOUNT',     'Visible', 1
-        
-        if pos("*",p_string) > 0 | pos(";",p_string) > 0 
+
+        if pos("*",p_string) > 0 | pos(";",p_string) > 0
             then CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 0
             else CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 1
@@ -1879 +1930 @@
         CALL VRSet 'MENU_CONTEXT_DETACH_ALL', 'Visible', 1
 /*      CALL VRSet 'MENU_CONTEXT_SEP2',       'Visible', 1 */
-        
+
     END
     ELSE DO
@@ -1956 +2007 @@
     END
 */
-    if p_string = "" 
+    if p_string = ""
         then infotext = fs.!name' 'fs.!version
         else infotext = p_string
@@ -1973 +2024 @@
         CALL VRSet 'PB_UNMOUNT',               'Enabled', 1
         CALL VRSet 'MENU_CONTEXT_UNMOUNT',     'Visible', 1
-        
+
         if pos("*",p_string) > 0 | pos(";",p_string) > 0 then CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 0
                                  else CALL VRSet 'MENU_CONTEXT_EDIT', 'Visible', 1
@@ -2120 +2171 @@
     else do /* Drag from CN_SMBTREE */
         call _GetSMBObjectProperties srcRec
-        select 
+        select
             when SMBObj.udatatype = "WORKGROUP" then do
                 say "Workgroup dragged!"
@@ -2170 +2221 @@
     if trgRec = "" then do
         ok = VRMethod("CB_DRIVES",  "GetStringList", "freedrives.")
-        if freedrives.0 > 0 
+        if freedrives.0 > 0
             then ok = VRSet("CB_DRIVES","Value", freedrives.1)
             else ok = VRSet("CB_DRIVES","Value", "")
@@ -2231 +2282 @@
 /*:VRX         CN_SMBTREE_DoubleClick
 */
-CN_SMBTREE_DoubleClick: 
+CN_SMBTREE_DoubleClick:
     if options.!debug == 1 then say time()' CN_SMBTREE_DoubleClick started'
 
@@ -2251 +2302 @@
         browsepath = browsepath'\*'
 
-        call _BrowseDirectory       
+        call _BrowseDirectory
     end
 
@@ -2257 +2308 @@
         BrowsePath = _browsebuildpath(SMBObj.rh)
         call _BrowseResetObject(SmbObj.rh)
-        
+
         parse var browsepath '\\'machine'\'sharename '\' browsepath
 
@@ -2264 +2315 @@
         if \OpenOK then do
             say "  Not connected - trying to connect"
-            ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", sharerh, "Selected", 1) 
+            ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", sharerh, "Selected", 1)
             call PB_SMBTREE_CONNECT_Click
             ok = VRMethod( "CN_SMBTREE", "SetRecordAttr", SMBObj.rh, "Selected", 1)
@@ -2273 +2324 @@
                 say "  Not connected - cannot open - aborting!"
             end
-        end 
+        end
     end
 
@@ -2287 +2338 @@
 
         call _BrowseDirectory
-    end       
+    end
     if options.!debug == 1 then say time()' CN_SMBTREE_DoubleClick done'
 return
 /*:VRX         CN_SMBTREE_DragFile
 */
-CN_SMBTREE_DragFile: 
+CN_SMBTREE_DragFile:
     if options.!debug == 1 then say time()' CN_SMBTREE_DragFile started'
 
@@ -2369 +2420 @@
 */
 EF_PASSWORD1_KeyPress:
-    if options.!debug == 1 then say time()' EF_PASSWORD1_KeyPress started'    
+    if options.!debug == 1 then say time()' EF_PASSWORD1_KeyPress started'
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
@@ -2379 +2430 @@
         otherwise nop
     end
-    if options.!debug == 1 then say time()' EF_PASSWORD1_KeyPress done'    
+    if options.!debug == 1 then say time()' EF_PASSWORD1_KeyPress done'
 return
 
@@ -2403 +2454 @@
     if Now <> VRGet("EF_SERVER","value") then return
 
-    IF options.!editmode = 1 then return 
+    IF options.!editmode = 1 then return
 
     /* Do nothing for incomplete IP addresses */
@@ -2413 +2464 @@
     if VRGet("EF_SERVER","value") = "*" then return
 
-    machine = VRGet("EF_SERVER","value")    
+    machine = VRGet("EF_SERVER","value")
     rh = _GetMachineHandle(machine)
 
@@ -2419 +2470 @@
         call _GetSMBObjectProperties rh
 
-        if SMBObj.parentrh = "" 
+        if SMBObj.parentrh = ""
             then ok = VRSet("EF_NETWORK","Value", "") /* The workgroup might be unknown at this moment */
             else ok = VRSet("EF_NETWORK","Value", VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.parentRH,"Caption"))
@@ -2448 +2499 @@
 */
 EF_USER1_KeyPress:
-    if options.!debug == 1 then say time()' EF_USER1_KeyPress started'    
+    if options.!debug == 1 then say time()' EF_USER1_KeyPress started'
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
@@ -2458 +2509 @@
         otherwise nop
     end
-    if options.!debug == 1 then say time()' EF_USER1_KeyPress done'    
+    if options.!debug == 1 then say time()' EF_USER1_KeyPress done'
 return
 
@@ -2474 +2525 @@
 /*:VRX         EF_WINS_SERVER_Change
 */
-EF_WINS_SERVER_Change: 
+EF_WINS_SERVER_Change:
     advanced.!smbconfchanged = 1
 return
@@ -2496 +2547 @@
     IF info.2 > 0 THEN icon = icons.!active
                   ELSE icon = icons.!passive
-                  
+
     rh = VRMethod("CN_CURRENT", 'AddRecord', parec, 'Last', info.0, icon )
     IF rh == '' | datatype(res.0) <> "NUM" THEN RETURN
@@ -2657 +2708 @@
     else do
         if FoundND = 0 & FoundEVFS = 0 then do
-            CALL VRMessage 'Main', 'FATAL: Neither EVFS nor Netdrive found: 'fs.!prefix'RxQueryIFS()='fsstat, NLVGetMessage( 5 ), 'E' 
+            CALL VRMessage 'Main', 'FATAL: Neither EVFS nor Netdrive found: 'fs.!prefix'RxQueryIFS()='fsstat, NLVGetMessage( 5 ), 'E'
             signal Halt
         end
-        signal ForceNDFS 
+        signal ForceNDFS
     end
     IF fsctl \= 1 THEN DO
@@ -2714 +2765 @@
     CALL _INILoad
 
-    call _TabFix 1 
+    call _TabFix 1
     call SW_ADVANCED_Init_Content
     call SW_SMBTREE_Init_Content
@@ -2730 +2781 @@
     CALL VRSet "CB_MOUNT",  "Selected", 1
     CALL VRSet "CB_DRIVES", "Selected", 1
-    IF options.!autoclose == 1 
+    IF options.!autoclose == 1
     THEN CALL TM_AutoClose_Trigger
     ELSE do
@@ -2766 +2817 @@
     main_iheight = VRGet("Main","InteriorHeight")               /* Height of window client-area */
 
-    if VRMethod( "Screen", "TwipsToPixels", main_iheight) < 580 then ok = VRSet("Main","Height",VRMethod( "Screen", "PixelsToTwips", 600))
-    if VRMethod( "Screen", "TwipsToPixels", main_iwidth)  < 800 then ok = VRSet("Main","Width", VRMethod( "Screen", "PixelsToTwips", 800))
+/** This caused weird resizing glitches, horrible jittering, etc.  Instead,
+ ** what we now do (further down) is set a minimum size in twips for the right
+ ** pane, below which it simply stops resizing and switches to clipping.  (The
+ ** left pane resizes all its controls dynamically anyway.)  This better matches
+ ** standard application behaviour, and makes resizing behave more smoothly.
+ *
+ *  if VRMethod( "Screen", "TwipsToPixels", main_iheight) < 600 then
+ *      ok = VRSet("Main","Height",VRMethod( "Screen", "PixelsToTwips", 580))
+ *  if VRMethod( "Screen", "TwipsToPixels", main_iwidth)  < 730 then
+ *      ok = VRSet("Main","Width", VRMethod( "Screen", "PixelsToTwips", 730))
+ */
 
     sbar_height  = VRGet("GB_STATUSBAR","Height")               /* Height of status-bar */
@@ -2834 +2894 @@
 
     /* Modified for notebook pages */
-    pane_height = marginx2 + pane_height -1020
+    pane_height = marginx2 + pane_height -1180
     rpane_width = marginx2 + rpane_width -760
+    /* Use this as the width for the container pages, which don't have as strict a minimum width */
+    rcnr_width = rpane_width
+
+    /* Minimum size of right panel (based on SW_DIALOG which is the largest) */
+    if pane_height < 5360 then pane_height = 5360
+    if rpane_width < 6010 then rpane_width = 6010
 
     /* Dialog page */
@@ -2886 +2952 @@
     ok = VRSet("GB_SMBTREE", "Left",    margin /* x2 */ /* split_left + 60 */ )
     ok = VRset("GB_SMBTREE", "Height",  pane_height     )
-    ok = VRset("GB_SMBTREE", "Width",   rpane_width     )
+    ok = VRset("GB_SMBTREE", "Width",   rcnr_width     )
 
     ok = VRset("GB_SMBTREE2","Left",    margin                    )
     ok = VRset("GB_SMBTREE2","Top",     /* 45 + */ marginx2        )
-    ok = VRset("GB_SMBTREE2","Width",   rpane_width - marginx2)
+    ok = VRset("GB_SMBTREE2","Width",   rcnr_width - marginx2)
     ok = VRset("GB_SMBTREE2","Height",  pane_height - (margin * 5) - pbtn_height /* - 245 */ )
 
@@ -2902 +2968 @@
     ok = VRset("PB_SMBTREE_REFRESH", "Left",   VRGet("PB_SMBTREE_CONNECT","Width") + marginx2)
     ok = VRset("PB_SMBTREE_REFRESH", "Top",    pane_height - pbtn_height   - marginx2)
-    ok = VRset("PB_SMBTREE_HELP", "Left", rpane_width - marginx2 - VRGet("PB_SMBTREE_HELP","Width") + 24)
+
+    hlpmin = VRGet("PB_SMBTREE_REFRESH", "Left") + VRGet("PB_SMBTREE_REFRESH","Width") + marginx2
+    hlppos = rcnr_width - marginx2 - VRGet("PB_SMBTREE_HELP","Width") + 24   
+    IF hlppos < hlpmin THEN hlppos = hlpmin
+
+    ok = VRset("PB_SMBTREE_HELP", "Left", hlppos )
     ok = VRset("PB_SMBTREE_HELP", "Top",  pane_height - pbtn_height - marginx2)
 
@@ -2912 +2983 @@
     ok = VRSet("GB_CONDET", "Left",    margin /* x2 */  /* split_left + 60 */ )
     ok = VRset("GB_CONDET", "Height",  pane_height     )
-    ok = VRset("GB_CONDET", "Width",   rpane_width     )
+    ok = VRset("GB_CONDET", "Width",   rcnr_width      )
 
     ok = VRset("GB_CONDET2", "Left",   margin )
     ok = VRset("GB_CONDET2", "Top",    /* 245 + */ marginx2)
-    ok = VRset("GB_CONDET2", "Width",  rpane_width - marginx2)
+    ok = VRset("GB_CONDET2", "Width",  rcnr_width - marginx2)
     ok = VRset("GB_CONDET2", "Height", pane_height - (margin * 5) - pbtn_height /* - 245 */ )
 
@@ -2928 +2999 @@
     ok = VRset("PB_CONDET_LOAD", "Left", VRGet("PB_CONDET_SAVE","Width") + marginx2)
     ok = VRset("PB_CONDET_LOAD", "Top",  pane_height - pbtn_height - marginx2      )
-    ok = VRset("PB_CONDET_HELP", "Left", rpane_width - marginx2 - VRGet("PB_CONDET_HELP","Width") + 24)
+
+    hlpmin = VRGet("PB_CONDET_LOAD", "Left") + VRGet("PB_CONDET_LOAD","Width") + marginx2
+    hlppos = rcnr_width - marginx2 - VRGet("PB_CONDET_HELP","Width") + 24
+    IF hlppos < hlpmin THEN hlppos = hlpmin
+
+    ok = VRset("PB_CONDET_HELP", "Left", hlppos )
     ok = VRset("PB_CONDET_HELP", "Top",  pane_height - pbtn_height - marginx2)
 
@@ -2985 +3061 @@
 /*:VRX         Menu_Context_Detach_All_Click
 */
-Menu_Context_Detach_All_Click: 
+Menu_Context_Detach_All_Click:
     ok = VRMethod( "CN_CURRENT", "GetRecordList", "All", "umrh." )
     do um = 1 to umrh.0
@@ -3010 +3086 @@
     CALL VRSet "PB_UNMOUNT","Enabled", 0
 
-    ok = VRMethod( "TDL_1", "SetTabText", 1, " "NLVGetMessage(33)" " ) 
+    ok = VRMethod( "TDL_1", "SetTabText", 1, " "NLVGetMessage(33)" " )
 /*  CALL NLVSetText "DT_DIALOG","Caption",33 */
     CALL VRSet "GB_CURRENT", "ENABLED", 0
@@ -3048 +3124 @@
 /*:VRX         Menu_Context_Open_Default_Click
 */
-Menu_Context_Open_Default_Click: 
+Menu_Context_Open_Default_Click:
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Click started"
     if \VRIsValidObject(rh) then return
@@ -3064 +3140 @@
 /*:VRX         Menu_Context_Open_Detail_Click
 */
-Menu_Context_Open_Detail_Click: 
+Menu_Context_Open_Detail_Click:
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Details_Click started"
     if \VRIsValidObject(rh) then return
@@ -3080 +3156 @@
 /*:VRX         Menu_Context_Open_Icon_Click
 */
-Menu_Context_Open_Icon_Click: 
+Menu_Context_Open_Icon_Click:
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Icon_Click started"
     if \VRIsValidObject(rh) then return
@@ -3096 +3172 @@
 /*:VRX         Menu_Context_Open_Settings_Click
 */
-Menu_Context_Open_Settings_Click: 
+Menu_Context_Open_Settings_Click:
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Settings_Click started"
     if \VRIsValidObject(rh) then return
@@ -3112 +3188 @@
 /*:VRX         Menu_Context_Open_Splitview_Click
 */
-Menu_Context_Open_Splitview_Click: 
+Menu_Context_Open_Splitview_Click:
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Splitview_Click started"
     if \VRIsValidObject(rh) then return
@@ -3128 +3204 @@
 /*:VRX         Menu_Context_Open_Tree_Click
 */
-Menu_Context_Open_Tree_Click: 
+Menu_Context_Open_Tree_Click:
     if options.!debug == 1 then say time()' '||"Menu_Context_Open_Tree_Click started"
     if \VRIsValidObject(rh) then return
@@ -3144 +3220 @@
 /*:VRX         Menu_Context_Refresh_Click
 */
-Menu_Context_Refresh_Click: 
+Menu_Context_Refresh_Click:
     CALL Refresh
 return
@@ -3170 +3246 @@
         StartUpDir = VRParseFilename(script,'DP')
     end
-    
+
     ObjTitle   = NLVGetMessage( 59 )
     if ObjTitle = "" then ObjTitle = '[EVFS LAN-Connections]'
@@ -3231 +3307 @@
 /*:VRX         Menu_File_Click
 */
-Menu_File_Click: 
+Menu_File_Click:
     ok = VRSet("Menu_File_LMHosts_Reset", "Enabled", VRFileExists( samba.!lmhosts ))
     ok = VRSet("Menu_File_ucCred_Reset",  "Enabled", (VRGet("Pict_PWINMEM","PicturePath") = "#36"))
@@ -3245 +3321 @@
 */
 Menu_File_Daemon_Start_Click:
-    if options.!debug == 1 then say time()' Menu_File_Daemon_Start_Click started' 
+    if options.!debug == 1 then say time()' Menu_File_Daemon_Start_Click started'
     if VRFileExists(SysBootDrive()"\ndpsmb.dbg") then do
         btns.0 = 2
@@ -3267 +3343 @@
     ok = VRSet("Menu_File_Daemon_Start","Enabled",0)
     ok = VRSet("Menu_File_Daemon_Stop","Enabled",1)
-    if options.!debug == 1 then say time()' Menu_File_Daemon_Start_Click done' 
+    if options.!debug == 1 then say time()' Menu_File_Daemon_Start_Click done'
 return
 
 /*:VRX         Menu_File_Daemon_Stop_Click
 */
-Menu_File_Daemon_Stop_Click: 
-    if options.!debug == 1 then say time()' Menu_File_Daemon_Stop_Click started' 
+Menu_File_Daemon_Stop_Click:
+    if options.!debug == 1 then say time()' Menu_File_Daemon_Stop_Click started'
     ok = PRProcessList(proc)
     do I = 1 to proc.0
@@ -3287 +3363 @@
     ok = VRSet("Menu_File_Daemon_Start","Enabled",1)
     ok = VRSet("Menu_File_Daemon_Stop","Enabled",0)
-    if options.!debug == 1 then say time()' Menu_File_Daemon_Stop_Click stopped' 
+    if options.!debug == 1 then say time()' Menu_File_Daemon_Stop_Click stopped'
 return
 /*:VRX         Menu_File_LMHosts_Reset_Click
 */
-Menu_File_LMHosts_Reset_Click: 
+Menu_File_LMHosts_Reset_Click:
     call _LMHostsReset
 return
@@ -3362 +3438 @@
 /*:VRX         Menu_File_ucCred_Reset_Click
 */
-Menu_File_ucCred_Reset_Click: 
+Menu_File_ucCred_Reset_Click:
     if _ucChkUc() then ok = _ucDelUc()
     ok = VRSet("Pict_PWINMEM","PicturePath","#37")
@@ -3379 +3455 @@
 */
 Menu_Help_Extended_Click:
-    ok = VRMethod( "Main", "InvokeHelp" ) 
+    ok = VRMethod( "Main", "InvokeHelp" )
 return
 
@@ -3397 +3473 @@
         if options.!debug == 1 then say '  SMBObj.udatatype = "'SMBObj.udatatype'"'
         Success = 1
-        select 
+        select
             when SMBObj.udatatype = "WORKGROUP" then workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.rh,"Caption")
             when SMBObj.udatatype = "DISK"      then workgroupname = VRMethod("CN_SMBTREE","GetRecordAttr",SMBObj.gparentrh,"Caption")
@@ -3404 +3480 @@
             otherwise Success = 0
         end
-        
+
         /* FIXME: switch over to REXXIni calls */
         if Success = 1 then ok = TRSetIni("[global]","workgroup", workgroupname, samba.!smbconf)
@@ -3422 +3498 @@
 /*:VRX         Menu_Selected_DetailsView_Click
 */
-Menu_Selected_DetailsView_Click: 
+Menu_Selected_DetailsView_Click:
     ok = VRSet("CN_smbtree", "View", "Detail")
 return
@@ -3445 +3521 @@
 /*:VRX         Menu_Selected_Refresh_Click
 */
-Menu_Selected_Refresh_Click: 
+Menu_Selected_Refresh_Click:
     ok = VRMethod( "CN_smbtree", "SetRecordAttr", SMBObj.rh, "Icon","#61:PMWP.DLL")
     call _DelSMBObjectShares SMBObj.rh
@@ -3531 +3607 @@
 /*:VRX         Menu_Selected_TimeSync_Click
 */
-Menu_Selected_TimeSync_Click: 
+Menu_Selected_TimeSync_Click:
     if options.!debug == 1 then say time()' Menu_Selected_TimeSync_Click started'
 
@@ -3550 +3626 @@
 /*:VRX         Menu_Selected_TreeView_Click
 */
-Menu_Selected_TreeView_Click: 
+Menu_Selected_TreeView_Click:
     ok = VRSet("CN_smbtree", "View", "IconTree")
 return
@@ -3563 +3639 @@
 /*  Disabled, because we merge profile now - in earlier revisions
     we replaced it but only for preexisting drives - this made only
-    sense as long as we were unable to detect double connections - 
+    sense as long as we were unable to detect double connections -
     this could be made an option!
-    
+
     IF options.!autoload then do
         CALL _Dynamic "ok = "fs.!prefix"RxDetach('"vfs.!drive"')"
@@ -3645 +3721 @@
             end
             else do /* Same hash, status passive - we have to remove it */
-                ok = VRMethod("CN_CONDET", "RemoveRecord", records.i ) 
+                ok = VRMethod("CN_CONDET", "RemoveRecord", records.i )
             end
         end
@@ -3751 +3827 @@
         /* Workaround for truncated resource string */
         if length(p_rw) > 1 then do
-            /* The resource string must have been truncated 
-               p_rw is already wrong and 
+            /* The resource string must have been truncated
+               p_rw is already wrong and
                p_easupport will most likely be also wrong (look below for workaround!) */
             p_rw ="W" /* this is guessed only!!! */
             if options.!debug == 1 then say '  WARNING! Detected truncated resource string - shorten workgroup name, server name, share name until this message goes away!'
         end
-        /* this should be done unconditionally if the resource string is never truncated */ 
+        /* this should be done unconditionally if the resource string is never truncated */
         else resource  = left(resource,length(resource)-length(p_rw))
 
@@ -3814 +3890 @@
 /*:VRX         ParseResParmString
 */
-ParseResParmString: 
+ParseResParmString:
     PARSE VAR resource . ';WORKGROUP=' p_workgroup ';' .
     PARSE VAR resource . ';SERVER=' p_server ';' .
@@ -3839 +3915 @@
 */
 PB_ABOUT_COPY_Click:
+
+    if VRGet("CB_TRAC","set") then DO
+        remainstr = AboutStr
+        AboutStr = ''
+        DO WHILE remainstr <> ''
+            PARSE VAR remainstr _part '0d0a'x remainstr
+            AboutStr = AboutStr || _part ||'[[BR]]'||'0d0a'x
+        END
+    END
     ok = VRMethod( "Application", "PutClipboard", AboutStr )
     if options.!debug == 1 then call beep 880*2,10
@@ -3871 +3956 @@
 /*:VRX         PB_ClearCred_Click
 */
-PB_ClearCred_Click: 
+PB_ClearCred_Click:
     call Menu_File_ucCred_Reset_Click
 return
@@ -4001 +4086 @@
     CALL VRSet "GB_CURRENT", "ENABLED", 1
     ok = VRSet("PB_EDIT_CANCEL","Visible", 0)
-    ok = VRMethod( "TDL_1", "SetTabText", 1, " "NLVGetMessage(13)" " ) 
+    ok = VRMethod( "TDL_1", "SetTabText", 1, " "NLVGetMessage(13)" " )
 /*  CALL NLVSetText 'DT_DIALOG',        "Caption", 13 */
 RETURN 0
@@ -4248 +4333 @@
     end
     else do /* Turn on additional columns in connection details view */
-        ok = VRRedirectStdio("OFF") 
+        ok = VRRedirectStdio("OFF")
         ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.mpidxfh ,       "Visible", 0)
         ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.passwordfh ,    "Visible", 0)
@@ -4474 +4559 @@
 /*:VRX         Pict_PWINMEM_Click
 */
-Pict_PWINMEM_Click: 
+Pict_PWINMEM_Click:
     if VRGet("Pict_PWINMEM","PicturePath") = "#36" then do
         call Menu_File_ucCred_Reset_Click
@@ -4551 +4636 @@
 /*:VRX         SPIN_NRO1_Change
 */
-SPIN_NRO1_Change: 
+SPIN_NRO1_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4557 +4642 @@
 /*:VRX         SPIN_NRO2_Change
 */
-SPIN_NRO2_Change: 
+SPIN_NRO2_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4563 +4648 @@
 /*:VRX         SPIN_NRO3_Change
 */
-SPIN_NRO3_Change: 
+SPIN_NRO3_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4569 +4654 @@
 /*:VRX         SPIN_NRO4_Change
 */
-SPIN_NRO4_Change: 
+SPIN_NRO4_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4587 +4672 @@
 /*:VRX         SW_ABOUT_Close
 */
-SW_ABOUT_Close: 
+SW_ABOUT_Close:
+    options.!tracmark = VRGet('CB_TRAC', 'Set')
     call SW_ABOUT_Fini
 return
@@ -4593 +4679 @@
 /*:VRX         SW_ABOUT_Create
 */
-SW_ABOUT_Create: 
+SW_ABOUT_Create:
     call SW_ABOUT_Init
 
@@ -4601 +4687 @@
     CALL NLVSetText 'CB_TRAC',         "Caption", 134
 
-    ok = VRSet("DT_About","Caption", Program' (c) 2007-2013 Alexander Taylor'||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
+    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.')
 
     About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )
@@ -4611 +4699 @@
 /*:VRX         SW_ABOUT_Fini
 */
-SW_ABOUT_Fini: 
+SW_ABOUT_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -4618 +4706 @@
 /*:VRX         SW_ABOUT_Init
 */
-SW_ABOUT_Init: 
+SW_ABOUT_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
@@ -4675 +4763 @@
 /*:VRX         SW_ADVANCED_Init_Content
 */
-SW_ADVANCED_Init_Content: 
+SW_ADVANCED_Init_Content:
     IF advanced.!easupport     \= "" THEN ok = VRSet("CB_EAS",     "Set",   advanced.!easupport)
     IF advanced.!readonly      \= "" THEN ok = VRSet("CB_READONLY","Set",   advanced.!readonly)
@@ -4688 +4776 @@
 /*:VRX         SW_CONDET_Close
 */
-SW_CONDET_Close: 
+SW_CONDET_Close:
     call SW_CONDET_Fini
 return
@@ -4694 +4782 @@
 /*:VRX         SW_CONDET_Create
 */
-SW_CONDET_Create: 
+SW_CONDET_Create:
     call SW_CONDET_Init
 return
@@ -4700 +4788 @@
 /*:VRX         SW_CONDET_Fini
 */
-SW_CONDET_Fini: 
+SW_CONDET_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -4707 +4795 @@
 /*:VRX         SW_CONDET_Init
 */
-SW_CONDET_Init: 
+SW_CONDET_Init:
 
 return
@@ -4713 +4801 @@
 /*:VRX         SW_CONDET_Init_Content
 */
-SW_CONDET_Init_Content: 
+SW_CONDET_Init_Content:
     if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
 
@@ -4722 +4810 @@
 /*:VRX         SW_DIALOG_Close
 */
-SW_DIALOG_Close: 
+SW_DIALOG_Close:
     call SW_DIALOG_Fini
 return
@@ -4728 +4816 @@
 /*:VRX         SW_DIALOG_Create
 */
-SW_DIALOG_Create: 
+SW_DIALOG_Create:
     call SW_DIALOG_Init
 return
@@ -4734 +4822 @@
 /*:VRX         SW_DIALOG_Fini
 */
-SW_DIALOG_Fini: 
+SW_DIALOG_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -4741 +4829 @@
 /*:VRX         SW_DIALOG_Init
 */
-SW_DIALOG_Init: 
+SW_DIALOG_Init:
     LEDSize = VRMethod( "Screen", "PixelsToTwips", 16 )
 
@@ -4751 +4839 @@
 /*:VRX         SW_DIALOG_Init_Content
 */
-SW_DIALOG_Init_Content: 
+SW_DIALOG_Init_Content:
     /* obsolete */
     if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
@@ -4771 +4859 @@
 */
 SW_INFO_Create:
-    if options.!debug == 1 then say time()' SW_INFO_Create started'    
+    if options.!debug == 1 then say time()' SW_INFO_Create started'
     call SW_INFO_Init
     CALL NLVSetText 'SW_INFO',    "Caption", 92
@@ -4827 +4915 @@
     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!MAC,    Info.TypeFH, "MAC" ,Info.ValueFH, VRMethod("CN_SMBTREE", "GetFieldData", SMBObj.RH, MacFH ))
 
-    if options.!debug == 1 then say time()' SW_INFO_Create done'    
+    if options.!debug == 1 then say time()' SW_INFO_Create done'
 return
 
@@ -4858 +4946 @@
 */
 SW_LOGIN_Create:
-    call SW_LOGIN_Init 
+    call SW_LOGIN_Init
     ok = VRSet("SW_LOGIN","Caption",NLVGetMessage(136)' 'strip(p_workgroup' \\'p_server'\'p_share,'T','\'))
     CALL NLVSetText 'DT_USER1',       "Caption", 25
@@ -4872 +4960 @@
             when SMBObj.udatatype = "SERVER"    then LoginIcon = SMBObj.Icon
             when SMBObj.udatatype = "DISK"      then do
-                if pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.parentrh, MBFH)) > 0 
+                if pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.parentrh, MBFH)) > 0
                     then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
                     else LoginIcon = "#35:PMWP.DLL" /* icons.!pdc */
@@ -4976 +5064 @@
 /*:VRX         SW_PORTCONNECT_Close
 */
-SW_PORTCONNECT_Close: 
+SW_PORTCONNECT_Close:
     call SW_PORTCONNECT_Fini
 return
@@ -4982 +5070 @@
 /*:VRX         SW_PORTCONNECT_Create
 */
-SW_PORTCONNECT_Create: 
+SW_PORTCONNECT_Create:
     call SW_PORTCONNECT_Init
 
@@ -4988 +5076 @@
 
     if ok = "" then do
-        
+
     end
     else do
@@ -5011 +5099 @@
 /*:VRX         SW_PORTCONNECT_Fini
 */
-SW_PORTCONNECT_Fini: 
+SW_PORTCONNECT_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -5018 +5106 @@
 /*:VRX         SW_PORTCONNECT_Init
 */
-SW_PORTCONNECT_Init: 
+SW_PORTCONNECT_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "TabbedDialog" ) ) then do
@@ -5116 +5204 @@
 /*:VRX         SW_SETTINGS_Init_Content
 */
-SW_SETTINGS_Init_Content: 
+SW_SETTINGS_Init_Content:
     ok = VRSet("PB_SETTINGS_UNDO","Enabled", 1)
 
@@ -5156 +5244 @@
     end
 
-    advanced.!smbconfchanged = 0    
+    advanced.!smbconfchanged = 0
 return
 
 /*:VRX         SW_SMBTREE_Close
 */
-SW_SMBTREE_Close: 
+SW_SMBTREE_Close:
     call SW_SMBTREE_Fini
 return
@@ -5167 +5255 @@
 /*:VRX         SW_SMBTREE_Create
 */
-SW_SMBTREE_Create: 
+SW_SMBTREE_Create:
     call SW_SMBTREE_Init
 return
@@ -5173 +5261 @@
 /*:VRX         SW_SMBTREE_Fini
 */
-SW_SMBTREE_Fini: 
+SW_SMBTREE_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -5180 +5268 @@
 /*:VRX         SW_SMBTREE_Init
 */
-SW_SMBTREE_Init: 
+SW_SMBTREE_Init:
 
 return
@@ -5186 +5274 @@
 /*:VRX         SW_SMBTREE_Init_Content
 */
-SW_SMBTREE_Init_Content: 
+SW_SMBTREE_Init_Content:
     if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 1)
 
@@ -5196 +5284 @@
 /*:VRX         TDL_1_PageSelected
 */
-TDL_1_PageSelected: 
+TDL_1_PageSelected:
     page =  VRInfo("Page")
 
     /* call _TabsStrip */
-    select 
+    select
         when page = 1 then do /* dialog */
-            call _TabFix 1 
+            call _TabFix 1
         end
         when page = 2 then do /* advanced */
@@ -5227 +5315 @@
 /*:VRX         TM_Progress_Throbber_Trigger
 */
-TM_Progress_Throbber_Trigger: 
+TM_Progress_Throbber_Trigger:
     pIdx = VRGet("Pict_Progress_Throbber","PicturePath")
     parse var pIdx '#' pidx
@@ -5237 +5325 @@
 /*:VRX         TM_RefreshCurrentDisplay_Trigger
 */
-TM_RefreshCurrentDisplay_Trigger: 
+TM_RefreshCurrentDisplay_Trigger:
     if RefreshMode <> "" then return
     if _DaemonRunning() = 0 then do

trunk/guitools/shared/nlv.vrs

@@ -4 +4 @@
     /* This subroutine is (c) by Alex Taylor, portions (c) Herwig Bauernfeind
      * Sets all UI text from the message file.  Any string that can't be loaded
-     * will default to the built-in English. 
+     * will default to the built-in English.
      */
 
@@ -18 +18 @@
     say '  NLV srchroot   = "'srchRoot'"'
 
-    filestem = VRParseFileName( execPath, "N")'_'
-    if translate(filestem) = "EVFSGUI_" then filestem = "evfsi_"
+    filestem = VRParseFileName( execPath, "N")
+    if translate(filestem) = "EVFSGUI" then filestem = "evfsi_"
+    else filestem = SUBSTR( filestem, 1, 6, '_' )
     say '  NLV filestem   = "'filestem'"'
 
@@ -90 +91 @@
             end
         end
-    end    
+    end
     say time()' NLVSearch() done, returning "'NLVFile'"'
 return NLVFile
@@ -105 +106 @@
 
     SELECT
-        WHEN ARG() == 2 THEN 
+        WHEN ARG() == 2 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2) )
-        WHEN ARG() == 3 THEN 
+        WHEN ARG() == 3 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3) )
-        WHEN ARG() == 4 THEN 
+        WHEN ARG() == 4 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4) )
-        WHEN ARG() == 5 THEN 
+        WHEN ARG() == 5 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5) )
-        WHEN ARG() == 6 THEN 
+        WHEN ARG() == 6 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6) )
-        WHEN ARG() == 7 THEN 
+        WHEN ARG() == 7 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(3), ARG(4), ARG(5), ARG(6), ARG(7) )
-        WHEN ARG() == 8 THEN 
+        WHEN ARG() == 8 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8) )
-        WHEN ARG() == 9 THEN 
+        WHEN ARG() == 9 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9) )
-        WHEN ARG() == 10 THEN 
+        WHEN ARG() == 10 THEN
             msgtxt = SysGetMessage( msgnum, msgfile, ARG(2), ARG(2), ARG(4), ARG(5), ARG(6), ARG(7), ARG(8), ARG(9), ARG(10) )
         OTHERWISE
@@ -135 +136 @@
 /*:VRX         NLVSetText
 */
-/* 
- * Sets the specified property of the specified control to the specified 
+/*
+ * Sets the specified property of the specified control to the specified
  * message text.
  */
@@ -143 +144 @@
 
     success = 1
-    IF substitution == '' THEN     
+    IF substitution == '' THEN
         text = NLVGetMessage( message )
     ELSE
         text = NLVGetMessage( message, substitution )
 
-    IF text == '' THEN success = 0 
+    IF text == '' THEN success = 0
     ELSE               CALL VRSet control, property, text