Changeset 362 for branches

Timestamp:

Jan 7, 2010, 11:17:27 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI resizing fixes by Alex Taylor

Location:

branches/guitools-2.0/evfsgui

Files:

• changes (modified) (1 diff)
• evfsgui.VRP (modified) (1 diff)
• evfsgui.VRX (modified) (181 diffs)
• evfsgui.VRY (modified) ( previous)

branches/guitools-2.0/evfsgui/changes

@@ -3 +3 @@
 - Debug on/off option is badly implemented (rework required)
 - Create Icon. stem in order to ease maintainance of icons
+
+Version 2.0.1 (Alex T. 2010-01-07)
+- Added: Use 'Combined' font on DBCS systems
+- Fixed: Default fonts are set correctly
+- Fixed: Section title colours now correctly default to system settings
+- Fixed: Various fixes and enhancements to window resize logic
 
 Version 2.0.0 (Refresh)

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -8 +8 @@
 VRXWindow: __VREMainWindow,1,1072,1783,891,3951
 VRXWindow: __VRESectionListWindow,1,602,11033,11033,3975
-VRXWindow: __VREToolsWindow,1,1963,819,6992,1665
+VRXWindow: __VREToolsWindow,1,1963,819,6986,1669
 VRXWindow: __VREWindListWindow,1,470,8528,2650,3150
 UserFile: 1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -66 +66 @@
     if __vrlsHWnd = '' then signal __vrlsDone
     if __vrlsWait \= 1 then signal __vrlsDone
-    call VRSet __vrlsHWnd, 'WindowMode', 'Modal' 
+    call VRSet __vrlsHWnd, 'WindowMode', 'Modal'
     __vrlsTmp = __vrlsWindows.0
     if( DataType(__vrlsTmp) \= 'NUM' ) then do
@@ -82 +82 @@
     __vrlsTmp = __vrlsWindows.0
     __vrlsWindows.0 = __vrlsTmp - 1
-    call VRWindow __vrlsWindows.__vrlsTmp 
+    call VRWindow __vrlsWindows.__vrlsTmp
     __vrlsHWnd = ''
 __vrlsDone:
@@ -91 +91 @@
 __VXREXX____APPENDS__:
 /*
-#append U:\Develop\Samba\guitools-2.0\shared\smbtree.vrs
 #append U:\Develop\Samba\guitools-2.0\shared\cltinit.vrs
 #append U:\Develop\Samba\guitools-2.0\shared\inittempdir.vrs
-#append U:\Develop\Samba\guitools-2.0\shared\rexx_md5.VRS
-#append U:\Develop\Samba\guitools-2.0\shared\textini.vrs
 #append U:\Develop\Samba\guitools-2.0\shared\nlv.vrs
+#append U:\Develop\Samba\guitools-2.0\shared\rexx_md5.vrs
+#append U:\Develop\Samba\guitools-2.0\shared\smbtree.vrs
 */
 return
 /*:VRX         _AddTemplates
 */
-_AddTemplates: 
+_AddTemplates:
 
     VolTplRH = VRMethod('CN_CURRENT', 'AddRecord', , 'First', 'Volume template', '#10:PMWP.DLL' )
@@ -109 +108 @@
 /*:VRX         _ContainersInit
 */
-_ContainersInit: 
+_ContainersInit:
 
     /* Connection details */
@@ -139 +138 @@
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.logfilefh ,     "Visible", 0)
     ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.loglevelfh ,    "Visible", 0)
-    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0) 
+    ok = VRMethod("CN_CONDET", "SetFieldAttr", cd.hashfh ,        "Visible", 0)
 
     ok = VRSet("CN_CONDET", "DetailSort", cd.mpointfh )
@@ -155 +154 @@
 /*:VRX         _CreateSmbConf
 */
-_CreateSmbConf: 
+_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)
@@ -174 +173 @@
 /*:VRX         _DialogPopulate
 */
-_DialogPopulate: 
+_DialogPopulate:
 
     ok = VRMethod( "CN_smbtree", "GetRecordList", "Visible", "rh." )
@@ -196 +195 @@
             when ResType = "DISK"      then ok = VRMethod("EF_SHARE",  "AddString", ResName)
             otherwise nop
-        end        
+        end
     end
 
@@ -203 +202 @@
 /*:VRX         _GUIInit
 */
-_GUIInit: 
+_GUIInit:
     CALL VRSet 'Main', 'HelpFile', settings.!helpfile
 
@@ -281 +280 @@
         CALL VRMethod CB_MOUNT, 'Clear'
         CALL VRMethod CB_MOUNT, 'AddStringList', 'mtype.'
-    END     
+    END
 
     ok = VRSet("Main","Width", 8200)
@@ -289 +288 @@
     /* Setup SmbTree View */
     ok = VRset("GB_SMBTREE","Painting", 0)
-    FWidth = 32
+
+    FWidth = ((VRGet("Main", "InteriorLeft") / 3) * 2) + 2
 
     ok = VRSet("DT_STATUSBAR", "Caption", VRGet("Main", "HintText"))
@@ -297 +297 @@
 /*:VRX         _PassiveLoad
 */
-_PassiveLoad: 
+_PassiveLoad:
 Say "_PassiveLoad started"
     do cnt = 1 to 255
@@ -355 +355 @@
 /*:VRX         _PassiveSave
 */
-_PassiveSave: 
+_PassiveSave:
     ok = VRDelIni( "PassiveConnections", "ALL", settings.!ini )
 
@@ -363 +363 @@
     cnt = 0
     DO i = 1 TO records.0
-   
+
         if VRMethod( 'CN_CONDET', "GetFieldData", records.i, CD.StatusFH) = '#68:PMWP.DLL' then do
             cnt = cnt + 1
@@ -437 +437 @@
 
         end
-
         CALL VRMessage 'Main', PrinterName' ('PrinterQueue') prints to port ' Port' connected to \\'p_workgroup'\'p_prtsrv'\'p_printer, NLVGetMessage( 1 ), 'I'
     end
@@ -447 +446 @@
 /*:VRX         _ShowMsg
 */
-_ShowMsg: 
-    /* preliminary implementation - we just do not ignore it anymore - 
+_ShowMsg:
+    /* preliminary implementation - we just do not ignore it anymore -
        - ShowMsg from smbmon/smbusers shoule become a shared library */
     ok = VRSet("DT_StatusBar", "Caption", Msg.Text)
@@ -455 +454 @@
 /*:VRX         _UserCredUpdate
 */
-_UserCredUpdate: 
+_UserCredUpdate:
     credentials.!username = VRGet("EF_USER","Value")
     credentials.!password = VRGet("EF_PASSWORD","Value")
 
-    if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0 
+    if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0
         then UserCred = '--user='Credentials.!username'%'Credentials.!password
         else UserCred = '--user='Credentials.!username'%%'Credentials.!password
@@ -466 +465 @@
 /*:VRX         CB_DEBUG_Click
 */
-CB_DEBUG_Click: 
+CB_DEBUG_Click:
 
 return
@@ -472 +471 @@
 /*:VRX         CB_LOGGING_Click
 */
-CB_LOGGING_Click: 
-    if VRFileExists(SysBootDrive()'\ndpsmb.dbg') then 
+CB_LOGGING_Click:
+    if VRFileExists(SysBootDrive()'\ndpsmb.dbg') then
         ok = SysFileDelete(SysBootDrive()'\ndpsmb.dbg')
     else do
@@ -485 +484 @@
 /*:VRX         CB_MOUNT_Change
 */
-CB_MOUNT_Change: 
+CB_MOUNT_Change:
     IF options.!debug == 1 THEN SAY time()' '||"CB_MOUNT_Change started"
 
@@ -542 +541 @@
 /*:VRX         CN_CONDET_Click
 */
-CN_CONDET_Click: 
+CN_CONDET_Click:
     ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
 return
@@ -548 +547 @@
 /*:VRX         CN_CONDET_ContextMenu
 */
-CN_CONDET_ContextMenu: 
+CN_CONDET_ContextMenu:
     rh = VRInfo('Record')
     if VRMethod( 'CN_CONDET', "ValidateRecord", rh) <> 1 then return
 
     /* This is the place to enable specific context menu entries */
-    ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." ) 
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "All", "records." )
     ok = VRSet("Menu_Selected_Remove", "Visible",  (records.0 <> 0))
     ok = VRSet("Menu_Selected_Retry",  "Visible",  (records.0 <> 0))
@@ -565 +564 @@
 /*:VRX         CN_CONDET_DragStart
 */
-CN_CONDET_DragStart: 
-   
+CN_CONDET_DragStart:
+
     obj = VRInfo( "object" )
-    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." ) 
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." )
     if selrec.0 = 0 then return
 
@@ -603 +602 @@
     end
 /*
-    infotext = p_node    
-    DO i = 1 TO p_mounts 
+    infotext = p_node
+    DO i = 1 TO p_mounts
         infotext = infotext ' ['p_string']'
-    END  
+    END
 */
     if p_string = "" then
@@ -638 +637 @@
         CALL VRSet 'MENU_CONTEXT_DETACH', 'Visible', 1
     END
-    ELSE DO  
+    ELSE DO
         CALL VRSet 'PB_DETACH', 'Enabled', 0
         CALL VRSet 'MENU_CONTEXT_DETACH', 'Visible', 0
@@ -655 +654 @@
 
     /* Herwig B. */
-    /* we have to check whether the record still exists because under certain 
-       circumstances the event routine is executed after the record was already 
+    /* we have to check whether the record still exists because under certain
+       circumstances the event routine is executed after the record was already
        removed */
     if VRMethod( 'CN_CURRENT', "ValidateRecord", rh) <> 1 then return
@@ -669 +668 @@
     IF options.!debug == 1 THEN SAY time()' '||p_string
 /*
-    infotext = p_node    
-    DO i = 1 TO p_mounts 
+    infotext = p_node
+    DO i = 1 TO p_mounts
         infotext = infotext ' ['p_string']'
-    END  
+    END
 */
     if p_string = "" then
@@ -704 +703 @@
         CALL VRSet 'MENU_CONTEXT_DETACH', 'Visible', 1
     END
-    ELSE DO  
+    ELSE DO
         CALL VRSet 'PB_DETACH', 'Enabled', 0
         CALL VRSet 'MENU_CONTEXT_DETACH', 'Visible', 0
@@ -715 +714 @@
 /*:VRX         CN_CURRENT_DoubleClick
 */
-CN_CURRENT_DoubleClick: 
+CN_CURRENT_DoubleClick:
     call beep 880, 20
 say "double click"
     rh = VRInfo('Record')
     /* Herwig B. */
-    /* we have to check whether the record still exists because under certain 
-       circumstances the event routine is executed after the record was already 
+    /* we have to check whether the record still exists because under certain
+       circumstances the event routine is executed after the record was already
        removed */
     if VRMethod( 'CN_CURRENT', "ValidateRecord", rh) <> 1 then return
