Changeset 1048

Timestamp:

Jan 24, 2018, 2:46:26 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

EVFSGUI: Check in changes from 1042-1044 in ArcaMap branch into trunk

Location:

trunk/guitools/evfsgui

Files:

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

trunk/guitools/evfsgui/evfsgui.RC

@@ -1 +1 @@
 ICON 1 .\rc\icons\sambaclient.ico
-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 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

trunk/guitools/evfsgui/evfsgui.vrp

@@ -12 +12 @@
 VRXWindow: __VREFileListWindow,1,5408,14791,2665,3358
 VRXWindow: __VRESectionListWindow,1,2867,14020,10889,5035
-VRXWindow: __VREToolsWindow,1,2867,337,6989,1659
+VRXWindow: __VREToolsWindow,1,2867,337,6992,1661
 VRXWindow: __VREWindListWindow,1,458,14695,6360,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: SW_ADVANCED,1
 UserWindow: SW_MOUNTPOINT,1
 UserWindow: SW_DIALOG,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1584 +1584 @@
 /*:VRX         CB_client_NTLMv2_auth_Click
 */
-CB_client_NTLMv2_auth_Click: 
+CB_client_NTLMv2_auth_Click:
     advanced.!smbconfchanged = 1
 
@@ -1601 +1601 @@
 /*:VRX         CB_client_plaintext_auth_Click
 */
-CB_client_plaintext_auth_Click: 
+CB_client_plaintext_auth_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1607 +1607 @@
 /*:VRX         CB_client_use_spnego_Click
 */
-CB_client_use_spnego_Click: 
+CB_client_use_spnego_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1613 +1613 @@
 /*:VRX         CB_client_use_spnego_principal_Click
 */
-CB_client_use_spnego_principal_Click: 
+CB_client_use_spnego_principal_Click:
     advanced.!smbconfchanged = 1
 return
@@ -1625 +1625 @@
 /*:VRX         CB_ENCRYPTION1_Click
 */
-CB_ENCRYPTION1_Click: 
+CB_ENCRYPTION1_Click:
     if VRGet("CB_ENCRYPTION1","set") then do
-        ok = VRSet("CB_CB_NTLMv11", "Set", 0)
-        ok = VRSet("CB_CB_NTLMv11", "Enabled", 0)
+        ok = VRSet("CB_NTLMv11", "Set", 0)
+        ok = VRSet("CB_NTLMv11", "Enabled", 0)
     end
     else do
-        ok = VRSet("CB_CB_NTLMv11", "Enabled", 1)
+        ok = VRSet("CB_NTLMv11", "Enabled", 1)
     end
 
@@ -1638 +1638 @@
 /*:VRX         CB_ENCRYPTION_Click
 */
-CB_ENCRYPTION_Click: 
+CB_ENCRYPTION_Click:
     if VRGet("CB_ENCRYPTION","set") then do
-        ok = VRSet("CB_CB_NTLMv1", "Set", 0)
-        ok = VRSet("CB_CB_NTLMv1", "Enabled", 0)
+        ok = VRSet("CB_NTLMv1", "Set", 0)
+        ok = VRSet("CB_NTLMv1", "Enabled", 0)
     end
     else do
-        ok = VRSet("CB_CB_NTLMv1", "Enabled", 1)
+        ok = VRSet("CB_NTLMv1", "Enabled", 1)
     end
 return
@@ -1650 +1650 @@
 /*:VRX         CB_KERBEROS51_Click
 */
-CB_KERBEROS51_Click: 
+CB_KERBEROS51_Click:
     if VRGet("CB_KERBEROS51","set") then do
-        ok = VRSet("CB_CB_NTLMv11", "Set", 0)
-        ok = VRSet("CB_CB_NTLMv11", "Enabled", 0)
+        ok = VRSet("CB_NTLMv11", "Set", 0)
+        ok = VRSet("CB_NTLMv11", "Enabled", 0)
     end
     else do
-        ok = VRSet("CB_CB_NTLMv11", "Enabled", 1)
+        ok = VRSet("CB_NTLMv11", "Enabled", 1)
     end
 return
 /*:VRX         CB_KERBEROS5_Click
 */
-CB_KERBEROS5_Click: 
+CB_KERBEROS5_Click:
     if VRGet("CB_KERBEROS5","set") then do
