Merge jv
authorMerge Script
Thu, 10 Mar 2016 06:57:38 +0100
branchjv
changeset 16156 9b9fa51009d2
parent 16147 fb39152235e3 (current diff)
parent 16155 2e3a4d0ea38b (diff)
child 16158 327c1ef06be8
Merge
AbstractSettingsApplication.st
CVSSourceCodeManagementSettingsAppl.st
DataBaseSourceCodeManagementSettingsAppl.st
FileBasedSourceCodeManagementSettingsAppl.st
StoreSourceCodeManagementSettingsAppl.st
Tools__CodeView2.st
Tools__MethodCategoryList.st
Tools__MethodList.st
--- a/AbstractSettingsApplication.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/AbstractSettingsApplication.st	Thu Mar 10 06:57:38 2016 +0100
@@ -7937,7 +7937,7 @@
          name: 'Communication Settings'
          flags: 1
          min: (Point 10 10)
-         bounds: (Rectangle 0 0 732 558)
+         bounds: (Rectangle 0 0 738 671)
        )
        component: 
       (SpecCollection
@@ -7990,7 +7990,7 @@
                       )
                     
                    )
-                   extent: (Point 732 65)
+                   extent: (Point 738 67)
                  )
                 (FramedBoxSpec
                    label: 'Window migration'
@@ -8083,7 +8083,7 @@
                       )
                     
                    )
-                   extent: (Point 732 115)
+                   extent: (Point 738 113)
                  )
                 (FramedBoxSpec
                    label: 'Remote Browsing'
@@ -8115,7 +8115,7 @@
                       )
                     
                    )
-                   extent: (Point 732 64)
+                   extent: (Point 738 64)
                  )
                 (FramedBoxSpec
                    label: 'SmallTeam Change Distribution'
@@ -8199,7 +8199,7 @@
                                tabable: true
                                model: addSmallTeamHost
                                enableChannel: addHostEnabled
-                               extent: (Point 224 22)
+                               extent: (Point 221 22)
                              )
                             (ActionButtonSpec
                                label: 'Remove'
@@ -8208,7 +8208,7 @@
                                tabable: true
                                model: removeSmallTeamHost
                                enableChannel: removeHostEnabled
-                               extent: (Point 224 22)
+                               extent: (Point 221 22)
                              )
                             )
                           
@@ -8217,7 +8217,7 @@
                       )
                     
                    )
-                   extent: (Point 732 222)
+                   extent: (Point 738 226)
                  )
                 (FramedBoxSpec
                    label: '.NET Bridge'
@@ -8246,7 +8246,7 @@
                                   (CheckBoxSpec
                                      label: 'Verbose'
                                      name: 'CheckBox5'
-                                     layout: (LayoutFrame 5 0 5 0 600 0 22 0)
+                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
                                      enableChannel: hasDotNetBridge
                                      model: dotNetBridgeVerbose
                                      translateLabel: true
@@ -8254,7 +8254,7 @@
                                   )
                                 
                                )
-                               extent: (Point 696 23)
+                               extent: (Point 696 25)
                              )
                             (ViewSpec
                                name: 'Box7'
@@ -8264,7 +8264,7 @@
                                   (CheckBoxSpec
                                      label: 'Bridge Runs in IDE'
                                      name: 'CheckBox6'
-                                     layout: (LayoutFrame 5 0 3 0 600 0 25 0)
+                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
                                      enableChannel: hasDotNetBridge
                                      model: dotNetBridgeRunsInIDE
                                      translateLabel: true
@@ -8272,7 +8272,7 @@
                                   )
                                 
                                )
-                               extent: (Point 696 22)
+                               extent: (Point 696 25)
                              )
                             )
                           
@@ -8290,7 +8290,7 @@
                       )
                     
                    )
-                   extent: (Point 732 83)
+                   extent: (Point 738 92)
                  )
                 (FramedBoxSpec
                    label: 'Smalltalk Bridge Server'
@@ -8319,7 +8319,7 @@
                                   (CheckBoxSpec
                                      label: 'Bridge Server Enabled'
                                      name: 'CheckBox7'
-                                     layout: (LayoutFrame 5 0 3 0 600 0 25 0)
+                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
                                      model: smalltalkBridgeEnabled
                                      translateLabel: true
                                    )
@@ -8336,7 +8336,7 @@
                                   (CheckBoxSpec
                                      label: 'Verbose'
                                      name: 'CheckBox8'
-                                     layout: (LayoutFrame 5 0 5 0 600 0 22 0)
+                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
                                      enableChannel: hasSmalltalkBridge
                                      model: smalltalkBridgeVerbose
                                      translateLabel: true
@@ -8362,7 +8362,7 @@
                       )
                     
                    )
