Changeset 661 for trunk/guitools/evfsgui/evfsgui.vrx

Timestamp:

Nov 11, 2011, 9:45:52 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5.x: Several fixes, smaller additions

File:

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

trunk/guitools/evfsgui/evfsgui.vrx

@@ -692 +692 @@
     CALL NLVSetText 'Menu_File_SAVE',                 "Caption", 30
     CALL NLVSetText 'Menu_File_LMHosts_Reset',        "Caption", 127
+    CALL NLVSetText 'Menu_File_ucCred_Reset',         "Caption", 128
     CALL NLVSetText 'Menu_File_Autostart',            "Caption", 35
     CALL NLVSetText 'Menu_File_Autostart_Activate',   "Caption", 76
@@ -1356 +1357 @@
 */
 _SmbConfCreateShadowCopy: 
+    IF options.!debug == 1 THEN SAY time()' _SmbConfCreateShadowCopy started'
     /* we create a complete version of smb.conf in temporary directory for reading purposes */
     /* as we can only determine a default value from this complete version of the file */
     /* however it is not desirable to always have a complete copy normally */
     ok = SysFileDelete(samba.!shadowsmbconf)
-    say         samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    say     '  'samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
     address cmd samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    IF options.!debug == 1 THEN SAY time()' _SmbConfCreateShadowCopy done'
 return
 
@@ -1448 +1451 @@
     icons.!folder           = '#26:PMWP.DLL'
     icons.!folder_open      = '#34:PMWP.DLL'
+    icons.!machine_awake    = '#35:PMWP.DLL'
     icons.!machine_sleeping = '#61:PMWP.DLL'
+    icons.!workgroup        = '#62:PMWP.DLL'
+    icons.!pdc              = '#63:PMWP.DLL'
     icons.!active           = '#64:PMWP.DLL'
     icons.!passive          = '#68:PMWP.DLL'
@@ -1514 +1520 @@
 */
 _UserCredUpdate:
+    IF options.!debug == 1 THEN SAY time()' _UserCredUpdate started'
     credentials.!username = VRGet("EF_USER","Value")
     credentials.!password = VRGet("EF_PASSWORD","Value")
@@ -1526 +1533 @@
     end
     else call beep 200, 20
+    IF options.!debug == 1 THEN SAY time()' _UserCredUpdate done'
 return
 
@@ -3052 +3060 @@
 Menu_File_LMHosts_Reset_Click: 
     ok = SysFileDelete(samba.!lmhosts)
+    /* FIXME: Add a message box here */
 return
 
@@ -3110 +3119 @@
 Menu_File_Save_Click:
     call PB_CONDET_SAVE_Click
+return
+
+/*:VRX         Menu_File_ucCred_Reset_Click
+*/
+Menu_File_ucCred_Reset_Click: 
+    ok = _ucDelUc()
+    /* FIXME: Add a message box here */
 return
 
@@ -4497 +4513 @@
 SW_LOGIN_Create:
     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
     CALL NLVSetText 'DT_PASSWORD1',   "Caption", 26
@@ -4503 +4520 @@
     CALL NLVSetText 'PB_LOGIN_CANCEL',"Caption", 3
 
-    /* ok = VRSet("Pict_Login","PicturePath", SMBObj.icon) */
+    select
+        when pos("PDC",VRMethod("CN_smbtree", "GetFieldData", SMBObj.rh, MBFH)) > 0 then LoginIcon = "#63:PMWP.DLL" /* icons.!pdc */
+        when SMBObj.udatatype = "WORKGROUP" then LoginIcon = SMBObj.Icon
+        when SMBObj.udatatype = "SERVER" then LoginIcon = SMBObj.Icon
+        otherwise LoginIcon = "#35:PMWP.DLL" /* icons.!machine_awake */
+    end
+say loginicon
+    ok = VRSet("Pict_Login","PicturePath", LoginIcon)
     ok = VRSet("EF_USER1","Value",VRGet("EF_USER","Value"))
     ok = VRSet("EF_PASSWORD1","Value",VRGet("EF_PASSWORD","Value"))