-        ok = VRSet("CB_CB_NTLMv1", "Set", 0)
-        ok = VRSet("CB_CB_NTLMv1", "Enabled", 0)
+        ok = VRSet("CB_NTLMv1", "Set", 0)
+        ok = VRSet("CB_NTLMv1", "Enabled", 0)
     end
     else do
-        ok = VRSet("CB_CB_NTLMv1", "Enabled", 1)
+        ok = VRSet("CB_NTLMv1", "Enabled", 1)
     end
 return
@@ -1758 +1758 @@
 /*:VRX         CB_NTLMV11_Click
 */
-CB_NTLMV11_Click: 
+CB_NTLMV11_Click:
     if VRGet("CB_NTLMV11","set") then do
         ok = VRSet("CB_KERBEROS51", "Set", 0)
@@ -1773 +1773 @@
 /*:VRX         CB_NTLMv1_Click
 */
-CB_NTLMv1_Click: 
+CB_NTLMv1_Click:
     if VRGet("CB_NTLMV1","set") then do
         ok = VRSet("CB_KERBEROS5", "Set", 0)
@@ -2850 +2850 @@
     ok = VRset("PB_DETACH",  "Left",   margin )
     ok = VRset("PB_DETACH",  "Top",    pane_height - pbtn_height - marginx2 )
-    ok = VRset("PB_DETACH",  "Width",  min((lpane_width-margin*3) % 2, 1313)    )
+    ok = VRset("PB_DETACH",  "Width",  min((lpane_width-margin*3) % 2, 1313))
     ok = VRset("PB_UNMOUNT", "Left",   VRGet("PB_DETACH","Width") + marginx2)
     ok = VRset("PB_UNMOUNT", "Top",    pane_height - pbtn_height - marginx2 )
-    ok = VRset("PB_UNMOUNT", "Width",  min((lpane_width-margin*3) % 2, 1313)    )
+    ok = VRset("PB_UNMOUNT", "Width",  min((lpane_width-margin*3) % 2, 1313))
 
     /* Splitbar - reduced in size to make it more noticable */
@@ -3458 +3458 @@
 /*:VRX         Menu_Selected_ACLS_Click
 */
-Menu_Selected_ACLS_Click: 
+Menu_Selected_ACLS_Click:
     if options.!debug == 1 then say '  List ACLS for  "'SMBObj.udatatype'"'
     window = VRLoadSecondary( "SW_ACLS", "W" )
@@ -3959 +3959 @@
 /*:VRX         PB_ACLS_OK_Click
 */
-PB_ACLS_OK_Click: 
+PB_ACLS_OK_Click:
     call SW_ACLS_Close
 return
@@ -4183 +4183 @@
     end
 
-    options.!workgroup  = ''
-    options.!server     = ''
-    options.!share      = ''
-    options.!user       = ''
-    options.!password   = ''
-    options.!master     = ''
-    options.!mastertype = ''
-    options.!memlen     = advanced.!memlen
-    options.!easupport  = advanced.!easupport
-    options.!readonly   = advanced.!readonly
-    options.!loglevel   = advanced.!loglevel
-    options.!logfile    = advanced.!logfile
+    options.!workgroup     = ''
+    options.!server        = ''
+    options.!share         = ''
+    options.!user          = ''
+    options.!password      = ''
+    options.!master        = ''
+    options.!mastertype    = ''
+    options.!memlen        = advanced.!memlen
+    options.!easupport     = advanced.!easupport
+    options.!readonly      = advanced.!readonly
+    options.!loglevel      = advanced.!loglevel
+    options.!logfile       = advanced.!logfile
     options.!cachetimeout  = advanced.!cachetimeout
     options.!cachelistings = advanced.!cachelistings
-    options.!kerberos5     = advanced.!kerberos5     
-    options.!ntlmv1        = advanced.!ntlmv1        
-    options.!encryption    = advanced.!encryption    
+    options.!kerberos5     = advanced.!kerberos5
+    options.!ntlmv1        = advanced.!ntlmv1
+    options.!encryption    = advanced.!encryption
 
     vfs.!drive      = ''
@@ -4681 +4681 @@
 /*:VRX         RB_ACLS_NUMERIC_Click
 */
