Changeset 511 for branches

Timestamp:

Jan 5, 2011, 6:18:48 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI: Fix Ticket #150, plus login box

Location:

branches/guitools-2.0/evfsgui

Files:

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

branches/guitools-2.0/evfsgui/changes

@@ -12 +12 @@
   to work properly
 
-Version 2.1 beta3
+Version 2.1 beta3 2011-XX-XX
+- Fixed: Behaviour of login box did not work as designed
+- Fixed: No mount attempt if entering credentials was aborted
+- Fixed: Do not crash during "Detach all"
 - Refactoring: Create Icon. stem in order to ease maintenance of icons
 - Refactoring: Common wrapper around all dynamic functions

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -10 +10 @@
 VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
 VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4794
-VRXWindow: __VREToolsWindow,1,2517,7082,6480,1669
+VRXWindow: __VREToolsWindow,1,2517,7082,6486,1661
 VRXWindow: __VREWindListWindow,1,542,8721,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_SETTINGS,1
+UserWindow: SW_LOGIN,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -1194 +1194 @@
     end
     window = VRLoadSecondary( "SW_LOGIN", "W" )
-    call PB_MOUNT_CLICK
+    if credentials.!entered = 1 then call PB_MOUNT_CLICK
 
     if VRGet(srcCtn,'Name') = "CN_CONDET" & VRMethod( "CN_CONDET", "ValidateRecord", srcRec) = 1 then do
@@ -1367 +1367 @@
 */
 EF_PASSWORD1_KeyPress:
+    IF options.!debug == 1 THEN SAY time()' EF_PASSWORD1_KeyPress started'    
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
@@ -1376 +1377 @@
         otherwise nop
     end
+    IF options.!debug == 1 THEN SAY time()' EF_PASSWORD1_KeyPress done'    
 return
 
@@ -1455 +1457 @@
 */
 EF_USER1_KeyPress:
+    IF options.!debug == 1 THEN SAY time()' EF_USER1_KeyPress started'    
     obj = VRInfo( "Object" )
     keystr = VRGet( obj, "KeyString" )
-/*  say keystr */
+    say keystr
     select
         when keystr = "{Enter}" then ok = VRMethod( "EF_Password1", "SetFocus" )
@@ -1464 +1467 @@
         otherwise nop
     end
+    IF options.!debug == 1 THEN SAY time()' EF_USER1_KeyPress done'    
 return
 
@@ -2413 +2417 @@
                 IF confirm \= 1 THEN RETURN
 
-                CALL _Dynamic "ok = "fs.!prefix"RxUnmount( mountpoint, mpidx )"
+                CALL _Dynamic "ok = "fs.!prefix"RxUnmount('"mountpoint"', "mpidx")"
                 CALL VRMethod "CN_CONDET", 'RemoveRecord', selrec.I
                 CALL Refresh
@@ -2580 +2584 @@
     
     IF options.!autoload then do
-        CALL _Dynamic "ok = "fs.!prefix"RxDetach(vfs.!drive)"
+        CALL _Dynamic "ok = "fs.!prefix"RxDetach('"vfs.!drive"')"
         IF options.!debug == 1 THEN SAY time()' '||'Autoload Detach "'vfs.!drive'" =' ok
     end */
@@ -2586 +2590 @@
     /* Attach the virtual drive - only if drive is not already attached */
     if pos(vfs.!drive,MyFreeDriveMap("C:","FREE")) > 0 then do
-        CALL _Dynamic "ok = "fs.!prefix"RxAttach( vfs.!drive )"
+        CALL _Dynamic "ok = "fs.!prefix"RxAttach('"vfs.!drive"')"
 
         IF options.!debug == 1 THEN SAY time()' '||'Attach "'vfs.!drive'" =' ok
@@ -2592 +2596 @@
 
     /* Create the mount point and store whether it was created or already existed */
-    CALL _Dynamic "CreateMP = "fs.!prefix"RxCreateMountPoint( vfs.!mountpoint )"
+    CALL _Dynamic "CreateMP = "fs.!prefix"RxCreateMountPoint('"vfs.!mountpoint"')"
 
     IF options.!debug == 1 THEN SAY time()' '||'Create "'vfs.!mountpoint'" = 'CreateMP
@@ -2663 +2667 @@
 
     /* Now mount the resource */