-                   extent: (Point 732 83)
+                   extent: (Point 738 90)
                  )
                 )
               
@@ -11317,326 +11317,326 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
-	 label: 'RDoIt Server Settings'
-	 name: 'RDoIt Server Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 601 535)
-       )
-       component:
+         label: 'RDoIt Server Settings'
+         name: 'RDoIt Server Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 601 535)
+       )
+       component: 
       (SpecCollection
-	 collection: (
-	  (FramedBoxSpec
-	     label: 'RDoIt'
-	     name: 'RDoItFramedBox'
-	     layout: (LayoutFrame 0 0 0 0 0 1 227 0)
-	     labelPosition: topLeft
-	     translateLabel: true
-	     component:
-	    (SpecCollection
-	       collection: (
-		(VerticalPanelViewSpec
-		   name: 'VerticalPanel2'
-		   layout: (LayoutFrame 0 0.0 5 0.0 0 1.0 0 1.0)
-		   horizontalLayout: fit
-		   verticalLayout: top
-		   horizontalSpace: 0
-		   verticalSpace: 0
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ViewSpec
-			 name: 'Box1'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Remote doits enabled'
-			       name: 'CheckBox1'
-			       layout: (LayoutFrame 0 0 0 0 -5 1 22 0)
-			       enableChannel: hasRDoitServerClass
-			       model: rDoitsEnabled
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 25)
-		       )
-		      (ViewSpec
-			 name: 'Box2'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (LabelSpec
-			       label: 'Port/Path:'
-			       name: 'Label2'
-			       layout: (LayoutFrame 0 0 0 0 150 0 22 0)
-			       translateLabel: true
-			       adjust: right
-			     )
-			    (InputFieldSpec
-			       name: 'EntryField1'
-			       layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
-			       enableChannel: rDoitsEnabled
-			       model: rDoitServerPortOrPath
-			       acceptOnReturn: true
-			       acceptOnTab: true
-			       acceptOnLostFocus: true
-			       acceptOnPointerLeave: true
-			     )
-			    (LabelSpec
-			       label: 'Port# for Tcp Socket; Path for Unix Domain Socket (Unix only).'
-			       name: 'Label3'
-			       layout: (LayoutFrame 150 0 28 0 596 0 50 0)
-			       translateLabel: true
-			       adjust: left
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 60)
-		       )
-		      (ViewSpec
-			 name: 'Box13'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Local Connections Only'
-			       name: 'CheckBox10'
-			       layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
-			       enableChannel: rDoitsEnabled
-			       model: rDoitEnabledOnlyViaLocalConnection
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 25)
-		       )
-		      (ViewSpec
-			 name: 'Box3'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Log errors'
-			       name: 'CheckBox2'
-			       layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
-			       enableChannel: rDoitsEnabled
-			       model: rDoitErrorLogging
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 25)
-		       )
-		      (ViewSpec
-			 name: 'Box4'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Log requests'
-			       name: 'CheckBox3'
-			       layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
-			       enableChannel: rDoitsEnabled
-			       model: rDoitLogging
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 24)
-		       )
-		      (ViewSpec
-			 name: 'Box5'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Debug errors'
-			       name: 'CheckBox4'
-			       layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
-			       enableChannel: rDoitsEnabled
-			       model: rDoitErrorDebugging
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 23)
-		       )
-		      )
-
-		   )
-		 )
-		)
-
-	     )
-	   )
-	  (FramedBoxSpec
-	     label: 'JavaScript-Scripting via Telnet'
-	     name: 'ScriptingFramedBox'
-	     layout: (LayoutFrame 0 0 224 0 0 1 460 0)
-	     labelPosition: topLeft
-	     translateLabel: true
-	     component:
-	    (SpecCollection
-	       collection: (
-		(VerticalPanelViewSpec
-		   name: 'VerticalPanel3'
-		   layout: (LayoutFrame 0 0.0 5 0.0 0 1.0 0 1.0)
-		   horizontalLayout: fit
-		   verticalLayout: top
-		   horizontalSpace: 0
-		   verticalSpace: 0
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ViewSpec
-			 name: 'Box6'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'JavaScript-Scripting enabled'
-			       name: 'CheckBox5'
-			       layout: (LayoutFrame 0 0 0 0 -5 1 22 0)
-			       enableChannel: hasScriptingServerClass
-			       model: scriptingEnabled
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 25)
-		       )
-		      (ViewSpec
-			 name: 'Box12'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (LabelSpec
-			       label: 'Port:'
-			       name: 'Label4'
-			       layout: (LayoutFrame 0 0 0 0 150 0 22 0)
-			       translateLabel: true
-			       adjust: right
-			     )
-			    (InputFieldSpec
-			       name: 'EntryField2'
-			       layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
-			       enableChannel: rDoitsEnabled
-			       model: scriptingServerPortOrPath
-			       isReadOnly: true
-			       acceptOnReturn: true
-			       acceptOnTab: true
-			       acceptOnLostFocus: true
-			       acceptOnPointerLeave: true
-			     )
-			    (LabelSpec
-			       label: 'Port# for Tcp Socket; Path for Unix Domain Socket (Unix only).'
-			       name: 'Label5'
-			       layout: (LayoutFrame 150 0 28 0 596 0 50 0)
-			       initiallyInvisible: true
-			       translateLabel: true
-			       adjust: left
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 60)
-		       )
-		      (ViewSpec
-			 name: 'Box11'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Local Connections Only'
-			       name: 'CheckBox9'
-			       layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
-			       enableChannel: scriptingEnabled
-			       model: scriptingEnabledOnlyViaLocalConnection
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 25)
-		       )
-		      (ViewSpec
-			 name: 'Box8'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Log errors'
-			       name: 'CheckBox6'
-			       layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
-			       enableChannel: scriptingEnabled
-			       model: scriptingErrorLogging
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 25)
-		       )
-		      (ViewSpec
-			 name: 'Box9'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Log requests'
-			       name: 'CheckBox7'
-			       layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
-			       enableChannel: scriptingEnabled
-			       model: scriptingLogging
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 24)
-		       )
-		      (ViewSpec
-			 name: 'Box10'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Debug errors'
-			       name: 'CheckBox8'
-			       layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
-			       enableChannel: scriptingEnabled
-			       model: scriptingErrorDebugging
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 567 23)
-		       )
-		      )
-
-		   )
-		 )
-		)
-
-	     )
-	   )
-	  )
-
+         collection: (
+          (FramedBoxSpec
+             label: 'RDoIt'
+             name: 'RDoItFramedBox'
+             layout: (LayoutFrame 0 0 0 0 0 1 232 0)
+             labelPosition: topLeft
+             translateLabel: true
+             component: 
+            (SpecCollection
+               collection: (
+                (VerticalPanelViewSpec
+                   name: 'VerticalPanel2'
+                   layout: (LayoutFrame 0 0.0 5 0.0 0 1.0 0 1.0)
+                   horizontalLayout: fit
+                   verticalLayout: top
+                   horizontalSpace: 0
+                   verticalSpace: 0
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'Box1'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Remote doits enabled'
+                               name: 'CheckBox1'
+                               layout: (LayoutFrame 0 0 0 0 -5 1 22 0)
+                               enableChannel: hasRDoitServerClass
+                               model: rDoitsEnabled
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 25)
+                       )
+                      (ViewSpec
+                         name: 'Box2'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (LabelSpec
+                               label: 'Port/Path:'
+                               name: 'Label2'
+                               layout: (LayoutFrame 0 0 0 0 150 0 22 0)
+                               translateLabel: true
+                               adjust: right
+                             )
+                            (InputFieldSpec
+                               name: 'EntryField1'
+                               layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
+                               enableChannel: rDoitsEnabled
+                               model: rDoitServerPortOrPath
+                               acceptOnReturn: true
+                               acceptOnTab: true
+                               acceptOnLostFocus: true
+                               acceptOnPointerLeave: true
+                             )
+                            (LabelSpec
+                               label: 'Port# for Tcp Socket; Path for Unix Domain Socket (Unix only).'
+                               name: 'Label3'
+                               layout: (LayoutFrame 150 0 28 0 596 0 50 0)
+                               translateLabel: true
+                               adjust: left
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 60)
+                       )
+                      (ViewSpec
+                         name: 'Box13'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Local Connections Only'
+                               name: 'CheckBox10'
+                               layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
+                               enableChannel: rDoitsEnabled
+                               model: rDoitEnabledOnlyViaLocalConnection
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 25)
+                       )
+                      (ViewSpec
+                         name: 'Box3'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Log errors'
+                               name: 'CheckBox2'
+                               layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+                               enableChannel: rDoitsEnabled
+                               model: rDoitErrorLogging
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 25)
+                       )
+                      (ViewSpec
+                         name: 'Box4'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Log requests'
+                               name: 'CheckBox3'
+                               layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+                               enableChannel: rDoitsEnabled
+                               model: rDoitLogging
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 24)
+                       )
+                      (ViewSpec
+                         name: 'Box5'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Debug errors'
+                               name: 'CheckBox4'
+                               layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+                               enableChannel: rDoitsEnabled
+                               model: rDoitErrorDebugging
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 23)
+                       )
+                      )
+                    
+                   )
+                 )
+                )
+              
+             )
+           )
+          (FramedBoxSpec
+             label: 'JavaScript-Scripting via Telnet'
+             name: 'ScriptingFramedBox'
+             layout: (LayoutFrame 0 0 224 0 0 1 460 0)
+             labelPosition: topLeft
+             translateLabel: true
+             component: 
+            (SpecCollection
+               collection: (
+                (VerticalPanelViewSpec
+                   name: 'VerticalPanel3'
+                   layout: (LayoutFrame 0 0.0 5 0.0 0 1.0 0 1.0)
+                   horizontalLayout: fit
+                   verticalLayout: top
+                   horizontalSpace: 0
+                   verticalSpace: 0
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'Box6'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'JavaScript-Scripting enabled'
+                               name: 'CheckBox5'
+                               layout: (LayoutFrame 0 0 0 0 -5 1 22 0)
+                               enableChannel: hasScriptingServerClass
+                               model: scriptingEnabled
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 25)
+                       )
+                      (ViewSpec
+                         name: 'Box12'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (LabelSpec
+                               label: 'Port:'
+                               name: 'Label4'
+                               layout: (LayoutFrame 0 0 0 0 150 0 22 0)
+                               translateLabel: true
+                               adjust: right
+                             )
+                            (InputFieldSpec
+                               name: 'EntryField2'
+                               layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
+                               enableChannel: rDoitsEnabled
+                               model: scriptingServerPortOrPath
+                               isReadOnly: true
+                               acceptOnReturn: true
+                               acceptOnTab: true
+                               acceptOnLostFocus: true
+                               acceptOnPointerLeave: true
+                             )
+                            (LabelSpec
+                               label: 'Port# for Tcp Socket; Path for Unix Domain Socket (Unix only).'
+                               name: 'Label5'
+                               layout: (LayoutFrame 150 0 28 0 596 0 50 0)
+                               initiallyInvisible: true
+                               translateLabel: true
+                               adjust: left
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 60)
+                       )
+                      (ViewSpec
+                         name: 'Box11'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Local Connections Only'
+                               name: 'CheckBox9'
+                               layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
+                               enableChannel: scriptingEnabled
+                               model: scriptingEnabledOnlyViaLocalConnection
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 25)
+                       )
+                      (ViewSpec
+                         name: 'Box8'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Log errors'
+                               name: 'CheckBox6'
+                               layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+                               enableChannel: scriptingEnabled
+                               model: scriptingErrorLogging
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 25)
+                       )
+                      (ViewSpec
+                         name: 'Box9'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Log requests'
+                               name: 'CheckBox7'
+                               layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+                               enableChannel: scriptingEnabled
+                               model: scriptingLogging
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 24)
+                       )
+                      (ViewSpec
+                         name: 'Box10'
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Debug errors'
+                               name: 'CheckBox8'
+                               layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+                               enableChannel: scriptingEnabled
+                               model: scriptingErrorDebugging
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                         extent: (Point 555 23)
+                       )
+                      )
+                    
+                   )
+                 )
+                )
+              
+             )
+           )
+          )
+        
        )
      )
 ! !