@@ -732 +731 @@
 /*:VRX         CN_CURRENT_DragDrop
 */
-CN_CURRENT_DragDrop: 
+CN_CURRENT_DragDrop:
 say "settings.!network = "settings.!network
     p_workgroup    = ''
@@ -815 +814 @@
             ParDragCapt = VRMethod(srcCtn, "GetRecordAttr", ParRH, "Caption")
             GParRH = VRMethod(srcCtn, "GetRecordAttr", ParRH, "Parent")
-    
+
             if GParRH = "" then do /* A server was dragged */
                 say "Server dragged!"
@@ -874 +873 @@
 
         do while parTrgRH <> ""
-            partrgCapt = VRMethod(trgCtn, "GetRecordAttr", partrgRH, "Caption")        
+            partrgCapt = VRMethod(trgCtn, "GetRecordAttr", partrgRH, "Caption")
             TargetString = partrgCapt||'\'||TargetString
             parTrgRH = VRMethod(trgCtn, "GetRecordAttr", partrgRH , "Parent")
@@ -894 +893 @@
 /*:VRX         CN_SMBTREE_Click
 */
-CN_SMBTREE_Click: 
+CN_SMBTREE_Click:
     ok = VRset("DT_StatusBar","Caption", VRGet("Main", "HintText"))
     rh = VRInfo('Record')
@@ -900 +899 @@
     udata = VRMethod('CN_smbtree', 'GetRecordAttr', rh, 'UserData')
     parse var udata udatatype'|'udatamsg
-
+say udatatype
+say udatamsg
     ok = VRset("DT_Statusbar", "Caption", udatamsg)
     drop udatatype
     drop udatamsg
-    
+
 return
 
 /*:VRX         CN_SMBTREE_ContextMenu
 */
-CN_SMBTREE_ContextMenu: 
+CN_SMBTREE_ContextMenu:
     rh = VRInfo('Record')
     if VRMethod( 'CN_SMBTREE', "ValidateRecord", rh) <> 1 then return
 
     Icon = VRMethod("CN_SMBTREE", "GetRecordAttr", rh, "Icon")
-    
+
     ok = VRset("MItem_64","Visible", (Icon = "#35:PMWP.DLL")|(Icon = "#62:PMWP.DLL"))
     ok = VRset("Menu_Selected_Info","Visible", (Icon = "#35:PMWP.DLL"))
@@ -926 +926 @@
 
     /* This is the place to enable specific context menu entries */
-    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "All", "records." ) 
+    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "All", "records." )
     ok = VRSet("Menu_Selected_Connect", "Visible", (records.0 <> 0 & (Icon <> "#61:PMWP.DLL") ))
 
@@ -934 +934 @@
 /*:VRX         CN_SMBTREE_DragStart
 */
-CN_SMBTREE_DragStart: 
-   
+CN_SMBTREE_DragStart:
+
     obj = VRInfo( "object" )
-    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "selrec." ) 
+    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "SourceOrSelected", "selrec." )
     if selrec.0 = 0 then return
 
@@ -962 +962 @@
 /*:VRX         DT_STATUSBAR_ContextMenu
 */
-DT_STATUSBAR_ContextMenu: 
+DT_STATUSBAR_ContextMenu:
     ok = VRSet("DT_STATUSBAR","Caption", VRGet("Main", "HintText"))
 return
@@ -968 +968 @@
 /*:VRX         EF_PASSWORD1_KeyPress
 */
-EF_PASSWORD1_KeyPress: 
+EF_PASSWORD1_KeyPress:
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
 /*  say keystr */
-    select 
+    select
         when keystr = "{Enter}" then call PB_LOGIN_OK_Click
         when keystr = "{Newline}" then call PB_LOGIN_OK_Click
@@ -982 +982 @@
 /*:VRX         EF_PASSWORD_Change
 */
-EF_PASSWORD_Change: 
+EF_PASSWORD_Change:
     call _UserCredUpdate
 return
@@ -988 +988 @@
 /*:VRX         EF_SERVER_Change
 */
-EF_SERVER_Change: 
+EF_SERVER_Change:
     Now = VRGet("EF_SERVER","value")
     if Now = "" then return
@@ -1055 +1055 @@
 /*:VRX         EF_USER1_KeyPress
 */
-EF_USER1_KeyPress: 
+EF_USER1_KeyPress:
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
 /*  say keystr */
-    select 
-        when keystr = "{Enter}" then ok = VRMethod( "EF_Password1", "SetFocus" ) 
-        when keystr = "{Newline}" then ok = VRMethod( "EF_Password1", "SetFocus" ) 
+    select
+        when keystr = "{Enter}" then ok = VRMethod( "EF_Password1", "SetFocus" )
+        when keystr = "{Newline}" then ok = VRMethod( "EF_Password1", "SetFocus" )
         when keystr  = "{Esc}" then call PB_LOGIN_CANCEL_Click
         otherwise nop
@@ -1069 +1069 @@
 /*:VRX         EF_USER_Change
 */
-EF_USER_Change: 
+EF_USER_Change:
     call _UserCredUpdate
 return
@@ -1090 +1090 @@
     IF options.!debug == 1 THEN SAY '  Dyn code: 'dyn
     interpret dyn; drop dyn
-    
-    
+
+
     IF info.2 > 0 THEN icon = '#64:PMWP.DLL'
     ELSE               icon = '#68:PMWP.DLL'
@@ -1099 +1099 @@
     exc = exc + 1
     existrec.exc = rh
-    userdata = node';'info.2 
-    DO i = 1 TO res.0 
+    userdata = node';'info.2
+    DO i = 1 TO res.0
         userdata = ParseResourceData( userdata, res.i )
     END
-    if userdata = "UNKNOWN" then ok = VRMethod('CN_CURRENT', 'RemoveRecord', rh) 
+    if userdata = "UNKNOWN" then ok = VRMethod('CN_CURRENT', 'RemoveRecord', rh)
     else CALL VRMethod 'CN_CURRENT', 'SetRecordAttr', rh, 'UserData', userdata
 
-    DO i = 1 TO points.0 
+    DO i = 1 TO points.0
         childnode = node || points.i || '\'
         CALL GetChildren childnode, rh
@@ -1117 +1117 @@
 GetMountPoints: PROCEDURE EXPOSE existrec. options. fs. cd. samba.
     IF options.!debug == 1 THEN SAY time()' GetMountPoints started'
-    CALL VRSet 'CN_CURRENT', 'Painting', 0 
+    CALL VRSet 'CN_CURRENT', 'Painting', 0
 /*  IF options.!debug == 1 THEN SAY time()' '||"GetMountPoints: SysDriveMap(USED) started"  */
     drvs = SysDriveMap('C:', 'USED') /* was "REMOTE" */
@@ -1135 +1135 @@
         node = attached.i'\'
 
-        CALL VRMethod 'CB_DRIVES',  'AddString', attached.i 
+        CALL VRMethod 'CB_DRIVES',  'AddString', attached.i
 
         dyn = "CALL "fs.!prefix"RxGetMount node, 'info.', 'points.', 'res.'"
@@ -1150 +1150 @@
         existrec.exc = rh
         userdata = node';'info.2
-        DO j = 1 TO res.0 
+        DO j = 1 TO res.0
             userdata = ParseResourceData( userdata, res.j )
         END
@@ -1189 +1189 @@
 /*:VRX         LoadFileSysFuncs
 */
-LoadFileSysFuncs: 
+LoadFileSysFuncs:
     IF options.!debug == 1 THEN SAY time()' LoadFileSysFuncs() started'
     Fatal = 1
@@ -1196 +1196 @@
 
 CtlRestart:
-    if \ForceNDFS then signal NoNetDrive   
+    if \ForceNDFS then signal NoNetDrive
 
 ForceNDFS:
@@ -1203 +1203 @@
     SIGNAL ON SYNTAX NAME NoNetdrive
     call NdRxLoadFuncs
-    SIGNAL OFF SYNTAX 
+    SIGNAL OFF SYNTAX
     fs.!prefix         = 'ND'
     fs.!fileSystemtype = "NDFS32"
@@ -1211 +1211 @@
     IF options.!debug == 1 THEN SAY '  NDFS not found'
     CALL RxFuncAdd 'EvfsRxLoadFuncs', 'EVFSCALL.DLL', 'EvfsRxLoadFuncs'
-    SIGNAL ON SYNTAX NAME NoEVFSCALL 
+    SIGNAL ON SYNTAX NAME NoEVFSCALL
     CALL EvfsRxLoadFuncs
-    SIGNAL OFF SYNTAX 
+    SIGNAL OFF SYNTAX
     fs.!prefix         = 'EVFS'
     fs.!fileSystemtype = "EVFS"
@@ -1258 +1258 @@
 /*:VRX         LoadSettings
 */
-LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba. ShowHidden FWidth
+LoadSettings: PROCEDURE EXPOSE settings. options. fs. advanced. samba. ShowHidden
     IF options.!debug == 1 THEN SAY time()' LoadSettings started'
 
@@ -1314 +1314 @@
         settings.!curbcolor = VRGetIni('Settings', 'TitleBarBackground', settings.!ini, 'NoClose')
         settings.!curfcolor = VRGetIni('Settings', 'TitleBarForeground', settings.!ini, 'NoClose')
-        IF settings.!curbcolor = '' THEN settings.!curbcolor = VRGetIni('PM_Default_Colors', 'ActiveTitleText', 'User', 'NoClose')
-        IF settings.!curfcolor = '' THEN settings.!curfcolor = VRGetIni('PM_Default_Colors', 'ActiveTitleTextBgnd', 'User', 'NoClose')
+        IF (settings.!curbcolor = '' | settings.!curbcolor = '<default>') THEN settings.!curbcolor = 'SystemActiveTitle'
+        IF (settings.!curfcolor = '' | settings.!curfcolor = '<default>') THEN settings.!curfcolor = 'SystemActiveTitleText'
 
         settings.!buttonson = VRGetIni('Settings', 'ButtonsOn', settings.!ini, 'NoClose')
@@ -1334 +1334 @@
         settings.!network = ''
 
-        if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf        
+        if \VRFileExists( samba.!smbconf ) then call _CreateSmbConf
 
         /* Load font settings.
          */
+        IF VRFileExists( SysBootDrive() || '\OS2DBCS') == 1 THEN
+            default_font = '9.WarpSans Combined'
+        ELSE
+            default_font = '9.WarpSans'
         settings.!cfont = VRGetIni('Settings', 'ContainerFont', settings.!ini, 'NoClose')
         settings.!wfont = VRGetIni('Settings', 'WindowFont',    settings.!ini, 'NoClose' )
