Changeset 580

Timestamp:

Jun 25, 2011, 7:20:41 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: SSCC: Try to really fix Ticket #146

Location:

branches/guitools-1.0/install

Files:

• changes (modified) (2 diffs)
• sscc.vrp (modified) (1 diff)
• sscc.vrx (modified) (7 diffs)
• sscc.vry (modified) ( previous)

branches/guitools-1.0/install/changes

@@ +1 @@
+Version 1.0.2 25-06-2011
+                         !Fixed: Do not trash smb.conf on Samba 3.3.x under
+                                 all possible conditions (Ticket #146).
 Version 1.0.1 13-06-2011
                          +Added: Workgroup/Domain can set during installation
                          *Changed: Internal names of objects
+                         !Fixed: Do not trash smb.conf on Samba 3.3.x when
+                                 switching from expert mode to simple mode.
 Version 1.0.0 13-03-2010
                          +Added: Use a more wizard-like style instead of
@@ -16 +21 @@
                          !Fixed: Initiate notebook page load earlier (no more 
                                  crashes in certain situations)
-                         !Fixed: Do not crash on almost empty smb.conf (created
-                                 by a client installation
+                         !Fixed: Do not crash on almost empty smb.conf 
+                                 (created by a client installation)
                          !Fixed: Bug in NLV.VRS 2.0 
 Version 0.9.5 06-03-2010

branches/guitools-1.0/install/sscc.vrp

@@ -7 +7 @@
 VRXWindow: __VREMainWindow,1,1987,5059,891,7263
 VRXWindow: __VRESectionListWindow,1,3071,10551,8974,4890
-VRXWindow: __VREToolsWindow,1,1590,337,6483,1667
-VRXWindow: __VREWindListWindow,1,422,10551,2650,3150
+VRXWindow: __VREToolsWindow,1,1590,337,6489,1659
+VRXWindow: __VREWindListWindow,1,458,12190,2650,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: Installer,1

branches/guitools-1.0/install/sscc.vrx

@@ -978 +978 @@
 /*:VRX         _SmbConfCommitChanges
 */
-_SmbConfCommitChanges: 
+_SmbConfCommitChanges:
+    IF options.!debug == 1 THEN say '_SmbConfCommitChanges() started'    
+ 
     src = TempDir'smb.conf'
+    if stream(src,'c','query size') = 0 then do
+        ok = VRCopyFile(smbconf,src)
+    end
+    'pause'
+    say src' 'stream(src,'c','query size') 
+    'pause'
     trg = smbconf
+    say trg
     ok = SysFileDelete(smbconf)
     call lineout trg, '# Samba config file created using SSCC ver. 'word(VRGet("Main","Hinttext"),2)
@@ -999 +1008 @@
     ok = stream(src,'c','close')
     ok = SysFileDelete(src)
+    IF options.!debug == 1 THEN say '_SmbConfCommitChanges() done'    
 return
 
@@ -2726 +2736 @@
 */
 PB_Cancel_Click: 
-    call PB_Save_Click
+    IF options.!debug == 1 THEN say 'PB_Cancel_Click() started'    
+    if VRGet("PB_Save","Enabled") then call PB_Save_Click
     call Quit
+    IF options.!debug == 1 THEN say 'PB_Cancel_Click() done'    
 return
 
@@ -2853 +2865 @@
 */
 PB_Save_Click: 
+    IF options.!debug == 1 THEN say 'PB_Save_Click() started' 
     if ValueChanged then do
         if CurSection <> "" then do
@@ -2860 +2873 @@
         end
     end
+    IF options.!debug == 1 THEN say 'PB_Save_Click() done' 
 return
 
@@ -2918 +2932 @@
 */
 Quit:
+    IF options.!debug == 1 THEN say "Quit() start" 
+
     if VRGet("Main","WindowState") = "Maximized"|,
        VRGet("Main","WindowState") = "Minimized" then ok = VRMethod("Main", "Restore")
@@ -2931 +2947 @@
     ok = SysFileDelete(smboutput)
 
+    IF options.!debug == 1 THEN say "Quit() done" 
     /* ok = VRRedirectStdio('OFF') */
     window = VRWindow()