--- a/CVSSourceCodeManagementSettingsAppl.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/CVSSourceCodeManagementSettingsAppl.st	Thu Mar 10 06:57:38 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractSourceCodeManagementSettingsAppl subclass:#CVSSourceCodeManagementSettingsAppl
 	instanceVariableNames:'repositoryHolder manager repository cvsRootPrototypeList
 		addPerModuleRoot perModuleRootModule removePerModuleRoot
@@ -385,7 +387,7 @@
                             (ActionButtonSpec
                                label: 'CVS-Login'
                                name: 'Button1'
-                               layout: (LayoutFrame -117 1 138 0 0 1 168 0)
+                               layout: (LayoutFrame -117 1 137 0 0 1 167 0)
                                activeHelpKey: cvsLogin
                                translateLabel: true
                                tabable: true
@@ -455,9 +457,9 @@
                              )
                             (HorizontalPanelViewSpec
                                name: 'HorizontalPanel2'
-                               layout: (LayoutFrame 0 0 369 0 -1 1 399 0)
+                               layout: (LayoutFrame 0 0 369 0 -1 1 400 0)
                                horizontalLayout: rightSpaceMax
-                               verticalLayout: center
+                               verticalLayout: fit
                                horizontalSpace: 3
                                verticalSpace: 3
                                component: 
@@ -468,6 +470,7 @@
                                      name: 'addButton'
                                      activeHelpKey: addPerModuleRoot
                                      translateLabel: true
+                                     resizeForLabel: true
                                      tabable: true
                                      model: addPerModuleRoot
                                      useDefaultExtent: true
@@ -477,20 +480,18 @@
                                      name: 'removeButton'
                                      activeHelpKey: removePerModuleRoot
                                      translateLabel: true
+                                     resizeForLabel: true
                                      tabable: true
                                      model: removePerModuleRoot
                                      enableChannel: removeEnabled
                                      useDefaultExtent: true
                                    )