-RB_ACLS_NUMERIC_Click: 
+RB_ACLS_NUMERIC_Click:
     aclsnumeric = '--numeric'
     ok = VRSet("DT_REV_CONT","Caption","")
@@ -4691 +4691 @@
 /*:VRX         RB_ACLS_TEXT_Click
 */
-RB_ACLS_TEXT_Click: 
+RB_ACLS_TEXT_Click:
     aclsnumeric = ''
     ok = VRSet("DT_REV_CONT","Caption","")
@@ -4760 +4760 @@
 /*:VRX         SPIN_client_ipc_signing_Change
 */
-SPIN_client_ipc_signing_Change: 
+SPIN_client_ipc_signing_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4766 +4766 @@
 /*:VRX         SPIN_client_max_protocol_Change
 */
-SPIN_client_max_protocol_Change: 
+SPIN_client_max_protocol_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4772 +4772 @@
 /*:VRX         SPIN_client_min_protocol_Change
 */
-SPIN_client_min_protocol_Change: 
+SPIN_client_min_protocol_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4778 +4778 @@
 /*:VRX         SPIN_client_signing_Change
 */
-SPIN_client_signing_Change: 
+SPIN_client_signing_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4784 +4784 @@
 /*:VRX         SPIN_LOG_LEVEL_Change
 */
-SPIN_LOG_LEVEL_Change: 
+SPIN_LOG_LEVEL_Change:
     advanced.!smbconfchanged = 1
 return
@@ -4872 +4872 @@
 /*:VRX         SW_ACLS_Close
 */
-SW_ACLS_Close: 
+SW_ACLS_Close:
     call SW_ACLS_Fini
 return
@@ -4878 +4878 @@
 /*:VRX         SW_ACLS_Create
 */
-SW_ACLS_Create: 
+SW_ACLS_Create:
     call SW_ACLS_Init
     ACL.typeFH   = VRMethod( "CN_ACLS", "AddField", "String", "Type" )
@@ -4893 +4893 @@
 /*:VRX         SW_ACLS_Fini
 */
-SW_ACLS_Fini: 
+SW_ACLS_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -4900 +4900 @@
 /*:VRX         SW_ACLS_Init
 */
-SW_ACLS_Init: 
+SW_ACLS_Init:
     window = VRInfo( "Object" )
     if( \VRIsChildOf( window, "Notebook" ) ) then do
@@ -5459 +5459 @@
 /*:VRX         SW_SMBCONF_Close
 */
-SW_SMBCONF_Close: 
+SW_SMBCONF_Close:
     call SW_SMBCONF_Fini
 return
@@ -5465 +5465 @@
 /*:VRX         SW_SMBCONF_Create
 */
-SW_SMBCONF_Create: 
+SW_SMBCONF_Create:
     call SW_SMBCONF_Init
 return
@@ -5471 +5471 @@
 /*:VRX         SW_SMBCONF_Fini
 */
-SW_SMBCONF_Fini: 
+SW_SMBCONF_Fini:
     window = VRInfo( "Window" )
     call VRDestroy window
@@ -5478 +5478 @@
 /*:VRX         SW_SMBCONF_Init
 */
-SW_SMBCONF_Init: 
+SW_SMBCONF_Init:
     
     /* Buttons */
@@ -5489 +5489 @@
 /*:VRX         SW_SMBCONF_Init_Content
 */
-SW_SMBCONF_Init_Content: 
+SW_SMBCONF_Init_Content:
     call _SmbConfCreateShadowCopy
 
     client_NTLMv2_auth          = ZeroOne(IniGet('client NTLMv2 auth', 'global', samba.!shadowsmbconf))
     if client_NTLMv2_auth = 1 then do
-        ok = VRSet("CB_client_NTLMv2_auth","Set",client_NTLMv2_auth)        
+        ok = VRSet("CB_client_NTLMv2_auth","Set",client_NTLMv2_auth)
         ok = VRSet("CB_client_lanman_auth","Enabled", 0)
         ok = VRSet("CB_client_plaintext_auth","Enabled", 0)
@@ -5659 +5659 @@
 /*:VRX         TM_STATUSBAR_Trigger
 */
-TM_STATUSBAR_Trigger: 
+TM_STATUSBAR_Trigger:
     call _StatusbarReset
 return