--- a/Tools__CodeView2SettingsAppl.st Fri Jan 27 22:18:53 2012 +0100
+++ b/Tools__CodeView2SettingsAppl.st Sun Jan 29 12:53:39 2012 +0000
@@ -16,7 +16,7 @@
AbstractSettingsApplication subclass:#CodeView2SettingsAppl
instanceVariableNames:'useCodeView2InTools useCodeView2InDebugger useCodeView2InBrowser
useCodeView2InToolEnabled useCodeView2InWorkspace
- codeView2AutoIndent codeView2ShowAcceptCancel'
+ codeView2AutoIndent'
classVariableNames:''
poolDictionaries:''
category:'Interface-CodeView'
@@ -38,31 +38,6 @@
"
! !
-!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
@@ -88,7 +63,7 @@
label: 'Code Editor Settings'
name: 'Code Editor Settings'
min: (Point 10 10)
- bounds: (Rectangle 0 0 585 273)
+ bounds: (Rectangle 0 0 576 300)
)
component:
(SpecCollection
@@ -104,70 +79,6 @@
(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
@@ -186,18 +97,11 @@
(SpecCollection
collection: (
(CheckBoxSpec
- label: 'Show Accept/Cancel Buttons in Gutter'
- name: 'CheckBox6'
- model: codeView2ShowAcceptCancel
- translateLabel: true
- extent: (Point 551 25)
- )
- (CheckBoxSpec
- label: 'Auto Indent (experimental, not yet recommended)'
+ label: 'Auto Indent'
name: 'CheckBox5'
model: codeView2AutoIndent
translateLabel: true
- extent: (Point 551 25)
+ extent: (Point 540 22)
)
)
@@ -206,7 +110,75 @@
)
)
- extent: (Point 585 77)
+ extent: (Point 576 59)
+ )
+ (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
)
)
@@ -216,6 +188,7 @@
)
)
+
! !
!CodeView2SettingsAppl methodsFor:'aspects'!
@@ -234,18 +207,6 @@
"Created: / 07-08-2011 / 12:52:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-codeView2ShowAcceptCancel
- "return/create the 'codeView2ShowAcceptCancel' value holder (automatically generated)"
-
- codeView2ShowAcceptCancel isNil ifTrue:[
- codeView2ShowAcceptCancel := ValueHolder new.
- codeView2ShowAcceptCancel onChangeSend:#updateModifiedChannel to:self
- ].
- ^ codeView2ShowAcceptCancel
-
- "Modified: / 10-10-2011 / 16:43:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
useCodeView2InBrowser
"return/create the 'useCodeView2InTools' value holder (automatically generated)"
@@ -308,14 +269,15 @@
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'!
@@ -328,10 +290,9 @@
#useCodeView2InWorkspace
"/Editing support
#codeView2AutoIndent
- #codeView2ShowAcceptCancel
)
- "Modified: / 10-10-2011 / 16:43:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-08-2011 / 12:48:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
basicReadSettings
@@ -360,24 +321,25 @@
!CodeView2SettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- ^ self
+
+ (self
hasChangedAspectIn: self basicAspects
- asComparedTo:currentUserPrefs
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ ^ false.
"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.5 2011-11-25 14:38:55 cg Exp $'
+ ^ '$Id: Tools__CodeView2SettingsAppl.st 7810 2011-08-12 14:54:02Z vranyj1 $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.5 2011-11-25 14:38:55 cg Exp $'
+ ^ '§Header: /cvs/stx/stx/libtool/Tools__CodeView2SettingsAppl.st,v 1.3 2011/08/07 11:59:11 vrany Exp §'
!
version_SVN
- ^ '§Id§'
-! !
+ ^ '$Id: Tools__CodeView2SettingsAppl.st 7810 2011-08-12 14:54:02Z vranyj1 $'
+! !
\ No newline at end of file