-                                  (ViewSpec
-                                     name: 'Box11'
-                                     extent: (Point 93 10)
-                                   )
                                   (ActionButtonSpec
                                      label: 'Init'
                                      name: 'loginButton2'
                                      activeHelpKey: initPerModuleRoot
                                      translateLabel: true
+                                     resizeForLabel: true
                                      tabable: true
                                      model: initPerModuleRoot
                                      enableChannel: cvsInitInModuleEnabled
@@ -501,6 +502,7 @@
                                      name: 'Button3'
                                      activeHelpKey: loginPerModuleRoot
                                      translateLabel: true
+                                     resizeForLabel: true
                                      tabable: true
                                      model: loginPerModuleRoot
                                      enableChannel: cvsLoginInModuleEnabled
@@ -512,7 +514,7 @@
                              )
                             (HorizontalPanelViewSpec
                                name: 'HorizontalPanel3'
-                               layout: (LayoutFrame 64 0.25 403 0 -1 1 433 0)
+                               layout: (LayoutFrame 64 0.25 403 0 -1 1 434 0)
                                horizontalLayout: right
                                verticalLayout: center
                                horizontalSpace: 3
@@ -529,10 +531,10 @@
                                      adjust: right
                                      tabable: true
                                      model: addPublicExeptRepository
-                                     extent: (Point 187 22)
-                                     usePreferredHeight: true
+                                     extent: (Point 232 31)
                                      usePreferredWidth: true
                                      useDynamicPreferredHeight: true
+                                     usePreferredHeight: true
                                    )
                                   )
                                 