-        IF settings.!cfont  == '' THEN settings.!font  = '9.WarpSans'
-        IF settings.!wfont  == '' THEN settings.!font  = '9.WarpSans'
+        IF settings.!cfont  == '' THEN settings.!cfont  = default_font
+        IF settings.!wfont  == '' THEN settings.!wfont  = default_font
 
         advanced.!browseauth = VRGetIni('Settings', 'BrowseAuth', settings.!ini, 'NoClose')
@@ -1350 +1354 @@
 
         advanced.!debug = VRGetIni('Settings', 'Debug', settings.!ini)
-        IF advanced.!debug == '' THEN advanced.!debug = 1 /* change this later */
+        IF advanced.!debug == '' THEN advanced.!debug = 0       /* Turn off debug by default for release builds */
 
         /* This is a hack and should be reworked! - using several variables for debug is bad! */
@@ -1357 +1361 @@
 
         advanced.!alwaysmp = VRGetIni('Settings', 'AlwaysMP', settings.!ini)
-        IF advanced.!alwaysmp == '' THEN advanced.!alwaysmp = 1 
+        IF advanced.!alwaysmp == '' THEN advanced.!alwaysmp = 1
 
         advanced.!special = VRGetIni('Settings', 'SpecialShares', settings.!ini)
-        IF advanced.!special == '' THEN advanced.!special = 0 
+        IF advanced.!special == '' THEN advanced.!special = 0
 
         advanced.!bigicons = VRGetIni('Settings', 'BigIcons', settings.!ini)
-        IF advanced.!bigicons == '' THEN advanced.!bigicons = 1 
+        IF advanced.!bigicons == '' THEN advanced.!bigicons = 1
 
         advanced.!savepassive = VRGetIni('Settings', 'SavePassive', settings.!ini)
-        IF advanced.!savepassive == '' THEN advanced.!savepassive = 0 
+        IF advanced.!savepassive == '' THEN advanced.!savepassive = 0
 
         advanced.!broadcast = VRGetIni('Settings', 'Broadcast', settings.!ini)
-        IF advanced.!broadcast == '' THEN advanced.!broadcast = 0 
+        IF advanced.!broadcast == '' THEN advanced.!broadcast = 0
 
         /* Apply the settings
@@ -1382 +1386 @@
         ok = VRSet("DT_SMBTREE","BACKCOLOR", settings.!curbcolor )
         ok = VRSet("DT_SMBTREE","FORECOLOR", settings.!curfcolor )
+        ok = VRSet("DT_CONDET","BACKCOLOR", settings.!curbcolor )
+        ok = VRSet("DT_CONDET","FORECOLOR", settings.!curfcolor )
 
         ok = VRset("CN_CURRENT", "MiniIcons", \advanced.!bigicons)
@@ -1410 +1416 @@
         end
 
-        if advanced.!debug == 1 then ok = VRRedirectStdio("ON") 
+        if advanced.!debug == 1 then ok = VRRedirectStdio("ON")
 
         IF ( settings.!x >= 0 ) & ( settings.!y >= 0 ) & ( settings.!l >= 0 ) & ( settings.!w >= 0 ) & ( settings.!s >= 0 ) THEN DO
@@ -1419 +1425 @@
             CALL VRSet "SPLIT_MAIN", 'Left',  settings.!s
         END
-        ELSE 
+        ELSE
             CALL VRMethod VRWindow(), 'CenterWindow'
 
         CALL VRSet 'CN_CURRENT', 'Font',       settings.!cfont
-        CALL VRSet 'Main',    'Font',       settings.!wfont
-        CALL VRSet 'Main',    'StatusFont', settings.!wfont
-        
+        CALL VRSet 'Main',       'Font',       settings.!wfont
+        CALL VRSet 'Main',       'StatusFont', settings.!wfont
+
     END
 
@@ -1443 +1449 @@
 /*:VRX         Main_Create
 */
-Main_Create: 
+Main_Create:
     ok = VRRedirectStdIO("OFF")
     options.!debug    = 0
@@ -1477 +1483 @@
     IF options.!autoload == 1 THEN CALL PB_LOAD_Click
 
-    CALL VRSet "CB_MOUNT",  "Selected", 1 
-    CALL VRSet "CB_DRIVES", "Selected", 1 
+    CALL VRSet "CB_MOUNT",  "Selected", 1
+    CALL VRSet "CB_DRIVES", "Selected", 1
     IF options.!autoclose == 1 THEN CALL TM_AutoClose_Trigger
     /* For whatever reason the timer is not triggered anymore....
@@ -1495 +1501 @@
 /*:VRX         Main_KeyPress
 */
-Main_KeyPress: 
+Main_KeyPress:
     key = VRGet('Main', 'KeyString')
     IF key == '{F5}' THEN CALL Refresh
@@ -1502 +1508 @@
 /*:VRX         Main_Resize
 */
-Main_Resize: 
+Main_Resize:
     if datatype(options.!buttondelta) = 'CHAR' then return
 
@@ -1508 +1514 @@
     ok = VRset("Main","Painting", 0)
 
+    /* Basic measurements */
+    main_iwidth  = VRGet("Main","InteriorWidth")                /* Width of window client-area */
+    main_iheight = VRGet("Main","InteriorHeight")               /* Height of window client-area */
+    sbar_height  = VRGet("GB_STATUSBAR","Height")               /* Height of status-bar */
+    split_left   = VRGet("SPLIT_Main","Left")                   /* Position of the left edge of the split-bar */
+    margin       = FWidth                                       /* Common margin around controls */
+    pbtn_height  = 400                                          /* Height of the panels' internal button areas */
+    buttons_top  = main_iheight - sbar_height - margin - options.!buttondelta         /* Top of the common button area */
+    pane_height  = buttons_top - (margin * 3)                                         /* Height of a split-bar panel */
+    lpane_width  = split_left - margin                                                /* Width of the left split-bar panel */
+    rpane_width  = main_iwidth - split_left - 60 - margin                             /* Width of the right split-bar panel */
+
     /* Button bar */
-    ok = VRSet("GB_BUTTONS",   "Top",    VRGet("GB_CURRENT","Height")+ FWidth * 2)
-    ok = VRSet("GB_BUTTONS",   "Left",   VRGet("Main","Width") -VRGet("GB_Buttons","Width") - FWidth)
+    ok = VRSet("GB_BUTTONS",  "Top",   buttons_top )
+    ok = VRSet("GB_BUTTONS",  "Left",  main_iwidth - VRGet("GB_Buttons","Width") - margin )
 
     /* Current Panel */
-    ok = VRSet("GB_CURRENT","Visible",1)
-    ok = VRSet("GB_CURRENT","Top",    FWidth)
-    ok = VRSet("GB_CURRENT","Left",   FWidth-24)
-    ok = VRSet("GB_CURRENT","Width",  VRGet("SPLIT_Main","Left")-FWidth+24) /* 2976-FWidth*2) */
-    ok = VRSet("GB_CURRENT","Height", VRGet("Main","Height") -920 -FWidth -options.!buttondelta) /* 988 */
-
-    ok = VRset("GB_CURRENT3","Top",     FWidth)
-    ok = VRset("GB_CURRENT3","Left",    FWidth)
-    ok = VRset("GB_CURRENT3","Height",  245  )
-    ok = VRset("GB_CURRENT3","Width",   VRGet("GB_CURRENT","Width") -(FWidth*2))
-
-    ok = VRset("DT_CURRENT","Top",     8)
-    ok = VRset("DT_CURRENT","Left",    8)
-    ok = VRset("DT_CURRENT","Height",  213)
-    ok = VRset("DT_CURRENT","Width",   VRGet("GB_CURRENT3","Width") - 24)
-
-    ok = VRset("GB_CURRENT2","Left",   FWidth)
-    ok = VRset("GB_CURRENT2","Top",    245 + FWidth*2)
-    ok = VRset("GB_CURRENT2","Width",  VRGet("GB_CURRENT","Width")-FWidth*2)
-    ok = VRset("GB_CURRENT2","Height", VRGet("GB_CURRENT","Height")-FWidth*4-400-245)
-
-    ok = VRset("CN_CURRENT", "Top",    FWidth)
-    ok = VRset("CN_CURRENT", "Left",   FWidth)
-    ok = VRset("CN_CURRENT", "Width",  VRGet("GB_CURRENT2","Width") -(FWidth*2))
-    ok = VRset("CN_CURRENT", "Height", VRGet("GB_CURRENT2","Height")-(FWidth*2))
-
-    ok = VRset("PB_DETACH",  "Left",   FWidth)
-    ok = VRset("PB_DETACH",  "Top",    VRGet("GB_CURRENT","Height")- 400-FWidth-12)
-    ok = VRset("PB_DETACH",  "Width",  min((VRGet("GB_CURRENT","Width")-FWidth*3)%2, 1313))
-    ok = VRset("PB_UNMOUNT", "Left",   FWidth*2 +1313 - 12)
-/*  ok = VRset("PB_UNMOUNT", "Left",   VRGet("GB_CURRENT","Width") -VRGet("PB_DETACH","Width")-FWidth) */
-    ok = VRset("PB_UNMOUNT", "Top",    VRGet("GB_CURRENT","Height")- 400-FWidth-12)
-    ok = VRset("PB_UNMOUNT", "Width",  min((VRGet("GB_CURRENT","Width")-FWidth*3)%2, 1313))
+    ok = VRSet("GB_CURRENT",  "Visible", 1           )
+    ok = VRSet("GB_CURRENT",  "Top",     margin * 2  )
+    ok = VRSet("GB_CURRENT",  "Left",    margin      )
+    ok = VRSet("GB_CURRENT",  "Width",   lpane_width )
+    ok = VRSet("GB_CURRENT",  "Height",  pane_height )
+
+    ok = VRset("GB_CURRENT3", "Top",     margin )
+    ok = VRset("GB_CURRENT3", "Left",    margin )
+    ok = VRset("GB_CURRENT3", "Height",  245    )
+    ok = VRset("GB_CURRENT3", "Width",   lpane_width - (margin * 2))
+
+    ok = VRset("DT_CURRENT", "Top",      8   )
+    ok = VRset("DT_CURRENT", "Left",     8   )
+    ok = VRset("DT_CURRENT", "Height",   213 )
+    ok = VRset("DT_CURRENT", "Width",    (lpane_width - (margin * 2)) - 24 )
+
+    ok = VRset("GB_CURRENT2", "Left",   margin                    )
+    ok = VRset("GB_CURRENT2", "Top",    245 + (margin * 2)        )
+    ok = VRset("GB_CURRENT2", "Width",  lpane_width - (margin * 2))
+    ok = VRset("GB_CURRENT2", "Height", pane_height - (margin * 5) - pbtn_height - 245 )
+
+    ok = VRset("CN_CURRENT", "Top",     margin )
+    ok = VRset("CN_CURRENT", "Left",    margin )
+    ok = VRset("CN_CURRENT", "Width",   VRGet("GB_CURRENT2","Width")  - (margin * 2))
+    ok = VRset("CN_CURRENT", "Height",  VRGet("GB_CURRENT2","Height") - (margin * 2))
+
+    ok = VRset("PB_DETACH",  "Left",   margin )
+    ok = VRset("PB_DETACH",  "Top",    pane_height - pbtn_height - (margin * 2) )
+    ok = VRset("PB_DETACH",  "Width",  min((lpane_width-margin*3) % 2, 1313)    )
+    ok = VRset("PB_UNMOUNT", "Left",   VRGet("PB_DETACH","Width") + (margin * 2))
+    ok = VRset("PB_UNMOUNT", "Top",    pane_height - pbtn_height - (margin * 2) )
+    ok = VRset("PB_UNMOUNT", "Width",  min((lpane_width-margin*3) % 2, 1313)    )
 
     /* SMBTree stuff */
