--- a/AbstractSettingsApplication.st Thu Nov 01 14:55:42 2012 +0100
+++ b/AbstractSettingsApplication.st Thu Nov 01 14:58:54 2012 +0100
@@ -98,7 +98,8 @@
instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
searchDialogIsModal startTextDragWithControl
extendedWordSelectMode whitespaceWordSelectMode
- enforceContentsDropForFiles selectAllWhenClickingBeyondEnd'
+ enforceContentsDropForFiles selectAllWhenClickingBeyondEnd
+ showAcceptCancelBarInBrowser'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -347,7 +348,7 @@
useNewSystemBrowser useNewFileDialog useNewSettingsApplication
useProcessMonitorV2 useSmalltalkDocumentViewer useTestRunner2
showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus
- useNewChangeSetBrowser'
+ useNewChangeSetBrowser useCodeView2InTools'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -3456,6 +3457,13 @@
(SpecCollection
collection: (
(CheckBoxSpec
+ label: 'Show Accept/Cancel Bar in Editor'
+ name: 'ShowAcceptCancelBarInBrowser'
+ model: showAcceptCancelBarInBrowser
+ translateLabel: true
+ extent: (Point 600 23)
+ )
+ (CheckBoxSpec
label: 'CTRL-Key to Start TextDrag'
name: 'CTRLKeyStTextDragCheckBox'
model: startTextDragWithControl
@@ -3566,6 +3574,7 @@
commonAspects
^ #(
+ #showAcceptCancelBarInBrowser
#searchDialogIsModal
#startTextDragWithControl
#st80EditMode
@@ -3613,6 +3622,14 @@
"Created: / 07-03-2012 / 14:34:08 / cg"
!
+showAcceptCancelBarInBrowser
+ showAcceptCancelBarInBrowser isNil ifTrue:[
+ showAcceptCancelBarInBrowser := false asValue.
+ showAcceptCancelBarInBrowser onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ showAcceptCancelBarInBrowser.
+!
+
st80DoubleClickSelectMode
st80DoubleClickSelectMode isNil ifTrue:[
st80DoubleClickSelectMode := true asValue.
@@ -15744,34 +15761,6 @@
(SpecCollection
collection: (
(CheckBoxSpec
- label: 'Show Accept/Cancel Bar in Editor'
- name: 'ShowAcceptCancelBarInBrowser'
- model: showAcceptCancelBarInBrowser
- translateLabel: true
- extent: (Point 579 25)
- )
- (CheckBoxSpec
- label: 'Use the new CodeView2 (experimental)'
- name: 'UserCodeView2'
- model: useCodeView2InTools
- translateLabel: true
- extent: (Point 579 25)
- )
- (CheckBoxSpec
- label: 'Show Search Bar in Browser'
- name: 'ShowSearchBarInBrowser'
- model: useSearchBarInBrowser
- translateLabel: true
- extent: (Point 579 25)
- )
- (CheckBoxSpec
- label: 'Show Method Template'
- name: 'MethodTemplate'
- model: showMethodTemplate
- translateLabel: true
- extent: (Point 579 25)
- )
- (CheckBoxSpec
label: 'Use the Embedded Test Runner'
name: 'UseEmbeddedTestRunner'
model: showEmbeddedTestRunnerInBrowser
@@ -15793,7 +15782,7 @@
extent: (Point 579 25)
)
(CheckBoxSpec
- label: 'Web Browser Like Layout (Toolbars are Part of the Tab - EXPERIMENTAL)'
+ label: 'Web Browser Like Layout (Toolbars are Part of the Tab - experimental)'
name: 'CheckBox1'
initiallyInvisible: true
model: webBrowserLikeLayout
@@ -15808,19 +15797,33 @@
extent: (Point 579 25)
)
(CheckBoxSpec
- label: 'Show Global Navigation History (Global History for all Browser Windows)'
+ label: 'Show Global Navigation History (Global History for all Browsers)'
name: 'CheckBox3'
model: showGlobalHistory
translateLabel: true
extent: (Point 579 25)
)
(CheckBoxSpec
- label: 'Use In-place Search In Browser Lists (experimental)'
+ label: 'Show Search Bar in Browser'
+ name: 'ShowSearchBarInBrowser'
+ model: useSearchBarInBrowser
+ translateLabel: true
+ extent: (Point 579 25)
+ )
+ (CheckBoxSpec
+ label: 'Use in-place Search in Browser Lists (experimental)'
name: 'CheckBox4'
model: useInPlaceSearchInBrowserLists
translateLabel: true
extent: (Point 579 22)
)
+ (CheckBoxSpec
+ label: 'Show Method Template'
+ name: 'MethodTemplate'
+ model: showMethodTemplate
+ translateLabel: true
+ extent: (Point 579 25)
+ )
)
)
@@ -15828,7 +15831,7 @@
)
)
- extent: (Point 607 321)
+ extent: (Point 607 265)
useDynamicPreferredHeight: true
)
(FramedBoxSpec
@@ -15899,10 +15902,10 @@
aspects
^ #(
- showAcceptCancelBarInBrowser
+ "/ showAcceptCancelBarInBrowser
useSearchBarInBrowser
showMethodTemplate
- useCodeView2InTools
+ "/ useCodeView2InTools
showEmbeddedTestRunnerInBrowser
showBookmarkBar
webBrowserLikeLayout
@@ -16627,6 +16630,13 @@
component:
(SpecCollection
collection: (
+ (CheckBoxSpec
+ label: 'Use the new Code Editor 2 (experimental)'
+ name: 'UserCodeView2'
+ model: useCodeView2InTools
+ translateLabel: true
+ extent: (Point 607 25)
+ )
(CheckBoxSpec
label: 'Use the New System Browser'
name: 'NewSystemBrowser'
@@ -16816,6 +16826,7 @@
^ #(
#eclipseStyleMenus
#useTestRunner2
+ #useCodeView2InTools
#useNewInspector
#useNewChangesBrowser
#useNewChangeSetBrowser
@@ -16963,6 +16974,17 @@
^ transcriptBufferSize.
!
+useCodeView2InTools
+ useCodeView2InTools isNil ifTrue:[
+ useCodeView2InTools := ValueHolder new.
+ useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
+
+ ].
+ ^ useCodeView2InTools
+
+ "Modified: / 11-03-2010 / 10:09:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
useNewChangeSetBrowser
useNewChangeSetBrowser isNil ifTrue:[
useNewChangeSetBrowser := false asValue.
@@ -17096,9 +17118,9 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.445 2012-09-26 12:17:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.446 2012-11-01 13:58:54 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.445 2012-09-26 12:17:44 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.446 2012-11-01 13:58:54 cg Exp $'
+! !