Changeset 703 for trunk/guitools/evfsgui

Timestamp:

Jun 13, 2012, 12:08:42 PM (13 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Updates in EVFSGUI/SMBMON/Shared code

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.RC (modified) (1 diff)
• evfsgui.vrp (modified) (2 diffs)
• evfsgui.vrx (modified) (16 diffs)
• evfsgui.vry (modified) ( previous)

trunk/guitools/evfsgui/evfsgui.RC

@@ -27 +27 @@
 BITMAP 36 .\rc\icons\green-on-16.bmp
 BITMAP 37 .\rc\icons\green-off-16.bmp
+icon 50 .\rc\icons\smbwait.ico
 icon 68 .\rc\icons\passive.ico
 icon 80 .\rc\icons\PDF.ICO

trunk/guitools/evfsgui/evfsgui.vrp

@@ -10 +10 @@
 VRXWindow: __VREMainWindow,1,1951,2361,891,7841
 VRXWindow: __VREFileListWindow,1,1253,11033,2665,3358
-VRXWindow: __VRESectionListWindow,1,1229,11900,10696,3342
+VRXWindow: __VRESectionListWindow,1,1156,12382,12238,5095
 VRXWindow: __VREToolsWindow,0,3096,8528,6486,1669
 VRXWindow: __VREWindListWindow,1,723,11708,3686,3150
@@ -17 +17 @@
 UserWindow: SW_LOGIN,1
 UserWindow: SW_INFO,1
-UserWindow: SW_SMBTREE,1
 UserWindow: SW_CONDET,1
+UserWindow: SW_DIALOG,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -753 +753 @@
     END
 
+    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." ) 
+    end
+
     /* SMBTree */
     CALL NLVSetText 'PB_SMBTREE_CONNECT',             "Caption", 28
@@ -770 +775 @@
     /* Common margin around controls */
     margin = ((VRGet("Main", "InteriorLeft") / 3) * 2) + 2
+
+    smbwait = "#50"
 
     if options.!debug == 1 then say time()' _GUIInit done'
@@ -792 +799 @@
 
     say _ucInitObj()
-
-    options.!storecreds = _ucChkObj()
+    say _ucChkObj()
 
     IF STREAM( settings.!ini, 'C', 'QUERY EXISTS') == '' THEN DO
@@ -878 +884 @@
         IF advanced.!lmhosts    == '' THEN advanced.!lmhosts    = 1
 
+        options.!storecreds = VRGetIni('Settings', 'StoreCreds', settings.!ini)
+say "options.!storecreds = "options.!storecreds
+        IF options.!storecreds == '' then options.!storecreds = 1
+                                     
+say "options.!storecreds = "options.!storecreds
+        IF _ucChkObj() = 0 then options.!storecreds = 0            
+say "options.!storecreds = "options.!storecreds
+
         options.!debug = VRGetIni('Settings', 'Debug', settings.!ini)
         IF options.!debug == '' THEN options.!debug = 0       /* Turn off debug by default for release builds */
@@ -983 +997 @@
     CALL VRSetIni 'Settings', 'LMHosts',       advanced.!lmhosts    , settings.!ini, 'NoClose'
 
+    CALL VRSetIni 'Settings', 'StoreCreds',    options.!storecreds  , settings.!ini, 'NoClose'
     CALL VRSetIni 'Settings', 'Debug',         options.!debug       , settings.!ini, 'NoClose'
     CALL VRSetIni 'Settings', 'MiniIcons',     advanced.!miniicons  , settings.!ini, 'NoClose'
@@ -1061 +1076 @@
             if datatype(T1) = "NUM" & datatype(T2) = "NUM" & datatype(T3) = "NUM" & datatype(T4) = "NUM" then do
                 FoundName = 0
+                /* Don't add a local link IP to LMHosts - workaround only */
+                if T1 = '169' & T2 = '254' then iterate
                 do J = 1 to lmname.0 /* machine already in LMHosts? */
                     if lmname.J = SmbObj.resname then do /* Yes? then update IP */
@@ -1387 +1404 @@
 _ShowMsg:
     /* preliminary implementation - we just do not ignore it anymore -
-       - ShowMsg from smbmon/smbusers shoule become a shared library */
+       - ShowMsg from smbmon/smbusers should become a shared library */
     ok = VRSet("DT_StatusBar", "Caption", Msg.Text)
 return
@@ -1623 +1640 @@
 
     mount = VRGet("CB_MOUNT", "Value")
+
+    /* Catch empty mount type error */
+    if mount = "" then do
+        if mtype.1 <> "" then ok = VRSet("CB_MOUNT", "Value", mtype.1)
+        if options.!debug == 1 then say time()' '||"CB_MOUNT_Change aborted"
+        return
+    end
 
     SELECT
@@ -1657 +1681 @@
             CALL NLVSetText "DT_NETWORK", "Caption", 22
         END
+        OTHERWISE DO
+            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"
@@ -2565 +2592 @@
 */
 Main_Create:
-    options.!debug    = 0
+    options.!debug    = 1
     if options.!debug == 1 then do
         ok = VRRedirectStdIO("ON")
@@ -3205 +3232 @@
 */
 Menu_File_ucCred_Reset_Click: 
-    ok = _ucDelUc()
+    if _ucChkUc() then ok = _ucDelUc()
     ok = VRSet("Pict_PWINMEM","PicturePath","#37")
-    ok = VRSet("EF_USER","Value","")
+    ok = VRSet("EF_USER",    "Value","")
     ok = VRSet("EF_PASSWORD","Value","")
-    /* FIXME: Add a message box here */
+    call _UserCredUpdate
 return
 
@@ -3686 +3713 @@
     CALL SW_ADVANCED_Init_Content
 RETURN
+
+/*:VRX         PB_ClearCred_Click
+*/
+PB_ClearCred_Click: 
+    call Menu_File_ucCred_Reset_Click
+return
 
 /*:VRX         PB_CONDET_HELP_Click
@@ -4092 +4125 @@
         ok = VRSet("PB_SETTINGS_UNDO","Enabled", 0)
     end
+    if options.!storecreds = 0 then call Menu_File_ucCred_Reset_Click
 return
 
@@ -4108 +4142 @@
 /*:VRX         PB_SMBTREE_CONNECT_Click
 */
-PB_SMBTREE_CONNECT_Click: PROCEDURE EXPOSE settings. options. icons. fs. advanced. cd. samba.
+PB_SMBTREE_CONNECT_Click: PROCEDURE EXPOSE settings. options. icons. fs. advanced. cd. samba. mtype.
     if options.!debug == 1 then say time()' '||"PB_CONNECT_Click started"
 
@@ -4594 +4628 @@
         say '  Icon:     "'SMBObj.icon'"'
     end
-
+say "Vorher:"rpc.srvinfo.OS_VERSION
+    drop rpc.
+say "Vorher:"rpc.srvinfo.OS_VERSION
     rpc_success = _rpcsrvinfo(SMBObj.resname,credentials.!username,credentials.!password)
 
@@ -4616 +4652 @@
         ok = VRMethod( "CN_INFO", "SetFieldData", Info.!version,Info.TypeFH, strip(NLVGetMessage(139),'T',':'),Info.ValueFH, rpc.srvinfo.OS_VERSION)
         ok = VRMethod( "CN_INFO", "SetFieldData", Info.!status, Info.TypeFH, strip(NLVGetMessage(67),'T',':'),Info.ValueFH, rpc.srvinfo.LOGONSTATUS )
+        /* we did not get these, but we know them anyway */
+        if rpc.srvinfo.NETBIOSNAME  = "" then ok = VRMethod( "CN_INFO", "SetFieldData", Info.!nbname, Info.TypeFH, strip(NLVGetMessage(137),'T',':'),Info.ValueFH, SMBObj.resname'ø')
+        if rpc.srvinfo.SERVERSTRING = "" then ok = VRMethod( "CN_INFO", "SetFieldData", Info.!comment,Info.TypeFH, strip(NLVGetMessage(125),'T',':'),Info.ValueFH, SMBObj.comment'ø')
     end
     else do