-    ok = VRSet("GB_SMBTREE", "Top",     FWidth)
-    ok = VRSet("GB_SMBTREE", "Left",    VRGet("SPLIT_Main","Left")+60)
-    ok = VRset("GB_SMBTREE", "Height",  VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_SMBTREE", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-24*2)
-
-    ok = VRset("GB_SMBTREE3","Top",     FWidth)
-    ok = VRset("GB_SMBTREE3","Left",    FWidth)
-    ok = VRset("GB_SMBTREE3","Height",  245  )
-    ok = VRset("GB_SMBTREE3","Width",   VRGet("GB_SMBTREE","Width") -(FWidth*2))
-
-    ok = VRset("DT_SMBTREE", "Top",     8)
-    ok = VRset("DT_SMBTREE", "Left",    8)
-    ok = VRset("DT_SMBTREE", "Width",   VRGet("GB_SMBTREE3","Width") - 24)
-
-    ok = VRset("GB_SMBTREE2","Left",    FWidth)
-    ok = VRset("GB_SMBTREE2","Top",     245 + FWidth*2)
-    ok = VRset("GB_SMBTREE2","Width",   VRGet("GB_SMBTREE","Width")-FWidth*2)
-    ok = VRset("GB_SMBTREE2","Height",  VRGet("GB_SMBTREE","Height")-FWidth*4-400-245)
-
-    ok = VRset("CN_SMBTREE",  "Top",    FWidth)
-    ok = VRset("CN_SMBTREE",  "Left",   FWidth)
-    ok = VRset("CN_SMBTREE",  "Width",  VRGet("GB_SMBTREE2","Width") -(FWidth*2))
-    ok = VRset("CN_SMBTREE",  "Height", VRGet("GB_SMBTREE2","Height")-(FWidth*2))
-
-    ok = VRset("PB_CONNECT", "Left",   FWidth)
-    ok = VRset("PB_CONNECT", "Top",    VRGet("GB_SMBTREE","Height")- 400-FWidth-12)
-    ok = VRset("PB_REFRESH", "Left",   FWidth*2 +1313 - 12)
-    ok = VRset("PB_REFRESH", "Top",    VRGet("GB_SMBTREE","Height")- 400-FWidth-12)
-
-    ok = VRset("PICT_THROBBER", "Top",   VRGet("CN_SMBTREE","Height")%2+100)
-    ok = VRset("PICT_THROBBER", "Left",  VRGet("CN_SMBTREE","Width")%2-200)
+    ok = VRSet("GB_SMBTREE", "Top",     margin * 2      )
+    ok = VRSet("GB_SMBTREE", "Left",    split_left + 60 )
+    ok = VRset("GB_SMBTREE", "Height",  pane_height     )
+    ok = VRset("GB_SMBTREE", "Width",   rpane_width     )
+
+    ok = VRset("GB_SMBTREE3","Top",     margin )
+    ok = VRset("GB_SMBTREE3","Left",    margin )
+    ok = VRset("GB_SMBTREE3","Height",  245    )
+    ok = VRset("GB_SMBTREE3","Width",   rpane_width - (margin * 2))
+
+    ok = VRset("DT_SMBTREE", "Top",     8 )
+    ok = VRset("DT_SMBTREE", "Left",    8 )
+    ok = VRset("DT_SMBTREE", "Width",   (rpane_width - (margin * 2)) - 24 )
+
+    ok = VRset("GB_SMBTREE2","Left",    margin                    )
+    ok = VRset("GB_SMBTREE2","Top",     245 + (margin * 2)        )
+    ok = VRset("GB_SMBTREE2","Width",   rpane_width - (margin * 2))
+    ok = VRset("GB_SMBTREE2","Height",  pane_height - (margin * 5) - pbtn_height - 245 )
+
+    ok = VRset("CN_SMBTREE",  "Top",    margin )
+    ok = VRset("CN_SMBTREE",  "Left",   margin )
+    ok = VRset("CN_SMBTREE",  "Width",  VRGet("GB_SMBTREE2","Width")  - (margin * 2))
+    ok = VRset("CN_SMBTREE",  "Height", VRGet("GB_SMBTREE2","Height") - (margin * 2))
+
+    ok = VRset("PB_CONNECT", "Left",   margin)
+    ok = VRset("PB_CONNECT", "Top",    pane_height - pbtn_height   - (margin * 2))
+    ok = VRset("PB_REFRESH", "Left",   VRGet("PB_CONNECT","Width") + (margin * 2))
+    ok = VRset("PB_REFRESH", "Top",    pane_height - pbtn_height   - (margin * 2))
+
+    ok = VRset("PICT_THROBBER", "Top",  VRGet("CN_SMBTREE","Height") % 2 + 100 )
+    ok = VRset("PICT_THROBBER", "Left", VRGet("CN_SMBTREE","Width")  % 2 - 200 )
 
     /* Connection details stuff */
-    ok = VRSet("GB_CONDET", "Top",     FWidth)
-    ok = VRSet("GB_CONDET", "Left",    VRGet("SPLIT_Main","Left")+60)
-    ok = VRset("GB_CONDET", "Height",  VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_CONDET", "Width",   VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-24*2)
-
-    ok = VRset("GB_CONDET3","Top",     FWidth)
-    ok = VRset("GB_CONDET3","Left",    FWidth)
-    ok = VRset("GB_CONDET3","Height",  245  )
-    ok = VRset("GB_CONDET3","Width",   VRGet("GB_CONDET","Width") -(FWidth*2))
-
-    ok = VRset("DT_CONDET", "Top",     8)
-    ok = VRset("DT_CONDET", "Left",    8)
-    ok = VRset("DT_CONDET", "Width",   VRGet("GB_CONDET3","Width") - 24)
-
-    ok = VRset("GB_CONDET2","Left",    FWidth)
-    ok = VRset("GB_CONDET2","Top",     245 + FWidth*2)
-    ok = VRset("GB_CONDET2","Width",   VRGet("GB_CONDET","Width")-FWidth*2)
-    ok = VRset("GB_CONDET2","Height",  VRGet("GB_CONDET","Height")-FWidth*4-400-245)
-
-    ok = VRset("CN_CONDET",  "Top",    FWidth)
-    ok = VRset("CN_CONDET",  "Left",   FWidth)
-    ok = VRset("CN_CONDET",  "Width",  VRGet("GB_CONDET2","Width") -(FWidth*2))
-    ok = VRset("CN_CONDET",  "Height", VRGet("GB_CONDET2","Height")-(FWidth*2))
-
-    ok = VRset("PB_CONDET_SAVE", "Left",   FWidth)
-    ok = VRset("PB_CONDET_SAVE", "Top",    VRGet("GB_CONDET","Height")- 400-FWidth-12)
-    ok = VRset("PB_CONDET_LOAD", "Left",   FWidth*2 +1313 - 12)
-    ok = VRset("PB_CONDET_LOAD", "Top",    VRGet("GB_CONDET","Height")- 400-FWidth-12)
+    ok = VRSet("GB_CONDET", "Top",     margin * 2      )
+    ok = VRSet("GB_CONDET", "Left",    split_left + 60 )
+    ok = VRset("GB_CONDET", "Height",  pane_height     )
+    ok = VRset("GB_CONDET", "Width",   rpane_width     )
+
+    ok = VRset("GB_CONDET3","Top",     margin )
+    ok = VRset("GB_CONDET3","Left",    margin )
+    ok = VRset("GB_CONDET3","Height",  245    )
+    ok = VRset("GB_CONDET3","Width",   rpane_width - (margin * 2))
+
+    ok = VRset("DT_CONDET", "Top",     8 )
+    ok = VRset("DT_CONDET", "Left",    8 )
+    ok = VRset("DT_CONDET", "Width",   (rpane_width - (margin * 2)) - 24 )
+
+    ok = VRset("GB_CONDET2", "Left",   margin )
+    ok = VRset("GB_CONDET2", "Top",    245 + (margin * 2))
+    ok = VRset("GB_CONDET2", "Width",  rpane_width - (margin * 2))
+    ok = VRset("GB_CONDET2", "Height", pane_height - (margin * 5) - pbtn_height - 245 )
+
+    ok = VRset("CN_CONDET",  "Top",    margin )
+    ok = VRset("CN_CONDET",  "Left",   margin )
+    ok = VRset("CN_CONDET",  "Width",  VRGet("GB_CONDET2","Width")  - (margin * 2))
+    ok = VRset("CN_CONDET",  "Height", VRGet("GB_CONDET2","Height") - (margin * 2))
+
+    ok = VRset("PB_CONDET_SAVE", "Left", margin )
+    ok = VRset("PB_CONDET_SAVE", "Top",  pane_height - pbtn_height - (margin * 2)      )
+    ok = VRset("PB_CONDET_LOAD", "Left", VRGet("PB_CONDET_SAVE","Width") + (margin * 2))
+    ok = VRset("PB_CONDET_LOAD", "Top",  pane_height - pbtn_height - (margin * 2)      )
 
     /* Dialog stuff */
-    ok = VRSet("GB_DIALOG", "Top",    FWidth)
-    ok = VRSet("GB_DIALOG", "Left",   VRGet("SPLIT_Main","Left")+60)
-    ok = VRset("GB_DIALOG", "Height", VRGet("GB_CURRENT","Height"))
-    ok = VRset("GB_DIALOG", "Width",  VRGet("Main","Width")-VRGet("SPLIT_Main","Left")-60-FWidth*2-24*2)
-
-    ok = VRset("GB_DIALOG3","Top",     FWidth)
-    ok = VRset("GB_DIALOG3","Left",    FWidth)
-    ok = VRset("GB_DIALOG3","Height",  245  )
-    ok = VRset("GB_DIALOG3","Width",   VRGet("GB_DIALOG","Width") -(FWidth*2))
-
-    ok = VRset("DT_DIALOG", "Top",     8)
-    ok = VRset("DT_DIALOG", "Left",    8)
-    ok = VRset("DT_DIALOG", "Width",   VRGet("GB_DIALOG3","Width") - 24)
-
-    ok = VRset("PB_MOUNT",      "Left",   FWidth)
-    ok = VRset("PB_MOUNT",      "Top",    VRGet("GB_DIALOG","Height")- 400-FWidth-12)
-    ok = VRset("PB_EDITCANCEL", "Left",   FWidth*2 +1313 - 12)
-    ok = VRset("PB_EDITCANCEL", "Top",    VRGet("GB_DIALOG","Height")- 400-FWidth-12)
-
-    ok = VRset("GB_SHARE","Left",   FWidth)
-    ok = VRset("GB_SHARE","Top",    245 + FWidth*2)
-    ok = VRset("GB_SHARE","Width",  VRGet("GB_DIALOG","Width")-FWidth*2)
-
-    ok = VRset("GB_AUTH","Left",   FWidth)
-    ok = VRset("GB_AUTH","Top",    245 + FWidth*3 + VRGet("GB_SHARE","Height"))
-    ok = VRset("GB_AUTH","Width",  VRGet("GB_DIALOG","Width")-FWidth*2)
-
-    ok = VRset("GB_MPOINT","Left",   FWidth)
-    ok = VRset("GB_MPOINT","Top",    245 + FWidth*4 + VRGet("GB_SHARE","Height") + VRGet("GB_AUTH","Height"))
-    ok = VRset("GB_MPOINT","Width",  VRGet("GB_DIALOG","Width")-FWidth*2)
-
-    ok = VRset("SPLIT_Main","Visible", 1)
-    ok = VRset("SPLIT_Main","Top", FWidth)
-    ok = VRset("SPLIT_Main","Height", VRGet("GB_CURRENT","Height"))
-
-    ok = VRSet("GB_STATUSBAR","Left", FWidth-24)
-    ok = VRSet("GB_STATUSBAR","Top", VRGet("Main","Height")-VRGet("GB_STATUSBAR","Height")-FWidth-640+24)
-    ok = VRSet("GB_STATUSBAR","Width", VRGet("Main","Width")-2*FWidth-2*24-12)
-
-    ok = VRset("DT_STATUSBAR","Top",     8)
-    ok = VRset("DT_STATUSBAR","Left",    8)
-    ok = VRset("DT_STATUSBAR","Width",   VRGet("GB_CURRENT","Width")+VRGet("GB_SMBTREE","Width")+60-24*2)
+    ok = VRSet("GB_DIALOG", "Top",    margin * 2      )
+    ok = VRSet("GB_DIALOG", "Left",   split_left + 60 )
+    ok = VRset("GB_DIALOG", "Height", pane_height     )
+    ok = VRset("GB_DIALOG", "Width",  rpane_width     )
+
+    ok = VRset("GB_DIALOG3", "Top",    margin )
+    ok = VRset("GB_DIALOG3", "Left",   margin )
+    ok = VRset("GB_DIALOG3", "Height", 245    )
+    ok = VRset("GB_DIALOG3", "Width",  rpane_width - (margin * 2))
+
+    ok = VRset("DT_DIALOG", "Top",   8 )
+    ok = VRset("DT_DIALOG", "Left",  8 )
+    ok = VRset("DT_DIALOG", "Width", (rpane_width - (margin * 2)) - 24 )
+
+    ok = VRset("PB_MOUNT",      "Left", margin )
+    ok = VRset("PB_MOUNT",      "Top",  pane_height - pbtn_height - (margin * 2))
+    ok = VRset("PB_EDITCANCEL", "Left", VRGet("PB_MOUNT","Width") + (margin * 2))
+    ok = VRset("PB_EDITCANCEL", "Top",  pane_height - pbtn_height - (margin * 2))
+
+    ok = VRset("GB_SHARE", "Left",  margin )
+    ok = VRset("GB_SHARE", "Top",   245 + (margin * 2))
+    ok = VRset("GB_SHARE", "Width", rpane_width - (margin * 2))
+
+    ok = VRset("GB_AUTH", "Left",  margin )
+    ok = VRset("GB_AUTH", "Top",   245 + (margin * 3) + VRGet("GB_SHARE","Height"))
+    ok = VRset("GB_AUTH", "Width", rpane_width - (margin * 2))
+
+    ok = VRset("GB_MPOINT","Left",   margin )
+    ok = VRset("GB_MPOINT","Top",    245 + (margin * 4) + VRGet("GB_SHARE","Height") + VRGet("GB_AUTH","Height"))
+    ok = VRset("GB_MPOINT","Width",  rpane_width - (margin * 2))
+
+    ok = VRset("SPLIT_Main", "Visible", 1           )
+    ok = VRset("SPLIT_Main", "Top",     margin * 2  )
+    ok = VRset("SPLIT_Main", "Height",  pane_height )
+
+    ok = VRSet("GB_STATUSBAR", "Left",  margin )
+    ok = VRSet("GB_STATUSBAR", "Top",   main_iheight - sbar_height - margin )
+    ok = VRSet("GB_STATUSBAR", "Width", lpane_width + 50 + rpane_width      )
+
+    ok = VRset("DT_STATUSBAR", "Top",   12 )
+    ok = VRset("DT_STATUSBAR", "Left",  12 )
+    ok = VRset("DT_STATUSBAR", "Width", (lpane_width + 50 + rpane_width) - 24 )
 
     ok = VRset("Main","Painting", 1)
@@ -1666 +1683 @@
                                                 else interpret eventString
         end
-    end 
+    end
     if TrashedResize then CALL Main_Resize
     IF options.!debug == 1 THEN SAY time()' Main_Resize done'
@@ -1672 +1689 @@
 /*:VRX         Menu_Context_ChangeView_Click
 */
-Menu_Context_ChangeView_Click: 
+Menu_Context_ChangeView_Click:
     ok = VRSet("Cn_Current","View","NameTree")
 return
@@ -1678 +1695 @@
 /*:VRX         Menu_Context_Detach_Click
 */
-Menu_Context_Detach_Click: 
+Menu_Context_Detach_Click:
     call PB_DETACH_Click
 return
@@ -1684 +1701 @@
 /*:VRX         Menu_Context_Edit_Click
 */
-Menu_Context_Edit_Click: 
+Menu_Context_Edit_Click:
     IF options.!debug == 1 THEN SAY time()' Menu_Context_Edit_Click started'
     options.!editmode = 1
@@ -1723 +1740 @@
 /*:VRX         Menu_Context_Open_Click
 */
-Menu_Context_Open_Click: 
+Menu_Context_Open_Click:
     CALL VRMethod 'CN_CURRENT', 'GetRecordList', 'Selected', 'select.'
     IF select.0 < 1 THEN RETURN
@@ -1731 +1748 @@
 
     say mountpoint
-    rc = SysOpenObject(mountpoint, "DEFAULT", 1) 
+    rc = SysOpenObject(mountpoint, "DEFAULT", 1)
 return
 
 /*:VRX         Menu_Context_Unmount_Click
 */
-Menu_Context_Unmount_Click: 
+Menu_Context_Unmount_Click:
     call PB_UNMOUNT_Click
 return
@@ -1742 +1759 @@
 /*:VRX         Menu_File_Advanced_Click
 */
-Menu_File_Advanced_Click: 
+Menu_File_Advanced_Click:
     call PB_ADVANCED_Click
 return
@@ -1748 +1765 @@
 /*:VRX         Menu_File_Autostart_Activate_Click
 */
-Menu_File_Autostart_Activate_Click: 
+Menu_File_Autostart_Activate_Click:
     call PB_AUTOSTART_Click
 return
@@ -1754 +1771 @@
 /*:VRX         Menu_File_Autostart_Click
 */
-Menu_File_Autostart_Click: 
+Menu_File_Autostart_Click:
 
 return
@@ -1760 +1777 @@
 /*:VRX         Menu_File_Autostart_Deactivate_Click
 */
-Menu_File_Autostart_Deactivate_Click: 
-    ok = SysDestroyObject("<EVFSGUI_AUTOSTART>") 
+Menu_File_Autostart_Deactivate_Click:
+    ok = SysDestroyObject("<EVFSGUI_AUTOSTART>")
     IF ok == 1 THEN CALL VRMessage 'Main', NLVGetMessage( 79 ), NLVGetMessage( 1 )
                ELSE CALL VRMessage 'Main', NLVGetMessage( 78 ), NLVGetMessage( 5 ), 'E'
@@ -1768 +1785 @@
 /*:VRX         Menu_File_Close_Click
 */
-Menu_File_Close_Click: 
+Menu_File_Close_Click:
     call PB_CLOSE_Click
 return
@@ -1774 +1791 @@
 /*:VRX         Menu_File_Load_Click
 */
-Menu_File_Load_Click: 
+Menu_File_Load_Click:
     call PB_LOAD_Click
 return
@@ -1780 +1797 @@
 /*:VRX         Menu_File_Save_Click
 */
-Menu_File_Save_Click: 
+Menu_File_Save_Click:
     call PB_CONDET_SAVE_Click
 return
@@ -1786 +1803 @@
 /*:VRX         Menu_File_Settings_Click
 */
-Menu_File_Settings_Click: 
+Menu_File_Settings_Click:
     adv_changed = 0
     CALL VRLoadSecondary "SW_SETTINGS", "W"
@@ -1795 +1812 @@
         advanced.!browseimme= adv_browseimme
         advanced.!debug     = adv_debug
-        advanced.!special   = adv_special 
+        advanced.!special   = adv_special
         advanced.!savepassive=adv_savepassive
         advanced.!broadcast  =adv_broadcast
@@ -1803 +1820 @@
 /*:VRX         Menu_Help_About_Click
 */
-Menu_Help_About_Click: 
+Menu_Help_About_Click:
     CALL VRMessage 'Main', VRGet("Main", "HintText")||'0D0A'x||'(c) 2007-2009 Alex Taylor and Herwig Bauernfeind',NLVGetMessage( 1 ), 'I'
 return
@@ -1809 +1826 @@
 /*:VRX         Menu_Help_Extended_Click
 */
-Menu_Help_Extended_Click: 
+Menu_Help_Extended_Click:
     call PB_HELP_Click
 return
@@ -1815 +1832 @@
 /*:VRX         Menu_Selected_Connect_Click
 */
-Menu_Selected_Connect_Click: 
+Menu_Selected_Connect_Click:
     call PB_CONNECT_Click
 return
@@ -1821 +1838 @@
 /*:VRX         Menu_Selected_Default_Workgroup_Click
 */
-Menu_Selected_Default_Workgroup_Click: 
+Menu_Selected_Default_Workgroup_Click:
     workgroupname = VRMethod("CN_smbtree","GetRecordAttr",rh,"Caption")
     ok = TRSetIni("[global]","workgroup", workgroupname, samba.!smbconf)
@@ -1828 +1845 @@
 /*:VRX         Menu_Selected_Info_Click
 */
-Menu_Selected_Info_Click: 
-    ok = VRMethod( "CN_smbtree", "GetRecordList", "SourceOrSelected", "srcrec." ) 
+Menu_Selected_Info_Click:
+    ok = VRMethod( "CN_smbtree", "GetRecordList", "SourceOrSelected", "srcrec." )
     if srcrec.0 = 0 then return
 
@@ -1855 +1872 @@
 /*:VRX         Menu_Selected_Remove_Click
 */
-Menu_Selected_Remove_Click: 
-    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." ) 
+Menu_Selected_Remove_Click:
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "selrec." )
     if selrec.0 = 0 then return
 
@@ -1871 +1888 @@
                 btns.2 = NLVGetMessage( 7 )
                 confirm = VRMessage('Main', NLVGetMessage( 72, mountpoint ), NLVGetMessage( 8 ), 'Q', 'btns.', 1, 2 )
-                IF confirm \= 1 THEN RETURN 
+                IF confirm \= 1 THEN RETURN
 
                 dyn ="ok = "fs.!prefix"RxUnmount( mountpoint, mpidx )"
@@ -1890 +1907 @@
 Menu_Selected_Retry_Click: PROCEDURE EXPOSE settings. options. vfs. fs. advanced. cd. samba.
 
-    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "srcrec." ) 
+    ok = VRMethod( "CN_CONDET", "GetRecordList", "SourceOrSelected", "srcrec." )
     if srcrec.0 = 0 then return
 
