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

Timestamp:

Jun 14, 2016, 6:14:19 PM (9 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI: Start implementinig client side Samba configuration settings

File:

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

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1696 +1696 @@
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(47)" ")
+    w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBCONF" )
+    ok = VRMethod( "TDL_1", "InsertPage", w,"- "NLVGetMessage(47)" ")
     if options.!debug == 1 then say time()' _TabbedDialogSetup done'
 return
@@ -1768 +1770 @@
     end
     if options.!debug == 1 then say time()' _UserCredUpdate done'
+return
+
+/*:VRX         CB_client_lanman_auth_Click
+*/
+CB_client_lanman_auth_Click: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         CB_client_plaintext_auth_Click
+*/
+CB_client_plaintext_auth_Click: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         CB_client_use_spnego_Click
+*/
+CB_client_use_spnego_Click: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         CB_client_use_spnego_principal_Click
+*/
+CB_client_use_spnego_principal_Click: 
+    advanced.!smbconfchanged = 1
 return
 
@@ -3040 +3066 @@
     ok = VRset("GB_GLOBAL2", "Width", rpane_width - marginx2 )
 
-    ok = VRset("GB_LOGGING", "Left",  margin )
-    ok = VRset("GB_LOGGING", "Top",   margin * 3 + VRGet("GB_GLOBAL2","Height") /* 245 + (margin * 3) + VRGet("GB_GLOBAL2","Height") */ )
-    ok = VRset("GB_LOGGING", "Width", rpane_width - marginx2 )
-
-    ok = VRset("GB_GUI","Left",   margin )
-    ok = VRset("GB_GUI","Top",    /* 245 + */ (margin * 4) + VRGet("GB_GLOBAL2","Height") + VRGet("GB_LOGGING","Height"))
-    ok = VRset("GB_GUI","Width",  rpane_width - marginx2 )
+    ok = VRset("GB_RESOLUTION", "Left",  margin )
+    ok = VRset("GB_RESOLUTION", "Top",   margin * 3 + VRGet("GB_GLOBAL2","Height") /* 245 + (margin * 3) + VRGet("GB_GLOBAL2","Height") */ )
+    ok = VRset("GB_RESOLUTION", "Width", rpane_width - marginx2 )
+
+    ok = VRset("GB_LOGGING","Left",   margin )
+    ok = VRset("GB_LOGGING","Top",    /* 245 + */ (margin * 4) + VRGet("GB_GLOBAL2","Height") + VRGet("GB_RESOLUTION","Height"))
+    ok = VRset("GB_LOGGING","Width",  rpane_width - marginx2 )
 
     ok = VRset("PB_SETTINGS_APPLY", "Left", margin )
@@ -3057 +3083 @@
     ok = VRset("PB_SETTINGS_HELP", "Top",  pane_height - pbtn_height - marginx2)
     ok = VRset("PB_SETTINGS_HELP", "Height", pbtn_height)
+
+    /* SMB.CONF Settings page */
+    ok = VRSet("GB_SMBCONFX", "Top",     margin /* x2 */     )
+    ok = VRSet("GB_SMBCONFX", "Left",    margin /* x2 */  /* split_left + 60 */ )
+    ok = VRset("GB_SMBCONFX", "Height",  pane_height     )
+    ok = VRset("GB_SMBCONFX", "Width",   rpane_width     )
+
+    ok = VRset("GB_SMBCONF2", "Left",  margin )
+    ok = VRset("GB_SMBCONF2", "Top",   marginx2 )
+    ok = VRset("GB_SMBCONF2", "Width", rpane_width - marginx2 )
+    ok = VRset("GB_SMBCONF2", "Height",  pane_height - (margin * 7) - pbtn_height /* - 245 */ )
+
+    ok = VRset("PB_SMBCONF_APPLY", "Left", margin )
+    ok = VRset("PB_SMBCONF_APPLY", "Top",  pane_height - pbtn_height - marginx2      )
+    ok = VRset("PB_SMBCONF_APPLY", "Height", pbtn_height)
+    ok = VRset("PB_SMBCONF_UNDO", "Left", VRGet("PB_CONDET_SAVE","Width") + marginx2)
+    ok = VRset("PB_SMBCONF_UNDO", "Top",  pane_height - pbtn_height - marginx2      )
+    ok = VRset("PB_SMBCONF_UNDO", "Height", pbtn_height)
+    ok = VRset("PB_SMBCONF_HELP", "Left", rpane_width - marginx2 - VRGet("PB_CONDET_HELP","Width") + 24)
+    ok = VRset("PB_SMBCONF_HELP", "Top",  pane_height - pbtn_height - marginx2)
+    ok = VRset("PB_SMBCONF_HELP", "Height", pbtn_height)
 
     /* DOne with pages */
