--- a/AbstractSettingsApplication.st Fri Nov 25 14:49:15 2011 +0100
+++ b/AbstractSettingsApplication.st Fri Nov 25 15:25:37 2011 +0100
@@ -2282,10 +2282,11 @@
!AbstractSettingsApplication::CodeGeneratorSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- (self
+ ^ self
hasChangedAspectIn:(self aspectSelectors)
- asComparedTo:currentUserPrefs) ifTrue:[^ true].
- ^ false.
+ asComparedTo:currentUserPrefs
+
+ "Modified: / 25-11-2011 / 15:22:51 / cg"
! !
!AbstractSettingsApplication::CommunicationLoggingSettingsAppl class methodsFor:'image specs'!
@@ -3491,11 +3492,11 @@
ifFalse:[ListView tab8Positions]) ifTrue:[^ true].
].
- (self
+ ^ self
hasChangedAspectIn:self commonAspects
- asComparedTo:currentUserPrefs) ifTrue:[^ true].
-
- ^ false
+ asComparedTo:currentUserPrefs
+
+ "Modified: / 25-11-2011 / 15:23:02 / cg"
! !
!AbstractSettingsApplication::FontSettingsAppl class methodsFor:'defaults'!
@@ -15152,49 +15153,49 @@
name: 'ShowAcceptCancelBarInBrowser'
model: showAcceptCancelBarInBrowser
translateLabel: true
- extent: (Point 571 25)
+ extent: (Point 573 25)
+ )
+ (CheckBoxSpec
+ label: 'Use the new CodeView2 (experimental)'
+ name: 'UserCodeView2'
+ model: useCodeView2InTools
+ translateLabel: true
+ extent: (Point 573 25)
)
(CheckBoxSpec
label: 'Show Search Bar in Browser'
name: 'ShowSearchBarInBrowser'
model: useSearchBarInBrowser
translateLabel: true
- extent: (Point 571 25)
+ extent: (Point 573 25)
)
(CheckBoxSpec
label: 'Show Method Template'
name: 'MethodTemplate'
model: showMethodTemplate
translateLabel: true
- extent: (Point 571 25)
- )
- (CheckBoxSpec
- label: 'Use the new CodeView2 (EXPERIMENTAL)'
- name: 'UserCodeView2'
- model: useCodeView2InTools
- translateLabel: true
- extent: (Point 571 25)
+ extent: (Point 573 25)
)
(CheckBoxSpec
label: 'Use the Embedded Test Runner'
name: 'UseEmbeddedTestRunner'
model: showEmbeddedTestRunnerInBrowser
translateLabel: true
- extent: (Point 571 25)
+ extent: (Point 573 25)
)
(CheckBoxSpec
label: 'Show Bookmarks Bar'
name: 'ShowBookmarksBar'
model: showBookmarkBar
translateLabel: true
- extent: (Point 571 25)
+ extent: (Point 573 25)
)
(CheckBoxSpec
label: 'Sort and Indent Classes by Inheritance'
name: 'SortAndIndentClassesByInheritance'
model: sortAndIndentClassesByInheritance
translateLabel: true
- extent: (Point 571 25)
+ extent: (Point 573 25)
)
(CheckBoxSpec
label: 'Web Browser Like Layout (Toolbars are Part of the Tab - EXPERIMENTAL)'
@@ -15209,21 +15210,21 @@
name: 'CheckBox2'
model: showLocalHistory
translateLabel: true
- extent: (Point 571 25)
- )
- (CheckBoxSpec
- label: 'Show Global Navigation History (One Global History Among All Browser Windows)'
+ extent: (Point 573 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Global Navigation History (Global History for all Browser Windows)'
name: 'CheckBox3'
model: showGlobalHistory
translateLabel: true
- extent: (Point 571 25)
- )
- (CheckBoxSpec
- label: 'Use In-place Search In Browser Lists (EXPERIMENTAL)'
+ extent: (Point 573 25)
+ )
+ (CheckBoxSpec
+ label: 'Use In-place Search In Browser Lists (experimental)'
name: 'CheckBox4'
model: useInPlaceSearchInBrowserLists
translateLabel: true
- extent: (Point 571 22)
+ extent: (Point 573 22)
)
)
@@ -15232,7 +15233,7 @@
)
)
- extent: (Point 607 300)
+ extent: (Point 607 321)
useDynamicPreferredHeight: true
)
(FramedBoxSpec
@@ -15258,25 +15259,7 @@
name: 'SCMMenuLayoutLabel'
translateLabel: true
adjust: left
- extent: (Point 571 22)
- )
- (RadioButtonSpec
- label: 'Compact (EXPERIMENTAL)'
- name: 'SCMMenuLayoutCompact'
- translateLabel: true
- model: sourceCodeManagementMenuLayout
- isTriggerOnDown: true
- select: 'compact'
- extent: (Point 571 22)
- )
- (RadioButtonSpec
- label: 'Inline (EXPERIMENTAL)'
- name: 'SCMMenuLayoutInline'
- translateLabel: true
- model: sourceCodeManagementMenuLayout
- isTriggerOnDown: true
- select: 'inline'
- extent: (Point 571 22)
+ extent: (Point 573 22)
)
(RadioButtonSpec
label: 'Old (default)'
@@ -15285,7 +15268,25 @@
model: sourceCodeManagementMenuLayout
isTriggerOnDown: true
select: 'old'
- extent: (Point 571 22)
+ extent: (Point 573 22)
+ )
+ (RadioButtonSpec
+ label: 'Inline (experimental)'
+ name: 'SCMMenuLayoutInline'
+ translateLabel: true
+ model: sourceCodeManagementMenuLayout
+ isTriggerOnDown: true
+ select: 'inline'
+ extent: (Point 573 22)
+ )
+ (RadioButtonSpec
+ label: 'Compact (experimental)'
+ name: 'SCMMenuLayoutCompact'
+ translateLabel: true
+ model: sourceCodeManagementMenuLayout
+ isTriggerOnDown: true
+ select: 'compact'
+ extent: (Point 573 22)
)
)
@@ -15308,49 +15309,41 @@
!AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'actions'!
+aspects
+ ^ #(
+ showAcceptCancelBarInBrowser
+ useSearchBarInBrowser
+ showMethodTemplate
+ useCodeView2InTools
+ showEmbeddedTestRunnerInBrowser
+ showBookmarkBar
+ webBrowserLikeLayout
+ sortAndIndentClassesByInheritance
+ showGlobalHistory
+ showLocalHistory
+ useInPlaceSearchInBrowserLists
+ sourceCodeManagementMenuLayout
+ )
+
+ "Created: / 25-11-2011 / 15:09:28 / cg"
+!
+
basicReadSettings
self
- readAspects:
- #(
- showAcceptCancelBarInBrowser
- useSearchBarInBrowser
- showMethodTemplate
- useCodeView2InTools
- showEmbeddedTestRunnerInBrowser
- showBookmarkBar
- webBrowserLikeLayout
- sortAndIndentClassesByInheritance
- showGlobalHistory
- showLocalHistory
- useInPlaceSearchInBrowserLists
- sourceCodeManagementMenuLayout
-
- )
+ readAspects:(self aspects)
from:currentUserPrefs.
"Modified: / 06-10-2011 / 18:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 25-11-2011 / 15:09:39 / cg"
!
basicSaveSettings
self
- writeAspects:
- #(
- showAcceptCancelBarInBrowser
- useSearchBarInBrowser
- showMethodTemplate
- useCodeView2InTools
- showEmbeddedTestRunnerInBrowser
- showBookmarkBar
- webBrowserLikeLayout
- sortAndIndentClassesByInheritance
- showGlobalHistory
- showLocalHistory
- useInPlaceSearchInBrowserLists
- sourceCodeManagementMenuLayout
- )
+ writeAspects:(self aspects)
to:currentUserPrefs.
"Modified: / 06-10-2011 / 18:57:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 25-11-2011 / 15:09:49 / cg"
! !
!AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'aspects'!
@@ -15500,26 +15493,12 @@
!AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- (self
- hasChangedAspectIn:
- #(
- showAcceptCancelBarInBrowser
- useSearchBarInBrowser
- showMethodTemplate
- useCodeView2InTools
- showEmbeddedTestRunnerInBrowser
- showBookmarkBar
- webBrowserLikeLayout
- sortAndIndentClassesByInheritance
- showGlobalHistory
- showLocalHistory
- useInPlaceSearchInBrowserLists
- sourceCodeManagementMenuLayout
- )
- asComparedTo:currentUserPrefs) ifTrue:[^ true].
- ^ false.
+ ^ self
+ hasChangedAspectIn:(self aspects)
+ asComparedTo:currentUserPrefs
"Modified: / 06-10-2011 / 18:58:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 25-11-2011 / 15:23:47 / cg"
! !
!AbstractSettingsApplication::SystemMessageSettingsAppl class methodsFor:'help specs'!
@@ -16514,9 +16493,9 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.410 2011-11-24 17:34:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.411 2011-11-25 14:25:37 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.410 2011-11-24 17:34:29 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.411 2011-11-25 14:25:37 cg Exp $'
+! !