Changeset 990 for trunk/guitools/evfsgui

Timestamp:

Dec 9, 2016, 11:06:20 AM (9 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: All changes that have built over time.

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (2 diffs)
• evfsgui.vrx (modified) (7 diffs)
• evfsgui.vry (modified) ( previous)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -3 +3 @@
 VRX: wps_open.VRX
 VXOFile: VROBJEX
+VXOFile: VRSPLIT
 ClassFile: VRSPLITB.DLL
 MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
@@ -11 +12 @@
 VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,5474,1665
+VRXWindow: __VREToolsWindow,1,2951,12479,6992,1661
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
 UserWindow: Main,1
 UserWindow: SW_PROGRESS,1
+UserWindow: SW_SETTINGS,1
 UserWindow: SW_SMBCONF,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1558 +1558 @@
     /* 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'
-    address cmd samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    if datatype(log_level) <> "NUM" then log_level = 2
+    say     '  'samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    address cmd samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
     if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy done'
 return
@@ -4393 +4394 @@
 */
 PB_SETTINGS_APPLY_Click:
-    advanced.!loglevel    = VRGet("SPIN_LOGLEVEL", "Value" )
+    advanced.!loglevel    = VRGet("SPIN_LOG_LEVEL", "Value" )
     advanced.!logfile     = VRGet("EF_LOGFILE",    "Value" )
     advanced.!browseauth  = VRGet("CB_BROWSEAUTH", "Set" )
@@ -4447 +4448 @@
         if \_IsValidIPAddress(VRGet("EF_WINS_SERVER","Value")) then ok = VRSet("EF_WINS_SERVER","Value","")
         call IniSet 'wins server', VRGet("EF_WINS_SERVER","Value"), handle
+        call IniSet 'log level', VRGet("SPIN_LOG_LEVEL","Value"), handle
         call IniSave handle
         call IniClose handle
@@ -4793 +4795 @@
 */
 SPIN_client_signing_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_LOG_LEVEL_Change
+*/
+SPIN_LOG_LEVEL_Change: 
     advanced.!smbconfchanged = 1
 return
@@ -5382 +5390 @@
     if advanced.!miniicons   \= ""  then ok = VRSet("CB_MINIICONS",  "Set",   advanced.!miniicons)
 
-    /* Obsolete */
-    if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)
-    if advanced.!loglevel    \= "0" then ok = VRSet("SPIN_LOGLEVEL", "Value", advanced.!loglevel)
-
+/*  if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)     /* Obsolete */
+    if advanced.!loglevel    \= "0" then ok = VRSet("SPIN_LOG_LEVEL", "Value", advanced.!loglevel) */
+
+    log_level = IniGet('log level', 'global', samba.!smbconf)
     call _SmbConfCreateShadowCopy
+
+
+say "log level ="log_level
+    if log_level = "" then log_level = 2
+say "log level ="log_level
+    ok = VRSet("SPIN_LOG_LEVEL","Value",log_level)
 
     wins_support = translate(IniGet('wins support', 'global', samba.!shadowsmbconf))
@@ -5465 +5479 @@
     client_max_protocol         = IniGet('client max protocol', 'global', samba.!shadowsmbconf)
     if client_max_protocol = "" then do
-        ok = VRSet("SPIN_client_max_protocol","Enabled", 0)
-        ok = VRSet("DT_client_max_protocol","Enabled", 0)
+     /* ok = VRSet("SPIN_client_max_protocol","Enabled", 0)
+        ok = VRSet("DT_client_max_protocol","Enabled", 0) */
     end
     else ok = VRSet("SPIN_client_max_protocol","Value",client_max_protocol)
@@ -5472 +5486 @@
     client_min_protocol         = IniGet('client min protocol', 'global', samba.!shadowsmbconf)
     if client_min_protocol = "" then do
-        ok = VRSet("SPIN_client_min_protocol","Enabled", 0)
-        ok = VRSet("DT_client_min_protocol","Enabled", 0)
+     /* ok = VRSet("SPIN_client_min_protocol","Enabled", 0)
+        ok = VRSet("DT_client_min_protocol","Enabled", 0) */
     end
     else ok = VRSet("SPIN_client_min_protocol","Value",client_min_protocol)