Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- WorkspaceApplication jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 13 Aug 2012 23:10:15 +0100
branchjv
changeset 12278 5373ff748c06
parent 12277 46aea706fdb7
child 12279 f3d3b8674a9c
- WorkspaceApplication changed: #setCompilerForSyntaxIn: - Tools::CodeView2SettingsAppl changed: #windowSpec - extensions ...
Make.proto file | annotate | diff | comparison | revisions
Tools__CodeView2SettingsAppl.st file | annotate | diff | comparison | revisions
WorkspaceApplication.st file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libtool.rc file | annotate | diff | comparison | revisions 
--- a/Make.proto	Fri Aug 10 17:54:01 2012 +0100
+++ b/Make.proto	Mon Aug 13 23:10:15 2012 +0100
@@ -247,7 +247,7 @@
 $(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)/stx/libtool/AbstractLauncherApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)/stx/libtool/CodeGeneratorTool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Tools__CodeView2SettingsAppl.st	Fri Aug 10 17:54:01 2012 +0100
+++ b/Tools__CodeView2SettingsAppl.st	Mon Aug 13 23:10:15 2012 +0100
@@ -88,7 +88,7 @@
           label: 'Code Editor Settings'
           name: 'Code Editor Settings'
           min: (Point 10 10)
-          bounds: (Rectangle 0 0 585 273)
+          bounds: (Rectangle 0 0 585 346)
         )
         component: 
        (SpecCollection
@@ -113,7 +113,7 @@
                       collection: (
                        (VerticalPanelViewSpec
                           name: 'ToolSupportCheckBox'
-                          layout: (LayoutFrame 0 0 0 0 0 1 116 0)
+                          layout: (LayoutFrame 0 0 0 0 0 1 0 1)
                           horizontalLayout: fit
                           verticalLayout: top
                           horizontalSpace: 3
@@ -126,11 +126,11 @@
                                 name: 'CheckBox1'
                                 model: useCodeView2InTools
                                 translateLabel: true
-                                extent: (Point 551 25)
+                                extent: (Point 543 25)
                               )
                              (DividerSpec
                                 name: 'Separator1'
-                                extent: (Point 551 4)
+                                extent: (Point 543 4)
                               )
                              (CheckBoxSpec
                                 label: 'Use Advanced Code Editor in Class Browser'
@@ -138,7 +138,7 @@
                                 enableChannel: useCodeView2InToolEnabled
                                 model: useCodeView2InBrowser
                                 translateLabel: true
-                                extent: (Point 551 25)
+                                extent: (Point 543 25)
                               )
                              (CheckBoxSpec
                                 label: 'Use Advanced Code Editor in Debugger (experimental)'
@@ -146,7 +146,7 @@
                                 enableChannel: useCodeView2InToolEnabled
                                 model: useCodeView2InDebugger
                                 translateLabel: true
-                                extent: (Point 551 25)
+                                extent: (Point 543 25)
                               )
                              (CheckBoxSpec
                                 label: 'Use Advanced Code Editor in Workspace'
@@ -154,18 +154,16 @@
                                 enableChannel: useCodeView2InToolEnabled
                                 model: useCodeView2InWorkspace
                                 translateLabel: true
-                                extent: (Point 551 25)
+                                extent: (Point 543 25)
                               )
                              )
                            
                           )
-                          useDynamicPreferredHeight: true
-                          usePreferredHeight: true
                         )
                        )
                      
                     )
-                    extent: (Point 585 143)
+                    extent: (Point 585 175)
                   )
                  (FramedBoxSpec
                     label: 'Edit Support'
@@ -177,7 +175,7 @@
                       collection: (
                        (VerticalPanelViewSpec
                           name: 'VerticalPanel1'
-                          layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                          layout: (LayoutFrame 0 0 0 0 0 1 53 0)
                           horizontalLayout: fit
                           verticalLayout: top
                           horizontalSpace: 3
@@ -190,14 +188,14 @@
                                 name: 'CheckBox6'
                                 model: codeView2ShowAcceptCancel
                                 translateLabel: true
-                                extent: (Point 551 25)
+                                extent: (Point 543 25)
                               )
                              (CheckBoxSpec
                                 label: 'Auto Indent (experimental, not yet recommended)'
                                 name: 'CheckBox5'
                                 model: codeView2AutoIndent
                                 translateLabel: true
-                                extent: (Point 551 25)
+                                extent: (Point 543 25)
                               )
                              )
                            
@@ -206,7 +204,7 @@
                        )
                      
                     )
