Changeset 1004

Timestamp:

Jan 9, 2017, 4:52:29 PM (9 years ago)

Author:

Herwig Bauernfeind

Message:

Fix Tickets #285, #286, #287

Location:

trunk/guitools/sscc

Files:

• rc/icons/bww_logo.bmp (added)
• sscc.RC (modified) (1 diff)
• sscc.vrx (modified) (3 diffs)
• sscc.vry (modified) ( previous)

trunk/guitools/sscc/sscc.RC

@@ -1 @@
-icon 1 samba_setup.ico
-bitmap 2 choosedir.bmp
-bitmap 3 choosedird.bmp
-bitmap 4 newitem.bmp
-bitmap 5 newitemd.bmp
-bitmap 7 up.bmp
-bitmap 8 down.bmp
-bitmap 9 bww.bmp
+icon 1 .\rc\icons\samba_setup.ico
+bitmap 2 .\rc\icons\choosedir.bmp
+bitmap 3 .\rc\icons\choosedird.bmp
+bitmap 4 .\rc\icons\newitem.bmp
+bitmap 5 .\rc\icons\newitemd.bmp
+bitmap 7 .\rc\icons\up.bmp
+bitmap 8 .\rc\icons\down.bmp
+bitmap 9 .\rc\icons\bww_logo.bmp

trunk/guitools/sscc/sscc.vrx

@@ -91 +91 @@
 __VXREXX____APPENDS__:
 /*
-#append U:\Develop\Samba\guitools-1.0\shared\inittempdir.vrs
-#append U:\Develop\Samba\guitools-1.0\shared\sambainit.vrs
-#append U:\Develop\Samba\guitools-1.0\shared\swat.vrs
-#append U:\Develop\Samba\trunk\guitools\shared\nlv.vrs
+#append ..\shared\swat.vrs
+#append ..\shared\nlv.vrs
+#append ..\shared\inittempdir.vrs
+#append ..\shared\sambainit.vrs
 */
 return
@@ -1176 +1176 @@
         if pos("idmap uid",smbline) > 0 then iterate
         if pos("idmap gid",smbline) > 0 then iterate
+        if pos("idmap config",smbline) > 0 then iterate
         if pos("winbind separator",smbline) > 0 then iterate
         if pos("copy ",smbline) > 0 then iterate
@@ -2591 +2592 @@
 
     ok = VRSet("PB_Cancel", "Top",    MButton.bTop)
-    ok = VRSet("PB_Cancel", "Left",   MButton.bLeft+3*FWidth+MButton.bWidth*3)
+    ok = VRSet("PB_Cancel", "Left",   VRGet("Main","Width")-MButton.bWidth-FWidth*4)
     ok = VRSet("PB_Cancel", "Width",  MButton.bWidth)