@@ -4403 +4450 @@
 return
 
+/*:VRX         PB_SMBCONF_APPLY_Click
+*/
+PB_SMBCONF_APPLY_Click:
+    if advanced.!smbconfchanged = 1 then do
+        client_lanman_auth          = VRGet("CB_client_lanman_auth","Set")
+        client_plaintext_auth       = VRGet("CB_client_plaintext_auth","Set")
+        client_use_spnego           = VRGet("CB_client_use_spnego","Set")
+        client_use_spnego_principal = VRGet("CB_client_use_spnego_principal","Set")
+
+        handle = IniOpen('global', samba.!smbconf)
+        call IniSet 'client lanman auth',          YesNo(client_lanman_auth), handle
+        call IniSet 'client plaintext auth',       YesNo(client_plaintext_auth), handle
+        call IniSet 'client use spnego',           YesNo(client_use_spnego), handle
+        call IniSet 'client use spnego principal', YesNo(client_use_spnego_principal), handle
+
+        call IniSave handle
+        call IniClose handle
+        advanced.!smbconfchanged = 0
+        ok = VRSet("PB_SMBCONF_UNDO","Enabled", 0)
+    end
+return
+
+/*:VRX         PB_SMBCONF_HELP_Click
+*/
+PB_SMBCONF_HELP_Click:
+    CALL VRMethod 'SW_SETTINGS', 'InvokeHelp'
+return
+
+/*:VRX         PB_SMBCONF_UNDO_Click
+*/
+PB_SMBCONF_UNDO_Click:
+    call SW_SETTINGS_Init_Content
+return
+
 /*:VRX         PB_SMBTREE_CONNECT_Click
 */
@@ -5270 +5351 @@
 return
 
+/*:VRX         SW_SMBCONF_Close
+*/
+SW_SMBCONF_Close: 
+    call SW_SMBCONF_Fini
+return
+
+/*:VRX         SW_SMBCONF_Create
+*/
+SW_SMBCONF_Create: 
+    call SW_SMBCONF_Init
+return
+
+/*:VRX         SW_SMBCONF_Fini
+*/
+SW_SMBCONF_Fini: 
+    window = VRInfo( "Window" )
+    call VRDestroy window
+    drop window
+return
+/*:VRX         SW_SMBCONF_Init
+*/
+SW_SMBCONF_Init: 
+    
+    /* Buttons */
+    call NLVSetText "PB_SMBCONF_APPLY",  "Caption", 122
+    call NLVSetText "PB_SMBCONF_UNDO",   "Caption", 123
+    call NLVSetText "PB_SMBCONF_HELP",   "Caption", 4
+
+return
+
+/*:VRX         SW_SMBCONF_Init_Content
+*/
+SW_SMBCONF_Init_Content: 
+    call _SmbConfCreateShadowCopy
+
+    client_lanman_auth          = ZeroOne(IniGet('client lanman auth', 'global', samba.!shadowsmbconf))
+    client_plaintext_auth       = ZeroOne(IniGet('client plaintext auth', 'global', samba.!shadowsmbconf))
+    client_use_spnego           = ZeroOne(IniGet('client use spnego', 'global', samba.!shadowsmbconf))
+    client_use_spnego_principal = ZeroOne(IniGet('client use spnego principal', 'global', samba.!shadowsmbconf))
+
+    ok = VRSet("CB_client_lanman_auth","Set",client_lanman_auth)
+    ok = VRSet("CB_client_plaintext_auth","Set",client_plaintext_auth)
+    ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
+    ok = VRSet("CB_client_use_spnego_principal","Set",client_use_spnego_principal)
+
+    advanced.!smbconfchanged = 0
+return
+
 /*:VRX         SW_SMBTREE_Close
 */
@@ -5326 +5455 @@
         when page = 5 then do /* Settings */
             call SW_SETTINGS_Init_Content
+        end
+        when page = 6 then do /* SMB.CONF */
+            call SW_SMBCONF_Init_Content
         end
         otherwise nop
@@ -5406 +5538 @@
 return
 
+/*:VRX         YesNo
+*/
+YesNo: procedure
+    if arg(1) = 1 then answer = "Yes"
+                  else answer = "No"
+return answer
+
+/*:VRX         ZeroOne
+*/
+ZeroOne: procedure
+    if translate(arg(1)) = "YES" then answer = 1
+                                 else answer = 0
+return answer