-    CALL _Dynamic "ok = "fs.!prefix"RxMount('smbfs', vfs.!mountpoint, src, rwFlag)"
+    CALL _Dynamic "ok = "fs.!prefix"RxMount('SMBFS','"vfs.!mountpoint"', '"src"', '"rwFlag"')"
 
     IF options.!debug == 1 THEN SAY time()' '||'Mount "'vfs.!mountpoint'" =' ok
@@ -2684 +2688 @@
         /* In case the mountpoint was created for this failed operation, it is (optionally) removed again */
         if CreateMP = 0 & advanced.!alwaysmp <> 1 then do
-            CALL _Dynamic "ok = "fs.!prefix"RxDeleteMountPoint( vfs.!mountpoint )"
+            CALL _Dynamic "ok = "fs.!prefix"RxDeleteMountPoint('"vfs.!mountpoint"')"
             IF options.!debug == 1 THEN SAY time()' '||'Remove "'vfs.!mountpoint'" = 'ok
         end
@@ -3179 +3183 @@
 
     window = VRLoadSecondary( "SW_LOGIN", "W" )
-
-    call PB_MOUNT_CLICK
+    if credentials.!entered = 1 then call PB_MOUNT_CLICK
 
     IF options.!debug == 1 THEN SAY time()' '||"PB_CONNECT_Click done"
@@ -3202 +3205 @@
     IF confirm \= 1 THEN RETURN
 
-    /* TODO: ??  Unmount & delete all child mountpoints? */
-
-    /* Unmount any resources */
-    DO i = 1 TO mounts
-        CALL _Dynamic "ok = "fs.!prefix"RxUnmount( mountpoint, i-1 )"
-        /* IF options.!debug == 1 THEN SAY time()' '||'Unmount resource' i-1 '=' ok */
-    END
-
-    CALL _Dynamic "ok = "fs.!prefix"RxDetach( drive )"
- /* IF options.!debug == 1 THEN SAY time()' '||'Detach' drive '=' ok */
+    /* TODO: ??  Unmount & delete all child mountpoints? - Do we need this? */
+    /* FIXME: This is potentially dangerous on Netdrive - what happens with unknown mount types? */
+    /* FIXME: Unclear under which circumstances we have an alpha value here (which crahed EVFSGUI) */
+    if datatype(mounts) = 'NUM' then do
+        /* Unmount any resources */
+        DO i = 1 TO mounts
+            CALL _Dynamic "ok = "fs.!prefix"RxUnmount('"mountpoint"', "i-1")"
+        END
+    end
+    else IF options.!debug == 1 THEN SAY ' '||"mounts = "mounts
+
+    CALL _Dynamic "ok = "fs.!prefix"RxDetach('"drive"')"
 
     CALL Refresh
@@ -3307 +3312 @@
 */
 PB_LOGIN_CANCEL_Click:
+    credentials.!entered = 0
     call SW_LOGIN_Close
-RETURN 0
+RETURN
 
 /*:VRX         PB_LOGIN_OK_Click
@@ -3315 +3321 @@
     ok = VRSet("EF_USER","Value",VRGet("EF_USER1","Value"))
     ok = VRSet("EF_PASSWORD","Value",VRGet("EF_PASSWORD1","Value"))
+    credentials.!entered = 1
 
     call SW_LOGIN_Close
@@ -3597 +3604 @@
     /* Unmount any resources */
     DO i = 1 TO mounts
-        CALL _Dynamic "ok = "fs.!prefix"RxUnmount( mountpoint, i-1 )"
-        /* IF options.!debug == 1 THEN SAY time()' '||'Unmount resource' i-1 '=' ok */
+        CALL _Dynamic "ok = "fs.!prefix"RxUnmount('"mountpoint"', "i-1")"
     END
 
@@ -3604 +3610 @@
     parent = VRMethod("CN_CURRENT", 'GetRecordAttr', select.1, 'Parent')
     IF parent \= '' THEN DO
-        CALL _Dynamic "ok = "fs.!prefix"RxDeleteMountPoint( mountpoint )"
-        /* IF options.!debug == 1 THEN SAY time()' '||'Delete mountpoint' mountpoint '=' ok */
+        CALL _Dynamic "ok = "fs.!prefix"RxDeleteMountPoint('"mountpoint"')"
     END
 
@@ -3800 +3805 @@
     credentials.!username = ""
     credentials.!password = ""
+    credentials.!entered  = 0
 
     UserCred = ""