Changeset 321 for branches

Timestamp:

Sep 1, 2009, 9:16:39 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: More work on EVFSGUI V.next (Retry code added)

Location:

branches/guitools-2.0/evfsgui

Files:

• changes (modified) (2 diffs)
• evfsgui.VRP (modified) (1 diff)
• evfsgui.VRX (modified) (9 diffs)
• evfsgui.VRY (modified) ( previous)
• evfsi_de.mkm (modified) (1 diff)
• evfsi_en.mkm (modified) (1 diff)

branches/guitools-2.0/evfsgui/changes

@@ -17 +17 @@
 - Added: smbtree.vrs: Enhanced guessicon()
 - Added: Preliminary context menus for Browse View and Connection details view
+- Added: "Retry" for passive connections (only manually for now)
 - Changed: Several changes in GUI style (as suggested by Alex Taylor)
 - Changed: Left align buttons in current connections panel (as suggested by 
@@ -32 +33 @@
 - Create Icon. stem in order to ease maintainance of icons
 - Create mechanism to save passive connections across sessions
-- Functionality of context menus for Browse View and Connection details view
 - Debug on/off option is badly implemented (rework required)
 - smbtree.vrs: Sort options

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -4 +4 @@
 MacroPath: VRM: U:\Develop\Samba\guitools-2.0\smbclgui
 EXEPath: 
-RunParameters: 
+RunParameters: y:\test.evp
 RunDirectory: 
 VRXWindow: __VREMainWindow,1,530,2457,879,4071
 VRXWindow: __VRESectionListWindow,1,337,11708,11623,3686
-VRXWindow: __VREToolsWindow,1,518,530,6993,1669
+VRXWindow: __VREToolsWindow,1,518,530,6984,1659
 VRXWindow: __VREWindListWindow,1,482,7661,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ADVANCED,1
-UserWindow: SW_LOGIN,1
-UserWindow: SW_MOUNTPOINT,1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -200 +200 @@
 */
 CB_MOUNT_Change: 
+    IF options.!debug == 1 THEN SAY time()' '||"CB_MOUNT_Change started"
 
     mount = VRGet("CB_MOUNT", "Selected")
@@ -249 +250 @@
         END
     END
+    IF options.!debug == 1 THEN SAY time()' '||"CB_MOUNT_Change done"
 
 RETURN
@@ -255 +257 @@
 */
 CN_CONDET_ContextMenu: 
+    rh = VRInfo('Record')
+    if VRMethod( 'CN_CONDET', "ValidateRecord", rh) <> 1 then return
+    if VRMethod( 'CN_CONDET', "GetFieldData", rh, CD.StatusFH) = '#68:PMWP.DLL' then do
+        ok = VRSet("Menu_Selected_Retry",  "Enabled",1)
+        ok = VRSet("Menu_Selected_Remove", "Enabled",1)
+    end
     ok = VRMethod( "Menu_Selected", "Popup", , , "", "" )
 return
@@ -1105 +1113 @@
 
     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("DT_STATUSBAR","Left",    8+24)
+    ok = VRset("DT_STATUSBAR","Width",   VRGet("GB_CURRENT","Width")+VRGet("GB_SMBTREE","Width")+60-24*3)
 
     ok = VRset("Main","Painting", 1)
@@ -1152 +1160 @@
     ok = VRSet("CB_MOUNT","Selected",1)
     ok = VRSet("CB_MOUNT","Value",mtype.1)
-say "Tadaa "p_string
+
     parse var p_string p_domain':\\'p_server'\'p_share
 
@@ -1246 +1254 @@
 
     do I = 1 to selrec.0
-        if VRMethod("CN_CONDET", "GetFieldData", selrec.I, cd.statusfh) = '#68:PMWP.DLL' then do
-           /*  CALL VRMethod 'CN_CONDET', 'RemoveRecord', selrec.I */
-
-        end
+
+        p_mpoint    = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.MpointFH)
+
+        p_workgroup = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.WorkgroupFH)
+        p_server    = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.ServerFH)
+        p_share     = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.ShareFH)
+        p_user      = VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.UserFH)
+        p_password  = x2c(VRMethod("CN_CONDET", "GetFieldData", selrec.I, CD.SpasswordFH))
+
+        ShareLevel = 1
+        if p_share     = "" then ShareLevel = 2
+        if p_server    = "" then ShareLevel = 3
+        if p_workgroup = "" then ShareLevel = 4
+
+        ok = VRSet( "CB_MOUNT", "Selected", Sharelevel )
+        ok = VRset("CB_MOUNT"  , "Value", mtype.sharelevel)
+
+        ok = VRset("EF_SERVER" ,  "Value", p_server)
+        ok = VRset("EF_SHARE"  ,  "Value", p_share)
+        ok = VRset("EF_NETWORK",  "Value", p_workgroup)
+        ok = VRset("EF_USER"   ,  "Value", p_user)
+        ok = VRset("EF_PASSWORD", "Value", p_password)
+
+        parse var p_mpoint p_drv '\' p_dir
+
+        p_dir = strip(p_dir,'T','\')
+
+        ok = VRset("CB_DRIVES"      ,  "Value", p_drv)
+        ok = VRset("EF_DIRECTORY"   ,  "Value", p_dir)
+
+        ok = VRMethod("CN_CONDET", "RemoveRecord", selrec.I)
+
+        CALL PB_MOUNT_Click
+
     end
 return
@@ -1440 +1478 @@
             xx = VRMessage('Main', NLVGetMessage( 36,  options.!user||upw'@'options.!workgroup'\\'options.!server'\'options.!share, vfs.!mountpoint )||'0D0A'x||'0D0A'x||SysGetMessage(ok)||'0D0A'x||'0D0A'x||SysGetMessage(ok, 'OSO001H.MSG'), NLVGetMessage(37), 'W')
         end
-        if cd.lastrh <> '' then ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#68:PMWP.DLL')
+        if cd.lastrh <> '' then do
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#68:PMWP.DLL') /* Passive Connection icon */
+            ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, '') /* remove pain text password */
+        end
 
         /* In case the mountpoint was created for this failed operation, it is (optionally) removed again */
@@ -1615 +1656 @@
     CALL NLVSetText 'Menu_File_LOAD',     'Caption', 31
     CALL NLVSetText 'Menu_File_ADVANCED', 'Caption', 24
+
+    CALL NLVSetText 'Menu_Selected_Connect', 'Caption', 28
+    CALL NLVSetText 'Menu_Selected_Remove',  'Caption', 89
+    CALL NLVSetText 'Menu_Selected_Retry',   'Caption', 90
+
     CALL NLVSetText 'Menu_Help_Extended', 'Caption', 4
 
@@ -1738 +1784 @@
         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.passwordfh, p_password, cd.spasswordfh, p_spassword, cd.masterfh, p_master, cd.mtypefh, p_mtype)
         ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.memlenfh, p_memlen, cd.easupportfh, p_easupport, cd.logfilefh, p_logfile, cd.loglevelfh, p_loglevel, cd.rwfh, p_rw)
-        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#64:PMWP.DLL')
+        ok = VRMethod("CN_CONDET", "SetFieldData", cd.lastrh, cd.statusfh, '#64:PMWP.DLL') /* Active */
 
         hashstr = p_mpoint' 'translate(p_domain)' 'translate(p_server)' 'translate(p_share)' 'p_user' 'p_spassword' 'p_easupport' 'p_rw

branches/guitools-2.0/evfsgui/evfsi_de.mkm

@@ -95 +95 @@
 EVG0087I: ~Knopfleiste
 EVG0088I: ~Verbindungsdetailanzeige
-EVG0089?:
-EVG0090?:
+EVG0089I: Entfernen
+EVG0090I: Nochmals versuchen
 EVG0091?:
 EVG0092?:

branches/guitools-2.0/evfsgui/evfsi_en.mkm

@@ -94 +94 @@
 EVG0086I: ~Tree view
 EVG0087I: ~Buttons
-EVG0088?: ~Connection details view
-EVG0089?:
-EVG0090?:
+EVG0088I: ~Connection details view
+EVG0089I: Remove
+EVG0090I: Retry
 EVG0091?:
 EVG0092?: