--- a/AbstractSettingsApplication.st Fri Oct 07 11:51:39 2011 +0200
+++ b/AbstractSettingsApplication.st Fri Oct 07 14:30:10 2011 +0200
@@ -321,7 +321,8 @@
showMethodTemplate useCodeView2InTools
showEmbeddedTestRunnerInBrowser showBookmarkBar
webBrowserLikeLayout sortAndIndentClassesByInheritance
- showLocalHistory showGlobalHistory useInPlaceSearchInBrowserLists'
+ showLocalHistory showGlobalHistory useInPlaceSearchInBrowserLists
+ sourceCodeManagementMenuLayout'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -15054,8 +15055,8 @@
(SpecCollection
collection: (
(VerticalPanelViewSpec
- name: 'VerticalPanel2'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 342 0)
+ name: 'SettingsPanel'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
horizontalLayout: fit
verticalLayout: top
horizontalSpace: 3
@@ -15063,83 +15064,172 @@
component:
(SpecCollection
collection: (
- (CheckBoxSpec
- label: 'Show Accept/Cancel Bar in Editor'
- name: 'ShowAcceptCancelBarInBrowser'
- model: showAcceptCancelBarInBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Search Bar in Browser'
- name: 'ShowSearchBarInBrowser'
- model: useSearchBarInBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Method Template'
- name: 'MethodTemplate'
- model: showMethodTemplate
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the new CodeView2 (EXPERIMENTAL)'
- name: 'UserCodeView2'
- model: useCodeView2InTools
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use the Embedded Test Runner'
- name: 'UseEmbeddedTestRunner'
- model: showEmbeddedTestRunnerInBrowser
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Bookmarks Bar'
- name: 'ShowBookmarksBar'
- model: showBookmarkBar
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Sort and Indent Classes by Inheritance'
- name: 'SortAndIndentClassesByInheritance'
- model: sortAndIndentClassesByInheritance
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Web Browser Like Layout (Toolbars are Part of the Tab - EXPERIMENTAL)'
- name: 'CheckBox1'
- initiallyInvisible: true
- model: webBrowserLikeLayout
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Local Navigation History (Separate History per Browser Tab)'
- name: 'CheckBox2'
- model: showLocalHistory
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Show Global Navigation History (One Global History Among All Browser Windows)'
- name: 'CheckBox3'
- model: showGlobalHistory
- translateLabel: true
- extent: (Point 607 25)
- )
- (CheckBoxSpec
- label: 'Use In-place Search In Browser Lists (EXPERIMENTAL)'
- name: 'CheckBox4'
- model: useInPlaceSearchInBrowserLists
- translateLabel: true
- extent: (Point 607 22)
+ (FramedBoxSpec
+ label: 'Settings'
+ name: 'ToolsSettingsPanel'
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'ToolSettingsVPanel'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Show Accept/Cancel Bar in Editor'
+ name: 'ShowAcceptCancelBarInBrowser'
+ model: showAcceptCancelBarInBrowser
+ translateLabel: true
+ extent: (Point 571 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Search Bar in Browser'
+ name: 'ShowSearchBarInBrowser'
+ model: useSearchBarInBrowser
+ translateLabel: true
+ extent: (Point 571 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)
+ )
+ (CheckBoxSpec
+ label: 'Use the Embedded Test Runner'
+ name: 'UseEmbeddedTestRunner'
+ model: showEmbeddedTestRunnerInBrowser
+ translateLabel: true
+ extent: (Point 571 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Bookmarks Bar'
+ name: 'ShowBookmarksBar'
+ model: showBookmarkBar
+ translateLabel: true
+ extent: (Point 571 25)
+ )
+ (CheckBoxSpec
+ label: 'Sort and Indent Classes by Inheritance'
+ name: 'SortAndIndentClassesByInheritance'
+ model: sortAndIndentClassesByInheritance
+ translateLabel: true
+ extent: (Point 571 25)
+ )
+ (CheckBoxSpec
+ label: 'Web Browser Like Layout (Toolbars are Part of the Tab - EXPERIMENTAL)'
+ name: 'CheckBox1'
+ initiallyInvisible: true
+ model: webBrowserLikeLayout
+ translateLabel: true
+ extent: (Point 607 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Local Navigation History (Separate History per Browser Tab)'
+ name: 'CheckBox2'
+ model: showLocalHistory
+ translateLabel: true
+ extent: (Point 571 25)
+ )
+ (CheckBoxSpec
+ label: 'Show Global Navigation History (One Global History Among All Browser Windows)'
+ name: 'CheckBox3'
+ model: showGlobalHistory
+ translateLabel: true
+ extent: (Point 571 25)
+ )
+ (CheckBoxSpec
+ label: 'Use In-place Search In Browser Lists (EXPERIMENTAL)'
+ name: 'CheckBox4'
+ model: useInPlaceSearchInBrowserLists
+ translateLabel: true
+ extent: (Point 571 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 607 300)
+ useDynamicPreferredHeight: true
+ )
+ (FramedBoxSpec
+ label: 'Menu Layout'
+ name: 'MenyLayoutPanel'
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'MenyLayoutVPanel'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Source code management menu layout'
+ 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)
+ )
+ (RadioButtonSpec
+ label: 'Old (default)'
+ name: 'SCMMenuLayoutOld'
+ translateLabel: true
+ model: sourceCodeManagementMenuLayout
+ isTriggerOnDown: true
+ select: 'old'
+ extent: (Point 571 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ useDefaultExtent: true
)
)
@@ -15168,11 +15258,12 @@
showGlobalHistory
showLocalHistory
useInPlaceSearchInBrowserLists
+ sourceCodeManagementMenuLayout
)
from:currentUserPrefs.
- "Modified: / 28-07-2011 / 09:36:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-10-2011 / 18:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
basicSaveSettings
@@ -15190,10 +15281,11 @@
showGlobalHistory
showLocalHistory
useInPlaceSearchInBrowserLists
+ sourceCodeManagementMenuLayout
)
to:currentUserPrefs.
- "Modified: / 28-07-2011 / 09:36:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-10-2011 / 18:57:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!AbstractSettingsApplication::SystemBrowserSettingsAppl methodsFor:'aspects'!
@@ -15277,6 +15369,16 @@
"Created: / 06-07-2011 / 23:50:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+sourceCodeManagementMenuLayout
+ sourceCodeManagementMenuLayout isNil ifTrue:[
+ sourceCodeManagementMenuLayout := #old asValue.
+ sourceCodeManagementMenuLayout onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ sourceCodeManagementMenuLayout.
+
+ "Created: / 06-10-2011 / 18:57:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
useCodeView2InTools
"return/create the 'useCodeView2InTools' value holder (automatically generated)"
@@ -15347,11 +15449,12 @@
showGlobalHistory
showLocalHistory
useInPlaceSearchInBrowserLists
+ sourceCodeManagementMenuLayout
)
asComparedTo:currentUserPrefs) ifTrue:[^ true].
^ false.
- "Modified: / 28-07-2011 / 09:36:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 06-10-2011 / 18:58:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!AbstractSettingsApplication::SystemMessageSettingsAppl class methodsFor:'help specs'!
@@ -16346,9 +16449,9 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.405 2011-09-30 11:34:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.406 2011-10-07 12:30:10 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.405 2011-09-30 11:34:25 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.406 2011-10-07 12:30:10 vrany Exp $'
+! !