@@ -1933 +1950 @@
 /*:VRX         Menu_View_Buttons_Click
 */
-Menu_View_Buttons_Click: 
+Menu_View_Buttons_Click:
+    current_height = VRGet("Main", "Height")
+    buttons_height = FWidth * 2 + 400
     if settings.!buttonson = 1 then do
         ok = VRSet("Menu_View_Buttons","Checked",0)
@@ -1939 +1958 @@
         options.!buttondelta = 0
         settings.!buttonson = 0
+        new_height = current_height - buttons_height
     end
     else do
         ok = VRSet("GB_Buttons","Visible", 1)
         ok = VRSet("Menu_View_Buttons","Checked",1)
-        options.!buttondelta = 440
+        options.!buttondelta = buttons_height
         settings.!buttonson = 1
-    end
-
-    ok = VRSet("Main","Height", VRGet("GB_CURRENT", "Height") +920 +FWidth +options.!buttondelta)
+        new_height = current_height + buttons_height
+    end
+
+    ok = VRSet("Main", "Height", new_height )
 return
 
 /*:VRX         Menu_View_ConDet_Click
 */
-Menu_View_ConDet_Click: 
+Menu_View_ConDet_Click:
     if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
 
@@ -1972 +1993 @@
 /*:VRX         Menu_View_Dialog_Click
 */
