Changeset 924 for trunk/guitools/evfsgui

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI: Start implementinig client side Samba configuration settings

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.RC (modified) (1 diff)
• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (8 diffs)
• evfsgui.vry (modified) ( previous)
• rc/icons/green-off-16.bmp (deleted)
• rc/icons/green-on-16.bmp (deleted)
• rc/icons/green_off_16.bmp (added)
• rc/icons/green_on_16.bmp (added)
• rc/icons/ooo-base-doc.ico (deleted)
• rc/icons/ooo-calc-doc.ico (deleted)
• rc/icons/ooo-draw-doc.ico (deleted)
• rc/icons/ooo-folder.ico (deleted)
• rc/icons/ooo-folder1.ico (deleted)
• rc/icons/ooo-impress-doc.ico (deleted)
• rc/icons/ooo-math-doc.ico (deleted)
• rc/icons/ooo-open.ico (deleted)
• rc/icons/ooo-quickstart.ico (deleted)
• rc/icons/ooo-writer-doc.ico (deleted)
• rc/icons/ooo_base_doc.ico (added)
• rc/icons/ooo_calc_doc.ico (added)
• rc/icons/ooo_draw_doc.ico (added)
• rc/icons/ooo_folder.ico (added)
• rc/icons/ooo_folder1.ico (added)
• rc/icons/ooo_impress_doc.ico (added)
• rc/icons/ooo_math_doc.ico (added)
• rc/icons/ooo_open.ico (added)
• rc/icons/ooo_quickstart.ico (added)
• rc/icons/ooo_writer_doc.ico (added)
• rc/throbber/eball_01.bmp (deleted)
• rc/throbber/eball_02.bmp (deleted)
• rc/throbber/eball_03.bmp (deleted)
• rc/throbber/eball_04.bmp (deleted)
• rc/throbber/eball_05.bmp (deleted)
• rc/throbber/eball_06.bmp (deleted)
• rc/throbber/eball_07.bmp (deleted)
• rc/throbber/eball_08.bmp (deleted)
• rc/throbber/eball_09.bmp (deleted)
• rc/throbber/eball_10.bmp (deleted)
• rc/throbber/eball_11.bmp (deleted)
• rc/throbber/eball_12.bmp (deleted)
• rc/throbber/eball_13.bmp (deleted)
• rc/throbber/eball_14.bmp (deleted)
• rc/throbber/eball_15.bmp (deleted)
• rc/throbber/eball_16.bmp (deleted)
• rc/throbber/eball_17.bmp (deleted)
• rc/throbber/eball_18.bmp (deleted)
• rc/throbber/eball_19.bmp (deleted)
• rc/throbber/eball_20.bmp (deleted)
• rc/throbber/eball_21.bmp (deleted)
• rc/throbber/eball_22.bmp (deleted)
• rc/throbber/eball_23.bmp (deleted)
• rc/throbber/eball_24.bmp (deleted)
• rc/throbber/eball_25.bmp (deleted)
• rc/throbber/frame_01.bmp (deleted)
• rc/throbber/frame_02.bmp (deleted)
• rc/throbber/frame_03.bmp (deleted)
• rc/throbber/frame_04.bmp (deleted)
• rc/throbber/frame_05.bmp (deleted)
• rc/throbber/frame_06.bmp (deleted)
• rc/throbber/frame_07.bmp (deleted)
• rc/throbber/frame_08.bmp (deleted)
• rc/throbber/frame_09.bmp (deleted)
• rc/throbber/frame_10.bmp (deleted)
• rc/throbber/frame_11.bmp (deleted)
• rc/throbber/frame_12.bmp (deleted)

trunk/guitools/evfsgui/evfsgui.RC

@@ -1 +1 @@
 ICON 1 .\rc\icons\sambaclient.ico
-BITMAP 11 .\rc\throbber\frame_01.bmp
-BITMAP 12 .\rc\throbber\frame_02.bmp
-BITMAP 13 .\rc\throbber\frame_03.bmp
-BITMAP 14 .\rc\throbber\frame_04.bmp
-BITMAP 15 .\rc\throbber\frame_05.bmp
-BITMAP 16 .\rc\throbber\frame_06.bmp
-BITMAP 17 .\rc\throbber\frame_07.bmp
-BITMAP 18 .\rc\throbber\frame_08.bmp
-BITMAP 19 .\rc\throbber\frame_09.bmp
-BITMAP 20 .\rc\throbber\frame_10.bmp
-BITMAP 21 .\rc\throbber\frame_11.bmp
-BITMAP 22 .\rc\throbber\frame_12.bmp
-BITMAP 36 .\rc\icons\green-on-16.bmp
-BITMAP 37 .\rc\icons\green-off-16.bmp
+BITMAP 11 ..\shared\rc\throbber\frame_01.bmp
+BITMAP 12 ..\shared\rc\throbber\frame_02.bmp
+BITMAP 13 ..\shared\rc\throbber\frame_03.bmp
+BITMAP 14 ..\shared\rc\throbber\frame_04.bmp
+BITMAP 15 ..\shared\rc\throbber\frame_05.bmp
+BITMAP 16 ..\shared\rc\throbber\frame_06.bmp
+BITMAP 17 ..\shared\rc\throbber\frame_07.bmp
+BITMAP 18 ..\shared\rc\throbber\frame_08.bmp
+BITMAP 19 ..\shared\rc\throbber\frame_09.bmp
+BITMAP 20 ..\shared\rc\throbber\frame_10.bmp
+BITMAP 21 ..\shared\rc\throbber\frame_11.bmp
+BITMAP 22 ..\shared\rc\throbber\frame_12.bmp
+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
-icon 81 .\rc\icons\ooo-base-doc.ico
-icon 82 .\rc\icons\ooo-calc-doc.ico
-icon 83 .\rc\icons\ooo-draw-doc.ico
-icon 84 .\rc\icons\ooo-impress-doc.ico
-icon 85 .\rc\icons\ooo-math-doc.ico
-icon 86 .\rc\icons\ooo-writer-doc.ico
+icon 81 .\rc\icons\ooo_base_doc.ico
+icon 82 .\rc\icons\ooo_calc_doc.ico
+icon 83 .\rc\icons\ooo_draw_doc.ico
+icon 84 .\rc\icons\ooo_impress_doc.ico
+icon 85 .\rc\icons\ooo_math_doc.ico
+icon 86 .\rc\icons\ooo_writer_doc.ico
 icon 87 .\rc\icons\fw.ico
 icon 88 .\rc\icons\image.ico

trunk/guitools/evfsgui/evfsgui.vrp

@@ -9 +9 @@
 RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
 VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
-VRXWindow: __VREFileListWindow,1,1469,6215,2665,3358
+VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,5477,1663
+VRXWindow: __VREToolsWindow,1,2951,12479,5477,1659
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ADVANCED,1
 UserWindow: SW_PROGRESS,1
-UserWindow: SW_SMBTREE,1
+UserWindow: SW_SMBCONF,1

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