Changeset 569 for branches/guitools-1.0/install

Timestamp:

Mar 30, 2011, 11:41:45 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: SMBUSERS: master.passwd password support

Location:

branches/guitools-1.0/install

Files:

• changes (modified) (1 diff)
• sscc.ico (deleted)
• sscc.vrp (modified) (1 diff)
• sscc.vrx (modified) (11 diffs)
• sscc.vry (modified) ( previous)

branches/guitools-1.0/install/changes

@@ +1 @@
+Version 1.x.x xx-xx-2011
+                         *Changed: Internal names of objects
 Version 1.0.0 13-03-2010
                          +Added: Use a more wizard-like style instead of

branches/guitools-1.0/install/sscc.vrp

@@ -6 +6 @@
 RunDirectory: E:\Dev\REXX\VXREXX\Projects\Samba\install
 VRXWindow: __VREMainWindow,1,1987,5059,891,7263
-VRXWindow: __VRESectionListWindow,1,2819,12671,8974,4890
-VRXWindow: __VREToolsWindow,1,2674,4481,6483,1659
+VRXWindow: __VRESectionListWindow,1,2048,9877,8974,4890
+VRXWindow: __VREToolsWindow,1,2674,4481,6480,1665
 VRXWindow: __VREWindListWindow,1,193,14406,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: GB_Global_1,1
-UserWindow: Installer,1
-UserWindow: RemoveConfig,1

branches/guitools-1.0/install/sscc.vrx

@@ -320 +320 @@
     CALL NLVSetText 'PB_Reload',        'Caption',   11
     CALL NLVSetText 'PB_Reload',        'Hinttext', 111
-    CALL NLVSetText 'PB_Create',        'Caption',   12
-    CALL NLVSetText 'PB_Create',        'Hinttext', 112
+    CALL NLVSetText 'PB_Save',        'Caption',   12
+    CALL NLVSetText 'PB_Save',        'Hinttext', 112
     CALL NLVSetText 'PB_Undo',          'Caption',    9
     CALL NLVSetText 'PB_Undo',          'Hinttext', 109
@@ -938 +938 @@
     ValueChanged = 1
     if pos(VRGet(VRInfo("OBject"),"Name"), ChangeList) = 0 then Changelist = ChangeList' 'VRGet(VRInfo("OBject"),"Name")
-    ok = VRSet("PB_Create", "Enabled", 1)
+    ok = VRSet("PB_Save", "Enabled", 1)
     say "  ValueChanged = "ValueChanged
     say Changelist
@@ -988 +988 @@
     do until lines(src) = 0
         smbline = linein(src)
+        if pos("idmap uid",smbline) > 0 then iterate
+        if pos("idmap gid",smbline) > 0 then iterate
         if pos("winbind separator",smbline) > 0 then iterate
+        if pos("copy ",smbline) > 0 then iterate
         call lineout trg, smbline
         lct = lct + 1
@@ -2342 +2345 @@
     MButton.bTop   = VRGet("GB_SmbConfTree","height")+FWidth*2
     MButton.bLeft  = VRGet("GB_Shares","Left")
-    MButton.bWidth = VRGet("PB_Create","Width")
+    MButton.bWidth = VRGet("PB_Save","Width")
 
     if MButton.bTop < 1300 & MButton.bLeft < 1300 then do
@@ -2355 +2358 @@
     ok = VRSet("PB_Reload", "Width",  MButton.bWidth)
 
-    ok = VRSet("PB_Create", "Top",    MButton.bTop)
-    ok = VRSet("PB_Create", "Left",   MButton.bLeft+1*FWidth+MButton.bWidth)
+    ok = VRSet("PB_Save", "Top",    MButton.bTop)
+    ok = VRSet("PB_Save", "Left",   MButton.bLeft+1*FWidth+MButton.bWidth)
     ok = VRSet("PB_Reload", "Width",  MButton.bWidth)
 
@@ -2574 +2577 @@
 Menu_Options_SimpleMode_Click: 
     say 'SimpleMode_Click started'
+
+    /* Workaround for testparm bugs */
+    say 'VRCopyFile('smbconf', 'TempDir'smb.conf )'
+    ok = VRCopyFile( smbconf, TempDir'smb.conf')
+    call _SmbConfCommitChanges
+
     say samba.!testparmexe' -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
     address cmd samba.!testparmexe' -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
@@ -2717 +2726 @@
 */
 PB_Cancel_Click: 
-    call PB_Create_Click
+    call PB_Save_Click
     call Quit
-return
-
-/*:VRX         PB_Create_Click
-*/
-PB_Create_Click: 
-    if ValueChanged then do
-        if CurSection <> "" then do
-            call _SaveChanges
-            ok = VRSet("PB_Create", "Enabled", 0)
-            call CN_smbconf_Click
-        end
-    end
 return
 
@@ -2815 +2812 @@
 */
 PB_Reload_Click: 
-    call PB_Create_Click    
+    call PB_Save_Click    
     call beep 960, 1
     address CMD samba.!smbcmd' reload'
@@ -2849 +2846 @@
 return
 
+/*:VRX         PB_Save_Click
+*/
+PB_Save_Click: 
+    if ValueChanged then do
+        if CurSection <> "" then do
+            call _SaveChanges
+            ok = VRSet("PB_Save", "Enabled", 0)
+            call CN_smbconf_Click
+        end
+    end
+return
+
 /*:VRX         PB_Undo_Click
 */
@@ -2908 +2917 @@
        VRGet("Main","WindowState") = "Minimized" then ok = VRMethod("Main", "Restore")
 
-/*  if samba.!testparmexe <> "" then do
+    if samba.!testparmexe <> "" then do
         address cmd samba.!testparmexe' -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
         call _SmbConfCommitChanges
-    end */
+    end
 
     call _INIWrite
@@ -3003 +3012 @@
     say "TM_Value_Trigger started"
     ValueChanged = 0
-    ok = VRSet("PB_Create", "Enabled", 0)
+    ok = VRSet("PB_Save", "Enabled", 0)
     ChangeList = ""
     ok = VRSet("TM_Value", "Enabled", 0)