@@ -558,7 +560,7 @@
                      collection: (
                       (ViewSpec
                          name: 'SourceCacheDirBox'
-                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+                         layout: (LayoutFrame 0 0 0 0 -1 1 30 0)
                          component: 
                         (SpecCollection
                            collection: (
@@ -571,7 +573,7 @@
                              )
                             (InputFieldSpec
                                name: 'SourceCacheDirEntryField'
-                               layout: (LayoutFrame 64 0.25 0 0 0 1 30 0)
+                               layout: (LayoutFrame 64 0.25 0 0 -1 1 30 0)
                                model: sourceCacheDir
                                immediateAccept: false
                                acceptOnReturn: true
@@ -585,8 +587,8 @@
                        )
                       (HorizontalPanelViewSpec
                          name: 'CacheActionsHorizontalPanel'
-                         layout: (LayoutFrame 44 0.25 33 0 0 1 63 0)
-                         horizontalLayout: fitSpace
+                         layout: (LayoutFrame 44 0.25 33 0 -1 1 63 0)
+                         horizontalLayout: rightMax
                          verticalLayout: center
                          horizontalSpace: 3
                          verticalSpace: 3
@@ -599,7 +601,7 @@
                                translateLabel: true
                                tabable: true
                                model: flushSourceCache
-                               extent: (Point 247 30)
+                               extent: (Point 245 30)
                              )
                             (ActionButtonSpec
                                label: 'Condense Cache now'
@@ -607,7 +609,7 @@
                                translateLabel: true
                                tabable: true
                                model: condenseSourceCache
-                               extent: (Point 248 30)
+                               extent: (Point 245 30)
                              )
                             )
                           
@@ -1158,10 +1160,10 @@
 !CVSSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/CVSSourceCodeManagementSettingsAppl.st,v 1.40 2014-05-23 08:27:52 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/CVSSourceCodeManagementSettingsAppl.st,v 1.40 2014-05-23 08:27:52 stefan Exp $'
+    ^ '$Header$'
 ! !
 
--- a/DataBaseSourceCodeManagementSettingsAppl.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/DataBaseSourceCodeManagementSettingsAppl.st	Thu Mar 10 06:57:38 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractSourceCodeManagementSettingsAppl subclass:#DataBaseSourceCodeManagementSettingsAppl
 	instanceVariableNames:'pathPerModule dbNameHolder selectedPerModuleDatabase
 		perModuleDatabaseModule perModuleDB dbPerModule'
@@ -156,8 +158,8 @@
                 (LabelSpec
                    label: 'Demo Only'
                    name: 'Label10'
-                   style: (FontDescription #'Segoe UI' medium roman 16 #'ms-default')
-                   foregroundColor: (Color 86.9993133440147 0.0 0.0)
+                   style: (FontDescription #'Segoe UI' medium roman 16 #'ms-default' nil nil)
+                   foregroundColor: (Color 87.0 0.0 0.0)
                    translateLabel: true
                    extent: (Point 724 37)
                  )
@@ -289,7 +291,7 @@
                                translateLabel: true
                                tabable: true
                                model: addPerModuleDB
-                               extent: (Point 147 30)
+                               extent: (Point 143 30)
                              )
                             (ActionButtonSpec
                                label: 'Remove'
@@ -298,11 +300,11 @@
                                tabable: true
                                model: removePerModuleDB
                                enableChannel: removeEnabled
-                               extent: (Point 147 30)
+                               extent: (Point 143 30)
                              )
                             (ViewSpec
                                name: 'Box11'
-                               extent: (Point 147 10)
+                               extent: (Point 144 10)
                              )
                             )
                           
@@ -311,7 +313,7 @@
                       )
                     
                    )