-Menu_View_Dialog_Click: 
+Menu_View_Dialog_Click:
     if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 0)
 
@@ -1996 +2017 @@
 /*:VRX         Menu_View_MiniIcons_Click
 */
-Menu_View_MiniIcons_Click: 
+Menu_View_MiniIcons_Click:
     advanced.!bigicons = \advanced.!bigicons
     ok = VRset("CN_CURRENT", "MiniIcons", \advanced.!bigicons)
@@ -2006 +2027 @@
 /*:VRX         Menu_View_SmbTree_Click
 */
-Menu_View_SmbTree_Click: 
+Menu_View_SmbTree_Click:
     if VRGet("TM_Throbber","Enabled") = 1 then ok = VRset("Pict_Throbber", "Visible", 1)
 
@@ -2032 +2053 @@
     call VRSet VRWindow(), 'Pointer', 'Wait'
 
-/*  Disabled because we merge profile now - in earlier revisions 
-    we replaced it but only for preexisting drives - this made only 
-    as long as we were unabled to detect double connections - this could be made an option! 
+/*  Disabled because we merge profile now - in earlier revisions
+    we replaced it but only for preexisting drives - this made only
+    as long as we were unabled to detect double connections - this could be made an option!
     IF options.!autoload then do
         dyn = "ok = "fs.!prefix"RxDetach(vfs.!drive)"
         IF options.!debug == 1 THEN SAY time()' '||dyn
             interpret dyn; drop dyn
-        
-        IF options.!debug == 1 THEN SAY time()' '||'Autoload Detach "'vfs.!drive'" =' ok 
+
+        IF options.!debug == 1 THEN SAY time()' '||'Autoload Detach "'vfs.!drive'" =' ok
     end */
 
@@ -2049 +2070 @@
 
         interpret dyn; drop dyn
-        
-        IF options.!debug == 1 THEN SAY time()' '||'Attach "'vfs.!drive'" =' ok 
+
+        IF options.!debug == 1 THEN SAY time()' '||'Attach "'vfs.!drive'" =' ok
     end
 
@@ -2057 +2078 @@
     IF options.!debug == 1 THEN SAY time()' '||dyn
     interpret dyn; drop dyn
-    
-    IF options.!debug == 1 THEN SAY time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP 
+
+    IF options.!debug == 1 THEN SAY time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
 
 
@@ -2071 +2092 @@
     IF options.!master     \= '' THEN src = src';MASTER='options.!master
     IF options.!mastertype \= '' THEN src = src';MASTERTYPE='options.!mastertype
-    IF options.!memlen     \= '' THEN src = src';MEMLEN='options.!memlen 
+    IF options.!memlen     \= '' THEN src = src';MEMLEN='options.!memlen
     IF options.!logfile    \= '' THEN src = src';LOGFILE='options.!logfile
     IF options.!loglevel   \= '' THEN src = src';LOGLEVEL='options.!loglevel
@@ -2119 +2140 @@
     ok = ParseResourceData(vfs.!mountpoint,'SMBFS SMBFS64 \\'options.!workgroup':'options.!server'\'options.!share'@'options.!user||src' 'rwFlag)
 
-    /* Now mount the resource */    
+    /* Now mount the resource */
     dyn ="ok = "fs.!prefix"RxMount('smbfs', vfs.!mountpoint, src, rwFlag)"
     IF options.!debug == 1 THEN SAY time()' '||dyn
     interpret dyn; drop dyn
-    
+
     IF options.!debug == 1 THEN SAY time()' '||'Mount "'vfs.!mountpoint'" =' ok
     if ok <> 0 then do
@@ -2142 +2163 @@
 
         /* In case the mountpoint was created for this failed operation, it is (optionally) removed again */
-        if CreateMP = 0 & \advanced.!alwaysmp then do        
+        if CreateMP = 0 & \advanced.!alwaysmp then do
             dyn ="ok = "fs.!prefix"RxDeleteMountPoint( vfs.!mountpoint )"
             interpret dyn
@@ -2150 +2171 @@
     drop CreateMP /* not required anymore */
 
-/*  Obsolete - the IOCtl will not be implemented this way in the plugin 
+/*  Obsolete - the IOCtl will not be implemented this way in the plugin
     The REXX function is present, but is has no counterpart in the plugin
     ok = EvfsRxIoctl( 100 , vfs.!mountpoint, outstring)
@@ -2168 +2189 @@
     useddrives= SysDriveMap("C:","USED")
 /*  IF options.!debug == 1 THEN SAY time()' '||"SysDriveMap(USED) done" */
-    
+
     Alldr = words(alldrives)
     FreeDriveMap = ""
@@ -2185 +2206 @@
 /*:VRX         NoEVFSCALL
 */
-NoEVFSCALL: 
+NoEVFSCALL:
     CALL VRMessage 'Main', NLVGetMessage( 100 ), NLVGetMessage( 5 ), 'E'
     signal Halt
@@ -2192 +2213 @@
 /*:VRX         ParseCommandLine
 */
-ParseCommandLine: 
+ParseCommandLine:
     IF options.!debug == 1 THEN SAY time()' ParseCommandLine() started'
     CmdLine = VRGet("Application","Commandline")
@@ -2250 +2271 @@
         userData = "UNKNOWN"
     end
-    else do 
+    else do
         cd.lastrh = VRMethod("CN_CONDET","AddRecord")
-        PARSE VAR userdata p_mpoint ';' p_mpidx ';' . 
+        PARSE VAR userdata p_mpoint ';' p_mpidx ';' .
 
         p_mpoint = strip(p_mpoint,'T','\')||'\'
@@ -2259 +2280 @@
 
         PARSE VAR resdata . 'WORKGROUP=' p_domain ';' .
-        PARSE VAR resdata . 'SERVER=' p_server ';' . 
+        PARSE VAR resdata . 'SERVER=' p_server ';' .
         PARSE VAR resdata . 'SHARE=' p_share ';' .
         PARSE VAR resdata . 'USER=' p_user ';' .
@@ -2269 +2290 @@
         PARSE VAR resdata . 'LOGFILE=' p_logfile ';' .
         PARSE VAR resdata . 'LOGLEVEL=' p_loglevel ';' .
-        PARSE VAR resdata . 'EASUPPORT=' p_easupport ' ' 
+        PARSE VAR resdata . 'EASUPPORT=' p_easupport ' '
 
         if p_master   = "" then p_master   = "WORKGROUP"
@@ -2295 +2316 @@
         SELECT
             WHEN p_share  == '' & p_server \= '' THEN DO   /* all shares on server */
-                IF p_domain == '' THEN 
+                IF p_domain == '' THEN
                     userdata = userdata';\\'p_server'\*'
                 ELSE
@@ -2305 +2326 @@
                 userdata = userdata';*:\\*'
             OTHERWISE DO
-                IF p_domain == '' THEN 
+                IF p_domain == '' THEN
                     userdata = userdata';\\'p_server'\'p_share
                 ELSE
@@ -2319 +2340 @@
 /*:VRX         PB_ADVANCED_Click
 */
-PB_ADVANCED_Click: 
+PB_ADVANCED_Click:
     adv_changed = 0
     CALL VRLoadSecondary "SW_ADVANCED", "W"
@@ -2332 +2353 @@
 /*:VRX         PB_ADVCANCEL_Click
 */
-PB_ADVCANCEL_Click: 
+PB_ADVCANCEL_Click:
 
     adv_changed = 0
@@ -2341 +2362 @@
 /*:VRX         PB_ADVHELP_Click
 */
-PB_ADVHELP_Click: 
+PB_ADVHELP_Click:
     CALL VRMethod 'SW_ADVANCED', 'InvokeHelp'
 return
@@ -2347 +2368 @@
 /*:VRX         PB_ADVOK_Click
 */
-PB_ADVOK_Click: 
+PB_ADVOK_Click:
 
     adv_memlen     = VRGet( "SPB_MEMLEN",    "Value" )
@@ -2388 +2409 @@
 /*:VRX         PB_CLOSE_Click
 */
-PB_CLOSE_Click: 
+PB_CLOSE_Click:
     CALL Quit
 return
@@ -2394 +2415 @@
 /*:VRX         PB_CONDET_LOAD_Click
 */
-PB_CONDET_LOAD_Click: 
+PB_CONDET_LOAD_Click:
     IF options.!debug == 1 THEN SAY time()' '||"PB_REFRESH_Click started"
     call PB_LOAD_CLICK
@@ -2405 +2426 @@
     IF options.!debug == 1 THEN SAY time()' '||"PB_CONDET_SAVE_Click started"
 
-    if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext) 
+    if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext)
     ELSE filename = Profile
 