-                    extent: (Point 585 77)
+                    extent: (Point 585 90)
                   )
                  )
                
@@ -371,7 +369,7 @@
 !CodeView2SettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.5 2011/11/25 14:38:55 cg Exp $'
+    ^ '$Id: Tools__CodeView2SettingsAppl.st 8038 2012-08-13 22:10:15Z vranyj1 $'
 !
 
 version_CVS
@@ -379,5 +377,5 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2SettingsAppl.st 7854 2012-01-30 17:49:41Z vranyj1 $'
+    ^ '$Id: Tools__CodeView2SettingsAppl.st 8038 2012-08-13 22:10:15Z vranyj1 $'
 ! !
--- a/WorkspaceApplication.st	Fri Aug 10 17:54:01 2012 +0100
+++ b/WorkspaceApplication.st	Mon Aug 13 23:10:15 2012 +0100
@@ -2974,20 +2974,21 @@
 !
 
 setCompilerForSyntaxIn:aWorkspace
-    |language|
-
+    | language ws |
+
+    ws := aWorkspace isScrollWrapper ifTrue:[ aWorkspace scrolledView ] ifFalse:[ aWorkspace ].
     language := self syntaxHolder value.
     language isSymbol ifTrue:[
         language := ProgrammingLanguage named:language  
     ].
-    (aWorkspace respondsTo: #compilerClass:) ifTrue:[
-        aWorkspace compilerClass:(language evaluatorClass "self compilerClassForSyntaxName:syntax").
+    (ws respondsTo: #compilerClass:) ifTrue:[
+        ws compilerClass:(language evaluatorClass "self compilerClassForSyntaxName:syntax").
     ].
     self smalltalkMenuEnabledHolder value:(language isSmalltalk).
 
     "Created: / 08-02-2011 / 21:32:39 / cg"
     "Modified: / 26-04-2012 / 12:04:42 / cg"
-    "Modified: / 10-05-2012 / 20:45:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-08-2012 / 23:04:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 spyOnIt
@@ -4050,7 +4051,7 @@
 !WorkspaceApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.225 2012/07/23 21:08:47 cg Exp $'
+    ^ '$Id: WorkspaceApplication.st 8038 2012-08-13 22:10:15Z vranyj1 $'
 !
 
 version_CVS
@@ -4058,5 +4059,5 @@
 !
 
 version_SVN
-    ^ '$Id: WorkspaceApplication.st 8022 2012-07-25 09:51:30Z vranyj1 $'
+    ^ '$Id: WorkspaceApplication.st 8038 2012-08-13 22:10:15Z vranyj1 $'
 ! !
--- a/bc.mak	Fri Aug 10 17:54:01 2012 +0100
+++ b/bc.mak	Mon Aug 13 23:10:15 2012 +0100
@@ -186,7 +186,7 @@
 $(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)\stx\libtool\AbstractLauncherApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libtool.rc	Fri Aug 10 17:54:01 2012 +0100
+++ b/libtool.rc	Mon Aug 13 23:10:15 2012 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libtool.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,8031,8031
+  FILEVERSION     6,2,8035,8035
   PRODUCTVERSION  6,2,2,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Tools (LIB)\0"
-      VALUE "FileVersion", "6.2.8031.8031\0"
+      VALUE "FileVersion", "6.2.8035.8035\0"
       VALUE "InternalName", "stx:libtool\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.2.1\0"
-      VALUE "ProductDate", "Fri, 03 Aug 2012 15:13:44 GMT\0"
+      VALUE "ProductDate", "Mon, 13 Aug 2012 22:15:05 GMT\0"
     END
 
   END
hg/stx-libtool