-                   extent: (Point 724 342)
+                   extent: (Point 724 346)
                  )
                 )
               
@@ -728,10 +730,10 @@
 !DataBaseSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DataBaseSourceCodeManagementSettingsAppl.st,v 1.21 2014-07-21 11:27:51 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DataBaseSourceCodeManagementSettingsAppl.st,v 1.21 2014-07-21 11:27:51 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/FileBasedSourceCodeManagementSettingsAppl.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/FileBasedSourceCodeManagementSettingsAppl.st	Thu Mar 10 06:57:38 2016 +0100
@@ -219,8 +219,8 @@
                 (LabelSpec
                    label: 'Demo Only'
                    name: 'Label10'
-                   style: (FontDescription #'Segoe UI' medium roman 16 #'ms-default')
-                   foregroundColor: (Color 86.9993133440147 0.0 0.0)
+                   style: (FontDescription #'Segoe UI' medium roman 16 #'ms-default' nil nil)
+                   foregroundColor: (Color 87.0 0.0 0.0)
                    translateLabel: true
                    extent: (Point 694 37)
                  )
@@ -345,7 +345,7 @@
                                translateLabel: true
                                tabable: true
                                model: addPerModulePath
-                               extent: (Point 139 30)
+                               extent: (Point 135 30)
                              )
                             (ActionButtonSpec
                                label: 'Remove'
@@ -354,11 +354,11 @@
                                tabable: true
                                model: removePerModulePath
                                enableChannel: removeEnabled
-                               extent: (Point 139 30)
+                               extent: (Point 135 30)
                              )
                             (ViewSpec
                                name: 'Box11'
-                               extent: (Point 140 10)
+                               extent: (Point 137 10)
                              )
                             )
                           
@@ -367,7 +367,7 @@
                       )
                     
                    )
-                   extent: (Point 694 337)
+                   extent: (Point 694 342)
                  )
                 )
               
--- a/StoreSourceCodeManagementSettingsAppl.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/StoreSourceCodeManagementSettingsAppl.st	Thu Mar 10 06:57:38 2016 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractSourceCodeManagementSettingsAppl subclass:#StoreSourceCodeManagementSettingsAppl
 	instanceVariableNames:'useManager repositoryHolder manager addPerModuleRoot
 		perModuleRootModule perModuleRoot selectedPerModuleRoot