@@ -2458 +2479 @@
     p_share     = ''
 
-    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "Selected", "handle." ) 
+    ok = VRMethod( "CN_SMBTREE", "GetRecordList", "Selected", "handle." )
 
     say "handle.0="handle.0
@@ -2542 +2563 @@
 
         do while parTrgRH <> ""
-            partrgCapt = VRMethod(trgCtn, "GetRecordAttr", partrgRH, "Caption")        
+            partrgCapt = VRMethod(trgCtn, "GetRecordAttr", partrgRH, "Caption")
             TargetString = partrgCapt||'\'||TargetString
             parTrgRH = VRMethod(trgCtn, "GetRecordAttr", partrgRH , "Parent")
@@ -2573 +2594 @@
     btns.2 = NLVGetMessage( 7 )
     confirm = VRMessage('Main', NLVGetMessage( 58, drive ), NLVGetMessage( 8 ), 'Q', 'btns.', 1, 2 )
-    IF confirm \= 1 THEN RETURN 
+    IF confirm \= 1 THEN RETURN
 
     /* TODO: ??  Unmount & delete all child mountpoints? */
@@ -2596 +2617 @@
 /*:VRX         PB_EDITCANCEL_Click
 */
-PB_EDITCANCEL_Click: 
+PB_EDITCANCEL_Click:
     options.!editmode = 0
     CALL VRSet "PB_UNMOUNT","Enabled", 1
@@ -2608 +2629 @@
 /*:VRX         PB_HELP_Click
 */
-PB_HELP_Click: 
+PB_HELP_Click:
     CALL VRMethod 'Main', 'InvokeHelp'
 return
@@ -2614 +2635 @@
 /*:VRX         PB_INFO_OK_Click
 */
-PB_INFO_OK_Click: 
+PB_INFO_OK_Click:
     call SW_INFO_Close
 RETURN
@@ -2622 +2643 @@
 PB_LOAD_Click: PROCEDURE EXPOSE settings. options. advanced. vfs. Profile fs. cd. samba.
     IF options.!autoload == 1 then filename = Profile
-    else filename = VRFileDialog('Main', NLVGetMessage( 55 ), 'L', '*.'fs.!profileext) 
+    else filename = VRFileDialog('Main', NLVGetMessage( 55 ), 'L', '*.'fs.!profileext)
     IF filename == '' THEN RETURN
     IF STREAM( filename, 'C', 'QUERY EXISTS') == '' THEN DO
@@ -2666 +2687 @@
         options.!loglevel   = loglevel
 
-        IF rwFlag == 'R' THEN 
+        IF rwFlag == 'R' THEN
             options.!readonly = 1
         ELSE
@@ -2683 +2704 @@
 /*:VRX         PB_LOGIN_CANCEL_Click
 */
-PB_LOGIN_CANCEL_Click: 
+PB_LOGIN_CANCEL_Click:
     call SW_LOGIN_Close
 RETURN 0
@@ -2689 +2710 @@
 /*:VRX         PB_LOGIN_OK_Click
 */
-PB_LOGIN_OK_Click: 
+PB_LOGIN_OK_Click:
     ok = VRSet("EF_USER","Value",VRGet("EF_USER1","Value"))
     ok = VRSet("EF_PASSWORD","Value",VRGet("EF_PASSWORD1","Value"))
@@ -2698 +2719 @@
 /*:VRX         PB_MOUNT_Click
 */
-PB_MOUNT_Click: 
+PB_MOUNT_Click:
     IF options.!debug == 1 THEN SAY time()' '||"PB_MOUNT_Click started"
 say "network = "network
@@ -2741 +2762 @@
 
     /* The required/optional/ignored parameters depend on the type of mount
-     * requested.  (Note, however, that the user, password, easupport and 
+     * requested.  (Note, however, that the user, password, easupport and
      * memlen parameters are always optional.)
      */
     SELECT
         /* Scenario 1: Mount a single share.
-         *             Required: share, server 
+         *             Required: share, server
          *             Optional: workgroup
          *             Unused:   master, mastertype
@@ -2761 +2782 @@
 
         /* Scenario 2: Mount all shares on a server.
-         *             Required: server 
+         *             Required: server
          *             Optional: workgroup
          *             Unused:   share, master, mastertype
          */
-        WHEN stype = 2 THEN DO      
+        WHEN stype = 2 THEN DO
             IF server == '' THEN DO
                 /* error */
@@ -2779 +2800 @@
          *             Unused:   share, server, master, mastertype
          */
-        WHEN stype = 3 THEN DO      
+        WHEN stype = 3 THEN DO
             IF workgroup == '' THEN DO
                 /* error */
@@ -2792 +2813 @@
          *             Unused:   share, server, workgroup
          */
-        WHEN stype = 4 THEN DO      
+        WHEN stype = 4 THEN DO
             IF master == '' | mastertype == '' THEN DO
                 /* error */
@@ -2810 +2831 @@
     CALL Mount
     CALL Refresh
-    IF options.!debug == 1 THEN SAY time()' '||"PB_MOUNT_Click done"   
+    IF options.!debug == 1 THEN SAY time()' '||"PB_MOUNT_Click done"
 RETURN 0
 
 /*:VRX         PB_NEWMOUNTPOINTCANCEL_Click
 */
-PB_NEWMOUNTPOINTCANCEL_Click: 
-    ok = VRSet("CB_DRIVES","Value","") 
-    ok = VRSet("EF_DIRECTORY","Value","") 
+PB_NEWMOUNTPOINTCANCEL_Click:
+    ok = VRSet("CB_DRIVES","Value","")
+    ok = VRSet("EF_DIRECTORY","Value","")
     call SW_MOUNTPOINT_Close
 RETURN 0
@@ -2823 +2844 @@
 /*:VRX         PB_NEWMOUNTPOINTOK_Click
 */
-PB_NEWMOUNTPOINTOK_Click: 
+PB_NEWMOUNTPOINTOK_Click:
     ok = VRSet("CB_DRIVES","Value",VRGet("CB_DRIVES1","Value"))
     ok = VRSet("EF_DIRECTORY","Value",VRGet("EF_DIRECTORY1","Value"))
@@ -2836 +2857 @@
 /*:VRX         PB_PROGRESS_ABORT_Click
 */
-PB_PROGRESS_ABORT_Click: 
+PB_PROGRESS_ABORT_Click:
     options.!autoload = 0
     options.!autoclose = 0
@@ -2863 +2884 @@
     call PB_CONDET_SAVE_Click
 
-/*  if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext) 
+/*  if options.!autostart == 0 THEN filename = VRFileDialog('Main', NLVGetMessage( 50 ), 'S', '*.'fs.!profileext)
     ELSE filename = Profile
 
@@ -2886 +2907 @@
         IF options.!debug == 1 THEN SAY time()' '||dyn
         interpret dyn; drop dyn
-        
+
         IF ok \= 0 THEN ITERATE
 
@@ -2902 +2923 @@
 /*:VRX         PB_SETTINGS_CANCEL_Click
 */
-PB_SETTINGS_CANCEL_Click: 
+PB_SETTINGS_CANCEL_Click:
 
     adv_changed = 0
@@ -2911 +2932 @@
 /*:VRX         PB_SETTINGS_HELP_Click
 */
-PB_SETTINGS_HELP_Click: 
+PB_SETTINGS_HELP_Click:
     CALL VRMethod 'SW_SETTINGS', 'InvokeHelp'
 return
@@ -2917 +2938 @@
 /*:VRX         PB_SETTINGS_OK_Click
 */
-PB_SETTINGS_OK_Click: 
+PB_SETTINGS_OK_Click:
 
     adv_loglevel   = VRGet( "SPIN_LOGLEVEL", "Value" )
@@ -2952 +2973 @@
         btns.2 = NLVGetMessage( 7 )
         confirm = VRMessage('Main', NLVGetMessage( 57, mountpoint ), NLVGetMessage( 8 ), 'Q', 'btns.', 1, 2 )
-        IF confirm \= 1 THEN RETURN 
+        IF confirm \= 1 THEN RETURN
     END
 
@@ -2960 +2981 @@
         IF options.!debug == 1 THEN SAY time()' '||dyn
         interpret dyn; drop dyn
-        
+
 /* IF options.!debug == 1 THEN SAY time()' '||'Unmount resource' i-1 '=' ok */
     END
@@ -2970 +2991 @@
         IF options.!debug == 1 THEN SAY time()' '||dyn
         interpret dyn; drop dyn
-        
+
 /* IF options.!debug == 1 THEN SAY time()' '||'Delete mountpoint' mountpoint '=' ok */
     END
@@ -2991 +3012 @@
 /*:VRX         Refresh
 */
-Refresh: 
+Refresh:
     IF options.!debug == 1 THEN SAY time()' Refresh started'
     CALL VRMethod 'CN_CURRENT', 'RemoveRecord', 'All'
 
     /* Remove Active connections from details view */
-    ok = VRMethod( 'CN_CONDET', "GetRecordList", 'All', "rh." ) 
+    ok = VRMethod( 'CN_CONDET', "GetRecordList", 'All', "rh." )
 
     do I = 1 to rh.0
@@ -3011 +3032 @@
 
 /* call _AddTemplates */
-    CALL VRSet "PB_DETACH",  "Enabled", 0 
-    CALL VRSet "PB_UNMOUNT", "Enabled", 0 
+    CALL VRSet "PB_DETACH",  "Enabled", 0
+    CALL VRSet "PB_UNMOUNT", "Enabled", 0
 
     ok = VRSet("Menu_Context_Detach",  "Visible",  0)
@@ -3022 +3043 @@
 
     IF options.!debug == 1 THEN SAY '  Remove records, disable buttons done.'
-    
-    CALL VRMethod 'CB_DRIVES', 'Clear'    
-    
+
+    CALL VRMethod 'CB_DRIVES', 'Clear'
+
 /* Herwig B.
     CALL VRSet 'Main', 'StatusText', ' ' */
