Tools__CodeView2SettingsAppl.st
changeset 10902 361a19675c61
parent 10794 854c6d72f257
child 11984 c1a35991c494
child 12123 4bde08cebd48
--- a/Tools__CodeView2SettingsAppl.st	Fri Nov 25 15:25:40 2011 +0100
+++ b/Tools__CodeView2SettingsAppl.st	Fri Nov 25 15:38:55 2011 +0100
@@ -38,6 +38,31 @@
 "
 ! !
 
+!CodeView2SettingsAppl class methodsFor:'image specs'!
+
+defaultIcon
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self defaultIcon inspect
+     ImageEditor openOnClass:self andSelector:#defaultIcon
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'Tools::CodeView2SettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+*****************+.************(.8"H"H"H"J(@**";UUU%UUUU@@^+.;.;-VUUUU@@]:.;.;.5YUUUT@A7**";Y&Y&Y&X@]7^**K-UUVUU@@]7\Z*(
+.5UUYU@@]7\R**"EUUU%T@A7]1J**HY&Y&XC]7\Q&**(!!UUU(3M7\Y&***"EUUU#L3L2QJ***HY&Z#L3L6)D***(!!&Y*L3L6Z$R***"EUUP3M&ZEQJ***HUU
+RRY(UUUD***("*)J*****$R***"J)J******QJ***HUUUZUUUUUD***TQDQDQDQDQDR***************(b') ; colorMapFromArray:#[240 160 80 192 80 0 64 0 0 240 208 160 0 0 0 240 240 240 192 192 192 240 128 0 208 208 208 48 48 48 160 160 160 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@C@@@G??LG??<_??<_??<G??<G??<G??<G??<G??8G??0G??0G??0G??0G??0G??0G??0G??0G??0O??0@@@@') ; yourself); yourself]
+! !
+
 !CodeView2SettingsAppl class methodsFor:'interface specs'!
 
 windowSpec
@@ -63,7 +88,7 @@
           label: 'Code Editor Settings'
           name: 'Code Editor Settings'
           min: (Point 10 10)
-          bounds: (Rectangle 0 0 576 300)
+          bounds: (Rectangle 0 0 585 273)
         )
         component: 
        (SpecCollection
@@ -79,6 +104,70 @@
              (SpecCollection
                 collection: (
                  (FramedBoxSpec
+                    label: 'Tool Support'
+                    name: 'ToolSupport'
+                    labelPosition: topLeft
+                    translateLabel: true
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (VerticalPanelViewSpec
+                          name: 'ToolSupportCheckBox'
+                          layout: (LayoutFrame 0 0 0 0 0 1 116 0)
+                          horizontalLayout: fit
+                          verticalLayout: top
+                          horizontalSpace: 3
+                          verticalSpace: 3
+                          component: 
+                         (SpecCollection
+                            collection: (
+                             (CheckBoxSpec
+                                label: 'Use Advanced Code Editor in All Tools (where supported)'
+                                name: 'CheckBox1'
+                                model: useCodeView2InTools
+                                translateLabel: true
+                                extent: (Point 551 25)
+                              )
+                             (DividerSpec
+                                name: 'Separator1'
+                                extent: (Point 551 4)
+                              )
+                             (CheckBoxSpec
+                                label: 'Use Advanced Code Editor in Class Browser'
+                                name: 'CheckBox2'
+                                enableChannel: useCodeView2InToolEnabled
+                                model: useCodeView2InBrowser
+                                translateLabel: true
+                                extent: (Point 551 25)
+                              )
+                             (CheckBoxSpec
+                                label: 'Use Advanced Code Editor in Debugger (experimental)'
+                                name: 'CheckBox3'
+                                enableChannel: useCodeView2InToolEnabled
+                                model: useCodeView2InDebugger
+                                translateLabel: true
+                                extent: (Point 551 25)
+                              )
+                             (CheckBoxSpec
+                                label: 'Use Advanced Code Editor in Workspace'
+                                name: 'CheckBox4'
+                                enableChannel: useCodeView2InToolEnabled
+                                model: useCodeView2InWorkspace
+                                translateLabel: true
+                                extent: (Point 551 25)
+                              )
+                             )
+                           
+                          )
+                          useDynamicPreferredHeight: true
+                          usePreferredHeight: true
+                        )
+                       )
+                     
+                    )
+                    extent: (Point 585 143)
+                  )
+                 (FramedBoxSpec
                     label: 'Edit Support'
                     name: 'EditSupport'
                     labelPosition: topLeft
@@ -101,14 +190,14 @@
                                 name: 'CheckBox6'
                                 model: codeView2ShowAcceptCancel
                                 translateLabel: true
-                                extent: (Point 540 22)
+                                extent: (Point 551 25)
                               )
                              (CheckBoxSpec
-                                label: 'Auto Indent (EXPERIMENTAL, NOT YET RECCOMENDED)'
+                                label: 'Auto Indent (experimental, not yet recommended)'
                                 name: 'CheckBox5'
                                 model: codeView2AutoIndent
                                 translateLabel: true
-                                extent: (Point 540 22)
+                                extent: (Point 551 25)
                               )
                              )
                            