@@ -138,8 +140,8 @@
                 (LabelSpec
                    label: 'Experimental (Only for Transport)'
                    name: 'Label10'
-                   style: (FontDescription #'Segoe UI' medium roman 16 #'ms-default')
-                   foregroundColor: (Color 86.9993133440147 0.0 0.0)
+                   style: (FontDescription #'Segoe UI' medium roman 16 #'ms-default' nil nil)
+                   foregroundColor: (Color 87.0 0.0 0.0)
                    translateLabel: true
                    extent: (Point 670 37)
                  )
@@ -270,7 +272,7 @@
                                tabable: true
                                model: storeConnect
                                enableChannel: storeConnectEnabled
-                               extent: (Point 124 22)
+                               extent: (Point 122 22)
                              )
                             )
                           
@@ -331,7 +333,7 @@
                        )
                       (InputFieldSpec
                          name: 'perModuleUserEntryField'
-                         layout: (LayoutFrame 44 0.25 272 0 -2 0.65 294 0)
+                         layout: (LayoutFrame 44 0.25 272 0 -2 0.65000000000000013 294 0)
                          tabable: true
                          model: perStoreModuleUsernameHolder
                          acceptChannel: acceptChannel
@@ -339,7 +341,7 @@
                        )
                       (InputFieldSpec
                          name: 'perModulePasswordEntryField'
-                         layout: (LayoutFrame 5 0.65 272 0 0 1 294 0)
+                         layout: (LayoutFrame 5 0.65000000000000013 272 0 0 1 294 0)
                          tabable: true
                          model: perStoreModulePasswordHolder
                          type: password
@@ -348,7 +350,7 @@
                        )
                       (HorizontalPanelViewSpec
                          name: 'HorizontalPanel5'
-                         layout: (LayoutFrame 44 0.25 295 0 -10 0.65 326 0)
+                         layout: (LayoutFrame 44 0.25 298 0 -5 0.65000000000000013 329 0)
                          horizontalLayout: fit
                          verticalLayout: center
                          horizontalSpace: 3
@@ -360,9 +362,10 @@
                                label: 'Add/Apply'
                                name: 'AddButton2'
                                translateLabel: true
+                               resizeForLabel: true
                                tabable: true
                                model: addPerStoreModuleDB
-                               extent: (Point 98 22)
+                               extent: (Point 97 27)
                              )
                             (ActionButtonSpec
                                label: 'Remove'
@@ -371,7 +374,7 @@
                                tabable: true
                                model: removePerStoreModuleDB
                                enableChannel: removeEnabled
-                               extent: (Point 99 22)
+                               extent: (Point 98 27)
                              )
                             )
                           
@@ -379,7 +382,7 @@
                        )
                       (HorizontalPanelViewSpec
                          name: 'HorizontalPanel6'
-                         layout: (LayoutFrame 10 0.65 295 0 0 1 326 0)
+                         layout: (LayoutFrame 5 0.65000000000000013 298 0 0 1 329 0)
                          horizontalLayout: fit
                          verticalLayout: center
                          horizontalSpace: 3
@@ -388,13 +391,13 @@
                         (SpecCollection
                            collection: (
                             (ActionButtonSpec
-                               label: 'Try to Connect'
+                               label: 'Try Connect'
                                name: 'ConnectPerStoreModuleButton'
                                translateLabel: true
                                tabable: true
                                model: connectPerStoreModuleDB
                                enableChannel: storeConnectInModuleEnabled
-                               extent: (Point 105 22)
+                               extent: (Point 103 27)
                              )
                             (ActionButtonSpec
                                label: 'Browse'
@@ -403,7 +406,7 @@
                                tabable: true
                                model: browsePerStoreModuleDB
                                enableChannel: storeConnectInModuleEnabled
-                               extent: (Point 105 22)
+                               extent: (Point 104 27)
                              )
                             )
                           
@@ -412,7 +415,7 @@
                       )
                     
                    )
-                   extent: (Point 670 360)
+                   extent: (Point 670 365)
                  )
                 (FramedBoxSpec
                    label: 'Source Cache'
@@ -468,7 +471,7 @@
                                tabable: true
                                model: flushSourceCache
                                enableChannel: useManager
-                               extent: (Point 212 22)
+                               extent: (Point 206 22)
                              )
                             (ActionButtonSpec
                                label: 'Condense Cache now'
@@ -477,7 +480,7 @@
                                tabable: true
                                model: condenseSourceCache
                                enableChannel: useManager
-                               extent: (Point 212 22)
+                               extent: (Point 206 22)
                              )
                             )
                           