@@ -3051 +3072 @@
     IF options.!debug == 1 THEN SAY time()' '||"SaveSettings started"
 
-    if advanced.!savepassive then call _PassiveSave 
-
-/* This does not make sense anymore 
+    if advanced.!savepassive then call _PassiveSave
+
+/* This does not make sense anymore
     settings.!network = VRGet("EF_NETWORK","Value")
     CALL VRSetIni 'Settings', 'Network', settings.!network, settings.!ini, 'NoClose'
@@ -3109 +3130 @@
 /*:VRX         SPLIT_Main_Move
 */
-SPLIT_Main_Move: 
+SPLIT_Main_Move:
     ok = VRset("Main", "Painting", 0)
     NewPos = VRInfo("Left")
@@ -3121 +3142 @@
 /*:VRX         StemsInit
 */
-StemsInit: 
+StemsInit:
     options.!workgroup  = ''
     options.!server     = ''
@@ -3167 +3188 @@
 /*:VRX         SW_ADVANCED_Close
 */
-SW_ADVANCED_Close: 
+SW_ADVANCED_Close:
     call SW_ADVANCED_Fini
 return
@@ -3173 +3194 @@
 /*:VRX         SW_ADVANCED_Create
 */
-SW_ADVANCED_Create: 
+SW_ADVANCED_Create:
     call SW_ADVANCED_Init
 return
@@ -3179 +3200 @@
 /*:VRX         SW_ADVANCED_Fini
 */
-SW_ADVANCED_Fini: 
+SW_ADVANCED_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -3186 +3207 @@
 /*:VRX         SW_ADVANCED_Init
 */
-SW_ADVANCED_Init: 
-    
+SW_ADVANCED_Init:
+
     CALL NLVSetText 'SW_ADVANCED',  'Caption', 40
     CALL NLVSetText 'GB_MISC',      'Caption', 43
@@ -3204 +3225 @@
     CALL NLVSetText 'GB_MEM',       'Caption', 41
 
-    IF advanced.!memlen \= '' THEN 
+    IF advanced.!memlen \= '' THEN
         CALL VRSet 'SPB_MEMLEN', 'Value', advanced.!memlen
     IF advanced.!easupport \= '' THEN
@@ -3210 +3231 @@
     IF advanced.!readonly \= '' THEN
         CALL VRSet 'CB_READONLY', 'Set', advanced.!readonly
-    IF advanced.!alwaysmp \= '' THEN 
+    IF advanced.!alwaysmp \= '' THEN
         CALL VRSet 'CB_alwaysmp', 'Set', advanced.!alwaysmp
 
@@ -3224 +3245 @@
 /*:VRX         SW_INFO_Close
 */
-SW_INFO_Close: 
+SW_INFO_Close:
     call SW_INFO_Fini
 return
@@ -3230 +3251 @@
 /*:VRX         SW_INFO_Create
 */
-SW_INFO_Create: 
+SW_INFO_Create:
     call SW_INFO_Init
     CALL NLVSetText 'SW_INFO',    'Caption', 92
@@ -3238 +3259 @@
     Info.ValueFH   = VRMethod( "CN_INFO", "AddField", "String", "Value" )
 
-    parse var infoline "Domain=["WorkGroup"] OS=["OS"] Server=["Server"]"Rest    
+    parse var infoline "Domain=["WorkGroup"] OS=["OS"] Server=["Server"]"Rest
     Info.!domain = VRMethod( "CN_INFO", "AddRecord")
     ok = VRMethod( "CN_INFO", "SetFieldData", Info.!domain, Info.TypeFH, strip(NLVGetMessage(21),'T',':'),Info.ValueFH, Workgroup )
@@ -3253 +3274 @@
 /*:VRX         SW_INFO_Fini
 */
-SW_INFO_Fini: 
+SW_INFO_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -3260 +3281 @@
 /*:VRX         SW_INFO_Init
 */
-SW_INFO_Init: 
+SW_INFO_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do
@@ -3272 +3293 @@
 /*:VRX         SW_LOGIN_Close
 */
-SW_LOGIN_Close: 
+SW_LOGIN_Close:
     call SW_LOGIN_Fini
 return
@@ -3278 +3299 @@
 /*:VRX         SW_LOGIN_Create
 */
-SW_LOGIN_Create: 
+SW_LOGIN_Create:
     call SW_LOGIN_Init
     CALL NLVSetText 'DT_USER1',      'Caption', 25
@@ -3290 +3311 @@
 /*:VRX         SW_LOGIN_Fini
 */
-SW_LOGIN_Fini: 
+SW_LOGIN_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -3297 +3318 @@
 /*:VRX         SW_LOGIN_Init
 */
-SW_LOGIN_Init: 
+SW_LOGIN_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do
@@ -3309 +3330 @@
 /*:VRX         SW_LOGIN_KeyPress
 */
-SW_LOGIN_KeyPress: 
+SW_LOGIN_KeyPress:
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
 /*  say keystr */
-    select 
-        when keystr = "{Enter}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" ) 
-        when keystr = "{Newline}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" ) 
+    select
+        when keystr = "{Enter}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" )
+        when keystr = "{Newline}" then ok = VRMethod( "EF_LoginPassword", "SetFocus" )
         when keystr  = "{Esc}" then call PB_LOGIN_CANCEL_Click
         otherwise nop
@@ -3323 +3344 @@
 /*:VRX         SW_MOUNTPOINT_Close
 */
-SW_MOUNTPOINT_Close: 
+SW_MOUNTPOINT_Close:
     call SW_MOUNTPOINT_Fini
 return
@@ -3329 +3350 @@
 /*:VRX         SW_MOUNTPOINT_Create
 */
-SW_MOUNTPOINT_Create: 
+SW_MOUNTPOINT_Create:
     call SW_MOUNTPOINT_Init
 /* NLVGetMessage(14)' ' */
@@ -3339 +3360 @@
     CALL NLVSetText 'CB_READONLY1',  'Caption', 45
     CALL NLVSetText 'CB_ALWAYSMP1',  'Caption', 65
-    ok = VRMethod( "CB_DRIVES", "GetStringList", "freedrives." ) 
+    ok = VRMethod( "CB_DRIVES", "GetStringList", "freedrives." )
     ok = VRMethod( "CB_DRIVES1", "AddStringList", "freedrives." )
     ok = VRSet("CB_DRIVES1", "Value", VRGet("CB_Drives","Value"))
@@ -3349 +3370 @@
 /*:VRX         SW_MOUNTPOINT_Fini
 */
-SW_MOUNTPOINT_Fini: 
+SW_MOUNTPOINT_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -3356 +3377 @@
 /*:VRX         SW_MOUNTPOINT_Init
 */
-SW_MOUNTPOINT_Init: 
+SW_MOUNTPOINT_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do
@@ -3368 +3389 @@
 /*:VRX         SW_PROGRESS_Close
 */
-SW_PROGRESS_Close: 
+SW_PROGRESS_Close:
     call SW_PROGRESS_Fini
 return
@@ -3374 +3395 @@
 /*:VRX         SW_PROGRESS_Create
 */
-SW_PROGRESS_Create: 
+SW_PROGRESS_Create:
     call SW_PROGRESS_Init
     CALL NLVSetText 'SW_PROGRESS',  'Caption', 1
@@ -3383 +3404 @@
 /*:VRX         SW_PROGRESS_Fini
 */
-SW_PROGRESS_Fini: 
+SW_PROGRESS_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -3390 +3411 @@
 /*:VRX         SW_PROGRESS_Init
 */
-SW_PROGRESS_Init: 
+SW_PROGRESS_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do
@@ -3402 +3423 @@
 /*:VRX         SW_SETTINGS_Close
 */
-SW_SETTINGS_Close: 
+SW_SETTINGS_Close:
     call SW_SETTINGS_Fini
 return
@@ -3408 +3429 @@
 /*:VRX         SW_SETTINGS_Create
 */
-SW_SETTINGS_Create: 
+SW_SETTINGS_Create:
     call SW_SETTINGS_Init
 return
@@ -3414 +3435 @@
 /*:VRX         SW_SETTINGS_Fini
 */
-SW_SETTINGS_Fini: 
+SW_SETTINGS_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -3421 +3442 @@
 /*:VRX         SW_SETTINGS_Init
 */
-SW_SETTINGS_Init: 
+SW_SETTINGS_Init:
 
     CALL NLVSetText 'SW_SETTINGS',  'Caption', 47
@@ -3445 +3466 @@
         CALL VRSet 'SPIN_LOGLEVEL', 'Value', advanced.!loglevel
     CALL VRSet 'CB_LOGGING', 'Set', VRFileExists(SysBootDrive()'\ndpsmb.dbg')
-    IF advanced.!browseauth \= '' THEN 
+    IF advanced.!browseauth \= '' THEN
         CALL VRSet 'CB_BROWSEAUTH', 'Set', advanced.!browseauth
-    IF advanced.!browseimme \= '' THEN 
+    IF advanced.!browseimme \= '' THEN
         CALL VRSet 'CB_BROWSEimme', 'Set', advanced.!browseimme
-    IF advanced.!debug \= '' THEN 
+    IF advanced.!debug \= '' THEN
         CALL VRSet 'CB_debug',      'Set', advanced.!debug
     IF advanced.!special \= '' THEN
@@ -3469 +3490 @@
 /*:VRX         TM_AutoClose_Trigger
 */
-TM_AutoClose_Trigger: 
+TM_AutoClose_Trigger:
     call PB_CLOSE_Click
 return
@@ -3475 +3496 @@
 /*:VRX         TM_RefreshTreeDisplay_Trigger
 */
-TM_RefreshTreeDisplay_Trigger: 
+TM_RefreshTreeDisplay_Trigger:
     ShowHidden = advanced.!special
     BroadCast = advanced.!broadcast
 
-    select 
+    select
         when RefreshMode = "TREE" then do
             call _RefreshTreeDisplay
-        
+
             if VRget("Menu_View_SmbTree", "Checked") then do
                 if smbtree.!workgroup <> 'SMBTREE.!WORKGROUP' then do
@@ -3490 +3511 @@
         end
         when RefreshMode = "SHARE" then do
-            call _AddSharesDisplay    
+            call _AddSharesDisplay
         end
         otherwise say "RefreshMode = "RefreshMode
@@ -3499 +3520 @@
 /*:VRX         TM_TheCloser_Trigger
 */
-TM_TheCloser_Trigger: 
+TM_TheCloser_Trigger:
     call SW_PROGRESS_Close
 return
@@ -3505 +3526 @@
 /*:VRX         TM_Throbber_Trigger
 */
-TM_Throbber_Trigger: 
+TM_Throbber_Trigger:
     pIdx = VRGet("Pict_Throbber","PicturePath")
     parse var pIdx '#' pidx