@@ -117,75 +206,7 @@
                        )
                      
                     )
-                    extent: (Point 576 90)
-                  )
-                 (FramedBoxSpec
-                    label: 'Tool Support'
-                    name: 'ToolSupport'
-                    labelPosition: topLeft
-                    translateLabel: true
-                    component: 
-                   (SpecCollection
-                      collection: (
-                       (VerticalPanelViewSpec
-                          name: 'ToolSupportCheckBox'
-                          layout: (LayoutFrame 0 0 0 0 0 1 104 0)
-                          horizontalLayout: fit
-                          verticalLayout: top
-                          horizontalSpace: 3
-                          verticalSpace: 3
-                          component: 
-                         (SpecCollection
-                            collection: (
-                             (CheckBoxSpec
-                                label: 'Use Advanced Code Editor in All Tools (when supported)'
-                                name: 'CheckBox1'
-                                model: useCodeView2InTools
-                                translateLabel: true
-                                extent: (Point 540 22)
-                              )
-                             (DividerSpec
-                                name: 'Separator1'
-                                extent: (Point 540 4)
-                              )
-                             (CheckBoxSpec
-                                label: 'Use Advanced Code Editor in Class Browser'
-                                name: 'CheckBox2'
-                                enableChannel: useCodeView2InToolEnabled
-                                model: useCodeView2InBrowser
-                                translateLabel: true
-                                extent: (Point 540 22)
-                              )
-                             (CheckBoxSpec
-                                label: 'Use Advanced Code Editor in Debugger (HIGHLY EXPERIMENTAL!!!!!!)'
-                                name: 'CheckBox3'
-                                enableChannel: useCodeView2InToolEnabled
-                                model: useCodeView2InDebugger
-                                translateLabel: true
-                                extent: (Point 540 22)
-                              )
-                             (CheckBoxSpec
-                                label: 'Use Advanced Code Editor in Workspace'
-                                name: 'CheckBox4'
-                                enableChannel: useCodeView2InToolEnabled
-                                model: useCodeView2InWorkspace
-                                translateLabel: true
-                                extent: (Point 540 22)
-                              )
-                             )
-                           
-                          )
-                          useDynamicPreferredHeight: true
-                          usePreferredHeight: true
-                        )
-                       )
-                     
-                    )
-                    extent: (Point 590 154)
-                    useDynamicPreferredHeight: true
-                    useDynamicPreferredWidth: true
-                    usePreferredHeight: true
-                    usePreferredWidth: true
+                    extent: (Point 585 77)
                   )
                  )
                
@@ -195,7 +216,6 @@
          
         )
       )
-
 ! !
 
 !CodeView2SettingsAppl methodsFor:'aspects'!
@@ -288,15 +308,14 @@
 
     useCodeView2InToolEnabled isNil ifTrue:[
         useCodeView2InToolEnabled := 
-            (AspectAdaptor forAspect: #not) subjectChannel:
-                self useCodeView2InTools
-
-
+            (AspectAdaptor forAspect: #not) 
+                subjectChannel: self useCodeView2InTools
     ].
     ^ useCodeView2InToolEnabled
 
     "Modified: / 11-03-2010 / 10:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Created: / 26-07-2011 / 10:39:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 25-11-2011 / 15:11:55 / cg"
 ! !
 
 !CodeView2SettingsAppl methodsFor:'protocol'!
@@ -341,23 +360,22 @@
 !CodeView2SettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
-
-    (self
+    ^ self
         hasChangedAspectIn: self basicAspects
-        asComparedTo:currentUserPrefs) ifTrue:[^ true].
-    ^ false.
+        asComparedTo:currentUserPrefs
 
     "Modified: / 19-07-2011 / 17:12:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 25-11-2011 / 15:25:16 / cg"
 ! !
 
 !CodeView2SettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.4 2011-10-10 15:52:24 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.5 2011-11-25 14:38:55 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.4 2011-10-10 15:52:24 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.5 2011-11-25 14:38:55 cg Exp $'
 !
 
 version_SVN