@@ -1152,14 +1155,14 @@
 !StoreSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/StoreSourceCodeManagementSettingsAppl.st,v 1.23 2014-05-23 08:27:56 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/StoreSourceCodeManagementSettingsAppl.st,v 1.23 2014-05-23 08:27:56 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: StoreSourceCodeManagementSettingsAppl.st,v 1.23 2014-05-23 08:27:56 stefan Exp $'
+    ^ '$Id$'
 ! !
 
--- a/Tools__CodeView2.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/Tools__CodeView2.st	Thu Mar 10 06:57:38 2016 +0100
@@ -3586,12 +3586,15 @@
                     ^  self
                 ].
             ] ifFalse:[
-                (ln copyFrom:prevTab+1 to:cursorCol-1) isBlank ifTrue:[
-                    self deleteFromLine:cursorLine col:prevTab toLine:cursorLine col:cursorCol-1.
-                    self cursorLine:cursorLine col:prevTab.
-                    wasOn ifTrue:[ self showCursor ].
-                    ^  self.
-                ]
+                "/ cg: this is ugly behavior; deleting multiple chars at the beginning
+                "/ is annoying.
+                "/ therefore, only do it, if there are only blanks after the cursor
+"/                (ln copyFrom:prevTab+1 to:((cursorCol-1) min:ln size)) isBlank ifTrue:[
+"/                    self deleteFromLine:cursorLine col:prevTab toLine:cursorLine col:cursorCol-1.
+"/                    self cursorLine:cursorLine col:prevTab.
+"/                    wasOn ifTrue:[ self showCursor ].
+"/                    ^  self.
+"/                ]
             ]
         ].
     ].
--- a/Tools__MethodCategoryList.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/Tools__MethodCategoryList.st	Thu Mar 10 06:57:38 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 by eXept Software AG
               All Rights Reserved
@@ -1180,15 +1182,15 @@
 !
 
 class:cls protocol:cat includesRefsToVariable:variablesToHighLight askParserWith:querySelector
-    "are there any methods in the protocol cat which reference/modify any inst/class variable in variablesToHighLight ?"
+    "Are there any methods in the protocol cat which reference/modify any inst/class variable in variablesToHighLight?"
 
-    |anyVarNameAccessable|
+    |anyVarNameAccessible|
 
-    anyVarNameAccessable := cls allInstVarNames includesAny:variablesToHighLight.
-    anyVarNameAccessable ifFalse:[
-        anyVarNameAccessable := cls theNonMetaclass allClassVarNames includesAny:variablesToHighLight.
+    anyVarNameAccessible := cls allInstVarNames includesAny:variablesToHighLight.
+    anyVarNameAccessible ifFalse:[
+        anyVarNameAccessible := cls theNonMetaclass allClassVarNames includesAny:variablesToHighLight.
     ].
-    anyVarNameAccessable ifFalse:[
+    anyVarNameAccessible ifFalse:[
         "/ no need to parse
         ^ false
     ].
--- a/Tools__MethodList.st	Wed Mar 09 06:56:29 2016 +0100
+++ b/Tools__MethodList.st	Thu Mar 10 06:57:38 2016 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 by eXept Software AG
 	      All Rights Reserved
@@ -1348,16 +1350,16 @@
 !
 
 method:mthd includesRefsToVariable:variablesToHighLight askParserWith:querySelector
-    |cls src parser usedVars anyVarNameAccessable|
+    |cls src parser usedVars anyVarNameAccessible|
 
     cls := mthd mclass.
     cls isNil ifTrue:[^ false].
 
-    anyVarNameAccessable := cls allInstVarNames includesAny:variablesToHighLight.
-    anyVarNameAccessable ifFalse:[
-        anyVarNameAccessable := cls theNonMetaclass allClassVarNames includesAny:variablesToHighLight.
+    anyVarNameAccessible := cls allInstVarNames includesAny:variablesToHighLight.
+    anyVarNameAccessible ifFalse:[
+        anyVarNameAccessible := cls theNonMetaclass allClassVarNames includesAny:variablesToHighLight.
     ].
-    anyVarNameAccessable ifFalse:[
+    anyVarNameAccessible ifFalse:[
         "/ no need to parse
         ^ false
     ].