--- a/AbstractSettingsApplication.st Mon Oct 05 18:27:21 2015 +0100
+++ b/AbstractSettingsApplication.st Wed Oct 07 08:07:02 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -604,11 +606,13 @@
|app transcript|
DebugView newDebugger.
+
transcript := Transcript current.
(transcript notNil and:[transcript isExternalStream not]) ifTrue:[
app := transcript topView application.
app perform:#reopenLauncher ifNotUnderstood:[].
].
+
self window topView raise.
!
@@ -15452,12 +15456,14 @@
!AbstractSettingsApplication::StyleSettingsAppl class methodsFor:'defaults'!
standardStyles
-
+ "only those are presented initially"
+
^ #(
'adwaita'
"/ 'decWindows'
'iris'
'macosx'
+ 'macosx_yosemite'
'motif'
'mswindows8'
'mswindows95'
--- a/FileBrowserV2UISpecifications.st Mon Oct 05 18:27:21 2015 +0100
+++ b/FileBrowserV2UISpecifications.st Wed Oct 07 08:07:02 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -276,197 +274,203 @@
<resource: #canvas>
^
- #(FullSpec
- name: detailsEditSpec
- window:
- (WindowSpec
- label: 'Panel Detail Spec'
- name: 'Panel Detail Spec'
- min: (Point 10 10)
- bounds: (Rectangle 14 46 452 420)
- )
- component:
- (SpecCollection
- collection: (
- (UISubSpecification
- name: 'SubSpecification1'
- layout: (LayoutFrame 1 0 0 0.0 0 1.0 183 0)
- majorKey: ViewSpec
- minorKey: detailsEditSpec
- )
- (FramedBoxSpec
- label: 'Handles'
- name: 'FramedBox2'
- layout: (LayoutFrame 0 0.0 169 0 0 1.0 284 0)
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Bar Width:'
- name: 'BarWidthLabel'
- layout: (AlignmentOrigin 88 0 13 0 1 0.5)
- activeHelpKey: barWidth
- translateLabel: true
- resizeForLabel: true
- adjust: left
- )
- (InputFieldSpec
- name: 'BarWidthField'
- layout: (LayoutFrame 90 0 0 0 140 0 22 0)
- activeHelpKey: barWidth
- tabable: true
- model: barWidth
- acceptChannel: acceptChannel
- modifiedChannel: modifiedChannel
- acceptOnPointerLeave: false
- )
- (LabelSpec
- label: 'Bar Level:'
- name: 'BarLevelLabel'
- layout: (AlignmentOrigin 244 0 13 0 1 0.5)
- activeHelpKey: barLevel
- translateLabel: true
- resizeForLabel: true
- adjust: left
- )
- (InputFieldSpec
- name: 'BarLevelField'
- layout: (LayoutFrame 246 0 0 0 296 0 22 0)
- activeHelpKey: barLevel
- tabable: true
- model: barLevel
- acceptChannel: acceptChannel
- modifiedChannel: modifiedChannel
- acceptOnPointerLeave: false
- )
- (LabelSpec
- label: 'Show Handles:'
- name: 'ShowHandlesLabel'
- layout: (AlignmentOrigin 85 0 38 0 1 0.5)
- activeHelpKey: showHandle
- translateLabel: true
- resizeForLabel: true
- adjust: right
- )
- (PopUpListSpec
- label: 'Default'
- name: 'ShowHandlesPopUpList'
- layout: (AlignmentOrigin 90 0 38 0 0 0.5)
- activeHelpKey: showHandle
- resizeForLabel: true
- tabable: true
- model: showHandleIdx
- menu: showHandleList
- useIndex: true
- )
- (LabelSpec
- label: 'Snap Mode:'
- name: 'SnapLabel'
- layout: (LayoutFrame 0 0 54 0 86 0 76 0)
- activeHelpKey: snapMode
- translateLabel: true
- adjust: right
- )
- (PopUpListSpec
- label: 'none'
- name: 'SnapModePopUpList'
- layout: (LayoutFrame 90 0 54 0 236 0 75 0)
- activeHelpKey: snapMode
- adjust: center
- tabable: true
- model: snapModeIdx
- menu: snapModeList
- useIndex: true
- )
- (LabelSpec
- label: 'Position:'
- name: 'HandlePositionLabel'
- layout: (AlignmentOrigin 293 0 38 0 1 0.5)
- activeHelpKey: handlePosition
- translateLabel: true
- resizeForLabel: true
- adjust: right
- )
- (PopUpListSpec
- label: 'Default'
- name: 'HandlePositionPopUpList'
- layout: (AlignmentOrigin 298 0 38 0 0 0.5)
- activeHelpKey: handlePosition
- resizeForLabel: true
- tabable: true
- model: handlePositionIdx
- menu: handlePositionList
- useIndex: true
- )
+ #(FullSpec
+ name: detailsEditSpec
+ window:
+ (WindowSpec
+ label: 'Panel Detail Spec'
+ name: 'Panel Detail Spec'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 438 374)
+ )
+ component:
+ (SpecCollection
+ collection: (
+ (UISubSpecification
+ name: 'SubSpecification1'
+ layout: (LayoutFrame 1 0 0 0.0 0 1.0 183 0)
+ majorKey: ViewSpec
+ minorKey: detailsEditSpec
+ )
+ (FramedBoxSpec
+ label: 'Handles'
+ name: 'FramedBox2'
+ layout: (LayoutFrame 0 0.0 169 0 0 1.0 284 0)
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Bar Width:'
+ name: 'BarWidthLabel'
+ layout: (AlignmentOrigin 88 0 13 0 1 0.5)
+ activeHelpKey: barWidth
+ translateLabel: true
+ resizeForLabel: true
+ adjust: left
+ )
+ (InputFieldSpec
+ name: 'BarWidthField'
+ layout: (LayoutFrame 90 0 0 0 140 0 22 0)
+ activeHelpKey: barWidth
+ tabable: true
+ model: barWidth
+ acceptChannel: acceptChannel
+ modifiedChannel: modifiedChannel
+ acceptOnPointerLeave: false
+ )
+ (LabelSpec
+ label: 'Bar Level:'
+ name: 'BarLevelLabel'
+ layout: (AlignmentOrigin 244 0 13 0 1 0.5)
+ activeHelpKey: barLevel
+ translateLabel: true
+ resizeForLabel: true
+ adjust: left
+ )
+ (InputFieldSpec
+ name: 'BarLevelField'
+ layout: (LayoutFrame 246 0 0 0 296 0 22 0)
+ activeHelpKey: barLevel
+ tabable: true
+ model: barLevel
+ acceptChannel: acceptChannel
+ modifiedChannel: modifiedChannel
+ acceptOnPointerLeave: false
+ )
+ (LabelSpec
+ label: 'Show Handles:'
+ name: 'ShowHandlesLabel'
+ layout: (LayoutFrame 0 0 28 0 105 0 47 0)
+ activeHelpKey: showHandle
+ translateLabel: true
+ resizeForLabel: true
+ adjust: right
+ )
+ (PopUpListSpec
+ label: 'Default'
+ name: 'ShowHandlesPopUpList'
+ layout: (LayoutFrame 107 0 28 0 225 0 47 0)
+ activeHelpKey: showHandle
+ translateLabel: true
+ resizeForLabel: true
+ tabable: true
+ model: showHandleIdx
+ menu: showHandleList
+ useIndex: true
+ )
+ (LabelSpec
+ label: 'Snap Mode:'
+ name: 'SnapLabel'
+ layout: (LayoutFrame 0 0 54 0 105 0 76 0)
+ activeHelpKey: snapMode
+ translateLabel: true
+ adjust: right
)
-
- )
- )
- (FramedBoxSpec
- label: 'Visibility'
- name: 'FramedBox1'
- layout: (LayoutFrame 0 0.0 287 0 0 1.0 371 0)
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'orientation:'
- name: 'orientation'
- layout: (AlignmentOrigin 85 0 13 0 1 0.5)
- activeHelpKey: borderWidth
- resizeForLabel: true
- adjust: left
- )
- (ComboListSpec
- name: 'orientationList'
- layout: (LayoutFrame 85 0 2 0 194 0 24 0)
- model: orientation
- comboList: orientationList
- useIndex: false
- )
- (LabelSpec
- label: 'which:'
- name: 'visibilityOf'
- layout: (AlignmentOrigin 248 0 13 0 1 0.5)
- activeHelpKey: borderWidth
- resizeForLabel: true
- adjust: left
- )
- (ComboListSpec
- name: 'whichViewList'
- layout: (LayoutFrame 247 0 2 0 0 1.0 24 0)
- model: whichView
- comboList: whichViewList
- useIndex: false
- )
- (InputFieldSpec
- name: 'visibility'
- layout: (LayoutFrame 85 0 29 0 0 1.0 51 0)
- activeHelpKey: canvas
- model: visibility
- group: inputGroup
- acceptChannel: acceptChannel
- modifiedChannel: modifiedChannel
- acceptOnPointerLeave: false
- )
- (LabelSpec
- label: 'visibility:'
- name: 'visibilityLabel'
- layout: (AlignmentOrigin 85 0 40 0 1 0.5)
- resizeForLabel: true
- )
+ (PopUpListSpec
+ label: 'none'
+ name: 'SnapModePopUpList'
+ layout: (LayoutFrame 107 0 54 0 225 0 75 0)
+ activeHelpKey: snapMode
+ translateLabel: true
+ adjust: center
+ tabable: true
+ model: snapModeIdx
+ menu: snapModeList
+ useIndex: true
+ )
+ (LabelSpec
+ label: 'Position:'
+ name: 'HandlePositionLabel'
+ layout: (AlignmentOrigin 293 0 38 0 1 0.5)
+ activeHelpKey: handlePosition
+ translateLabel: true
+ resizeForLabel: true
+ adjust: right
+ )
+ (PopUpListSpec
+ label: 'Default'
+ name: 'HandlePositionPopUpList'
+ layout: (LayoutFrame 298 0 28 0 0 1 47 0)
+ activeHelpKey: handlePosition
+ translateLabel: true
+ resizeForLabel: true
+ tabable: true
+ model: handlePositionIdx
+ menu: handlePositionList
+ useIndex: true
)
-
- )
- )
+ )
+
+ )
)
-
- )
- )
+ (FramedBoxSpec
+ label: 'Visibility'
+ name: 'FramedBox1'
+ layout: (LayoutFrame 0 0.0 287 0 0 1.0 371 0)
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'orientation:'
+ name: 'orientation'
+ layout: (AlignmentOrigin 85 0 13 0 1 0.5)
+ activeHelpKey: borderWidth
+ translateLabel: true
+ resizeForLabel: true
+ adjust: left
+ )
+ (ComboListSpec
+ name: 'orientationList'
+ layout: (LayoutFrame 85 0 2 0 194 0 24 0)
+ model: orientation
+ comboList: orientationList
+ useIndex: false
+ )
+ (LabelSpec
+ label: 'which:'
+ name: 'visibilityOf'
+ layout: (AlignmentOrigin 248 0 13 0 1 0.5)
+ activeHelpKey: borderWidth
+ translateLabel: true
+ resizeForLabel: true
+ adjust: left
+ )
+ (ComboListSpec
+ name: 'whichViewList'
+ layout: (LayoutFrame 247 0 2 0 0 1.0 24 0)
+ model: whichView
+ comboList: whichViewList
+ useIndex: false
+ )
+ (InputFieldSpec
+ name: 'visibility'
+ layout: (LayoutFrame 85 0 29 0 0 1.0 51 0)
+ activeHelpKey: canvas
+ model: visibility
+ group: inputGroup
+ acceptChannel: acceptChannel
+ modifiedChannel: modifiedChannel
+ acceptOnPointerLeave: false
+ )
+ (LabelSpec
+ label: 'visibility:'
+ name: 'visibilityLabel'
+ layout: (AlignmentOrigin 85 0 40 0 1 0.5)
+ translateLabel: true
+ resizeForLabel: true
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ )
! !
!FileBrowserV2UISpecifications::PanelSpec class methodsFor:'interface-painter'!
@@ -644,7 +648,7 @@
!FileBrowserV2UISpecifications class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2UISpecifications.st,v 1.7 2015-05-05 11:06:23 cg Exp $'
+ ^ '$Header$'
!
version_HG
--- a/NewLauncher.st Mon Oct 05 18:27:21 2015 +0100
+++ b/NewLauncher.st Wed Oct 07 08:07:02 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 1997-1998 by eXept Software AG
All Rights Reserved
@@ -912,13 +910,13 @@
(ViewSpec
name: 'Box1'
layout: (LayoutFrame 0 0.0 40 0.0 0 1.0 -26 1.0)
- level: 1
component:
(SpecCollection
collection: (
(WorkspaceSpec
name: 'transcriptView'
layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+ level: #'launcher.editorLevel'
hasHorizontalScrollBar: true
hasVerticalScrollBar: true
miniScrollerHorizontal: true
@@ -931,6 +929,7 @@
(UISubSpecification
name: 'infoBarSubSpec'
layout: (LayoutFrame 0 0.0 -26 1 -16 1.0 0 1.0)
+ level: #'infobar.level'
majorKey: ToolApplicationModel
minorKey: windowSpecForInfoBarWithClock
keepSpaceForOSXResizeHandleH: true
--- a/Tools__CodeView2.st Mon Oct 05 18:27:21 2015 +0100
+++ b/Tools__CodeView2.st Wed Oct 07 08:07:02 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
All Rights Reserved
@@ -1596,7 +1598,7 @@
super initialize.
"Now set up some visual properties"
- self level:-1.
+ self level:(styleSheet at:#'codeView2.level' default:-1).
"Now initialize sub-views"
showGutterChannel := ValueHolder with: true.
showGutterChannel addDependent: self.
--- a/Tools__FontSettingsApplication.st Mon Oct 05 18:27:21 2015 +0100
+++ b/Tools__FontSettingsApplication.st Wed Oct 07 08:07:02 2015 +0100
@@ -10,7 +10,7 @@
textLabel labelLabel listsLabel menuLabel inputFieldLabel
inputFieldDef inputFieldFontLabelHolder otherLabel
linuxFontWorkaround otherDef tooltipDef tooltipFontLabelHolder
- tooltipLabel'
+ tooltipLabel useXftFontsOnly'
classVariableNames:''
poolDictionaries:''
category:'Interface-Smalltalk'
@@ -169,8 +169,12 @@
isReadOnly: true
hasKeyboardFocusInitially: false
extent: (Point 637 132)
+ postBuildCallback: postBuildHelpLabel:
viewClassName: 'ListView'
- postBuildCallback: postBuildHelpLabel:
+ )
+ (DividerSpec
+ name: 'Separator14'
+ extent: (Point 637 4)
)
(ViewSpec
name: 'CodeBox'
@@ -184,27 +188,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'Button1'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeTextFont
+ )
(LabelSpec
label: 'Text Font'
name: 'Label2'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: textFontLabelHolder
adjust: left
postBuildCallback: postBuildTextFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'Button1'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeTextFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'InputFieldsBox'
@@ -218,27 +222,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'ChangeText'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeInputFieldFont
+ )
(LabelSpec
label: 'InputFields Font'
name: 'InputFieldsFont'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: inputFieldFontLabelHolder
adjust: left
postBuildCallback: postBuildInputFieldFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'ChangeText'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeInputFieldFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'ListsBox'
@@ -252,27 +256,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'ChangeLists'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeListsFont
+ )
(LabelSpec
label: 'Lists Font'
name: 'ListsFont'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: listsFontLabelHolder
adjust: left
postBuildCallback: postBuildListsFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'ChangeLists'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeListsFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'MenusBox'
@@ -286,27 +290,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'ChangeMenus'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeMenusFont
+ )
(LabelSpec
label: 'Menus Font'
name: 'MenusFont'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: menusFontLabelHolder
adjust: left
postBuildCallback: postBuildMenuesFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'ChangeMenus'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeMenusFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'LabelsBox'
@@ -320,27 +324,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'ChangeLabels'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeLabelsFont
+ )
(LabelSpec
label: 'Labels'
name: 'LabelsFont'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: labelsFontLabelHolder
adjust: left
postBuildCallback: postBuildLabelsFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'ChangeLabels'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeLabelsFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'ButtonsBox'
@@ -354,27 +358,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'Change Buttons'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeButtonsFont
+ )
(LabelSpec
label: 'Buttons Font'
name: 'ButtonsFont'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: buttonsFontLabelHolder
adjust: left
postBuildCallback: postBuildButtonsFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'Change Buttons'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeButtonsFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'ToolTipsBox'
@@ -388,27 +392,27 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'Button11'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeTooltipFont
+ )
(LabelSpec
label: 'Label'
name: 'Label8'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: tooltipFontLabelHolder
adjust: left
postBuildCallback: postBuildTooltipFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'Button11'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeTooltipFont
- )
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'OtherBox'
@@ -422,23 +426,23 @@
translateLabel: true
adjust: left
)
+ (ActionButtonSpec
+ label: 'Change...'
+ name: 'Button9'
+ layout: (LayoutFrame 100 0.0 7 0 205 0 29 0)
+ translateLabel: true
+ tabable: true
+ model: changeOtherFont
+ )
(LabelSpec
label: 'Label'
name: 'Label6'
- layout: (LayoutFrame 110 0 22 0 -2 1 44 0)
+ layout: (LayoutFrame 210 0 7 0 -2 1 29 0)
translateLabel: true
labelChannel: otherFontLabelHolder
adjust: left
postBuildCallback: postBuildOtherFontLabel:
)
- (ActionButtonSpec
- label: 'Change...'
- name: 'Button9'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
- translateLabel: true
- tabable: true
- model: changeOtherFont
- )
(DividerSpec
name: 'Separator13'
layout: (LayoutFrame 0 0.0 -3 1 0 1.0 0 1)
@@ -446,7 +450,7 @@
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(ViewSpec
name: 'AllBox'
@@ -456,14 +460,14 @@
(LabelSpec
label: 'All'
name: 'All'
- layout: (LayoutFrame 0 0.0 0 0 0 1.0 20 0)
+ layout: (LayoutFrame 0 0.0 4 0 0 1.0 24 0)
translateLabel: true
adjust: left
)
(ActionButtonSpec
label: 'Change...'
name: 'ChangeAll'
- layout: (LayoutFrame 0 0.0 22 0 105 0 44 0)
+ layout: (LayoutFrame 100 0.0 11 0 205 0 33 0)
translateLabel: true
tabable: true
model: changeAllFont
@@ -475,7 +479,7 @@
)
)
- extent: (Point 637 50)
+ extent: (Point 637 45)
)
(CheckBoxSpec
label: 'Linux font workaround: do not reset fonts on snapshot restart'
@@ -485,6 +489,15 @@
translateLabel: true
extent: (Point 637 30)
)
+ (CheckBoxSpec
+ label: 'Only Use Xft Fonts (Unix Only)'
+ name: 'CheckBox1'
+ visibilityChannel: useXftFontsOnlyVisible
+ model: useXftFontsOnly
+ activeHelpKey: useXftFontsOnly
+ translateLabel: true
+ extent: (Point 637 30)
+ )
(DividerSpec
name: 'Separator12'
visibilityChannel: linuxFontWorkaroundVisible
@@ -495,17 +508,10 @@
component:
(SpecCollection
collection: (
- (LabelSpec
- label: 'Common Settings:'
- name: 'Label4'
- layout: (LayoutFrame 0 0.0 11 0 0 1.0 33 0)
- translateLabel: true
- adjust: left
- )
(ActionButtonSpec
label: 'Default'
name: 'Button2'
- layout: (LayoutFrame 0 0.0 35 0 130 0 57 0)
+ layout: (LayoutFrame 0 0.0 13 0 130 0 35 0)
activeHelpKey: resetToDefault
translateLabel: true
tabable: true
@@ -514,7 +520,7 @@
(ActionButtonSpec
label: 'High Contrast'
name: 'Button3'
- layout: (LayoutFrame 148 0.0 35 0 298 0 57 0)
+ layout: (LayoutFrame 148 0.0 13 0 298 0 35 0)
activeHelpKey: changeToHighContrast
translateLabel: true
tabable: true
@@ -523,7 +529,7 @@
(ActionButtonSpec
label: 'Big Fonts'
name: 'Button4'
- layout: (LayoutFrame 309 0.0 35 0 459 0 57 0)
+ layout: (LayoutFrame 309 0.0 13 0 459 0 35 0)
activeHelpKey: changeToBigFonts
translateLabel: true
tabable: true
@@ -532,7 +538,7 @@
(ActionButtonSpec
label: 'Huge Fonts'
name: 'Button5'
- layout: (LayoutFrame 470 0.0 35 0 620 0 57 0)
+ layout: (LayoutFrame 470 0.0 13 0 620 0 35 0)
activeHelpKey: changeToHugeFonts
translateLabel: true
tabable: true
@@ -541,7 +547,7 @@
(ActionButtonSpec
label: 'ST/X Look'
name: 'Button8'
- layout: (LayoutFrame 148 0.0 67 0 298 0 89 0)
+ layout: (LayoutFrame 148 0.0 45 0 298 0 67 0)
activeHelpKey: changeToSTXLook
translateLabel: true
tabable: true
@@ -550,7 +556,7 @@
(ActionButtonSpec
label: 'Squeak Look'
name: 'Button6'
- layout: (LayoutFrame 309 0.0 67 0 459 0 89 0)
+ layout: (LayoutFrame 309 0.0 45 0 459 0 67 0)
activeHelpKey: changeToSqueakLook
translateLabel: true
tabable: true
@@ -559,7 +565,7 @@
(ActionButtonSpec
label: 'V''Age Look'
name: 'Button7'
- layout: (LayoutFrame 470 0.0 67 0 620 0 89 0)
+ layout: (LayoutFrame 470 0.0 45 0 620 0 67 0)
activeHelpKey: changeToVisualAgeLook
translateLabel: true
tabable: true
@@ -568,7 +574,7 @@
(ActionButtonSpec
label: 'ST/X Look (Xft)'
name: 'Button10'
- layout: (LayoutFrame 148 0.0 99 0 298 0 121 0)
+ layout: (LayoutFrame 148 0.0 77 0 298 0 99 0)
activeHelpKey: changeToSTXLookXft
translateLabel: true
tabable: true
@@ -603,16 +609,41 @@
!FontSettingsApplication methodsFor:'actions'!
basicReadFontSettings
-"/ View readStyleSheetAndUpdateAllStyleCaches.
+ |prefs readFont|
+
+ self useXftFontsOnly value:(UserPreferences current useXftFontsOnly).
+
+ prefs := UserPreferences current fontPreferences.
+ prefs isNil ifTrue:[
+ prefs := Dictionary new.
+ ].
+
+ readFont :=
+ [:key :default |
+ |s fn|
+
+ s := prefs at:key ifAbsent:nil.
+ s notNil ifTrue:[
+ fn := Object readFrom:s.
+ self useXftFontsOnly value ifTrue:[
+ fn := XftFontDescription for:fn
+ ].
+ ].
+ fn isNil ifTrue:[
+ fn := default.
+ ].
+ fn
+ ].
+
self allOfThem value:SimpleView defaultFont.
- self otherDef value:SimpleView defaultFont.
- self labelDef value:Label defaultFont.
- self buttonDef value:Button defaultFont.
- self listDef value:SelectionInListView defaultFont.
- self menuDef value:MenuView defaultFont.
- self textDef value:TextView defaultFont.
- self inputFieldDef value:EditField defaultFont.
- self tooltipDef value:ActiveHelpView defaultFont.
+ self otherDef value:(readFont value:#Other value:SimpleView defaultFont).
+ self labelDef value:(readFont value:#Label value:Label defaultFont).
+ self buttonDef value:(readFont value:#Button value:Button defaultFont).
+ self listDef value:(readFont value:#List value:SelectionInListView defaultFont).
+ self menuDef value:(readFont value:#Menu value:MenuView defaultFont).
+ self textDef value:(readFont value:#Text value:TextView defaultFont).
+ self inputFieldDef value:(readFont value:#InputField value:EditField defaultFont).
+ self tooltipDef value:(readFont value:#Tooltip value:ActiveHelpView defaultFont).
"Modified: / 10-10-2011 / 12:15:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Created: / 06-02-2012 / 12:22:39 / cg"
@@ -630,37 +661,51 @@
basicSaveSettings
|fn|
- fn := self otherDef value.
- SimpleView withAllSubclasses do:[:cls | cls defaultFont:fn].
-
- fn := self labelDef value.
- Label defaultFont:fn.
- CheckBox defaultFont:fn.
-
- fn := self buttonDef value.
- Button defaultFont:fn.
- Toggle defaultFont:fn.
-
- fn := self textDef value.
- TextView withAllSubclasses do:[:cls | cls defaultFont:fn].
+ self writeAspects: #(linuxFontWorkaround useXftFontsOnly) to: currentUserPrefs.
- fn := self inputFieldDef value.
- EditField withAllSubclasses do:[:cls | cls defaultFont:fn].
-
- fn := self listDef value.
- SelectionInListView withAllSubclasses do:[:cls | cls defaultFont:fn].
-
- fn := self tooltipDef value.
- ActiveHelpView withAllSubclasses do:[:cls | cls defaultFont:fn].
-
- fn := self menuDef value.
- ListView defaultFont:fn.
- MenuView defaultFont:fn.
- MenuPanel defaultFont:fn.
- NoteBookView defaultFont:fn.
- PullDownMenu defaultFont:fn.
-
- self writeAspects: #(linuxFontWorkaround) to: currentUserPrefs.
+ UserPreferences current fontPreferences:
+ (
+ Dictionary new
+ at:#Other put:(self otherDef value storeString);
+ at:#Label put:(self labelDef value storeString);
+ at:#Button put:(self buttonDef value storeString);
+ at:#Text put:(self textDef value storeString);
+ at:#InputField put:(self inputFieldDef value storeString);
+ at:#List put:(self listDef value storeString);
+ at:#Tooltip put:(self tooltipDef value storeString);
+ at:#Menu put:(self menuDef value storeString);
+ yourself
+ ).
+
+"/ fn := self otherDef value.
+"/ SimpleView withAllSubclasses do:[:cls | cls defaultFont:fn].
+"/
+"/ fn := self labelDef value.
+"/ Label defaultFont:fn.
+"/ CheckBox defaultFont:fn.
+"/
+"/ fn := self buttonDef value.
+"/ Button defaultFont:fn.
+"/ Toggle defaultFont:fn.
+"/
+"/ fn := self textDef value.
+"/ TextView withAllSubclasses do:[:cls | cls defaultFont:fn].
+"/
+"/ fn := self inputFieldDef value.
+"/ EditField withAllSubclasses do:[:cls | cls defaultFont:fn].
+"/
+"/ fn := self listDef value.
+"/ SelectionInListView withAllSubclasses do:[:cls | cls defaultFont:fn].
+"/
+"/ fn := self tooltipDef value.
+"/ ActiveHelpView withAllSubclasses do:[:cls | cls defaultFont:fn].
+"/
+"/ fn := self menuDef value.
+"/ ListView defaultFont:fn.
+"/ MenuView defaultFont:fn.
+"/ MenuPanel defaultFont:fn.
+"/ NoteBookView defaultFont:fn.
+"/ PullDownMenu defaultFont:fn.
DebugView newDebugger.
@@ -918,7 +963,6 @@
!
labelsFontLabelHolder
-
labelsFontLabelHolder isNil ifTrue:[
labelsFontLabelHolder := '' asValue.
].
@@ -926,11 +970,9 @@
!
linuxFontWorkaround
-
linuxFontWorkaround isNil ifTrue:[
linuxFontWorkaround := false asValue.
linuxFontWorkaround onChangeSend:#updateModifiedChannel to:self
-
].
^ linuxFontWorkaround.
@@ -938,7 +980,6 @@
!
linuxFontWorkaroundVisible
-
^OperatingSystem getOSType == #linux
"Created: / 10-10-2011 / 12:57:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -1027,6 +1068,19 @@
tooltipFontLabelHolder := '' asValue.
].
^ tooltipFontLabelHolder.
+!
+
+useXftFontsOnly
+ useXftFontsOnly isNil ifTrue:[
+ useXftFontsOnly := false asValue.
+ useXftFontsOnly onChangeSend:#updateModifiedChannel to:self
+ ].
+ ^ useXftFontsOnly.
+!
+
+useXftFontsOnlyVisible
+
+ ^ Screen platformName = 'X11'
! !
!FontSettingsApplication methodsFor:'change & update'!
@@ -1181,7 +1235,7 @@
self inputFieldDef value ~= EditField defaultFont ifTrue:[^ true].
self tooltipDef value ~= ActiveHelpView defaultFont ifTrue:[^ true].
- (self hasChangedAspectIn: #(linuxFontWorkaround) asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ (self hasChangedAspectIn: #(linuxFontWorkaround useXftFontsOnly) asComparedTo:currentUserPrefs) ifTrue:[^ true].
^ false
@@ -1195,10 +1249,10 @@
!FontSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__FontSettingsApplication.st,v 1.12 2014-11-26 16:04:17 stefan Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__FontSettingsApplication.st,v 1.12 2014-11-26 16:04:17 stefan Exp $'
+ ^ '$Header$'
! !
--- a/WorkspaceApplication.st Mon Oct 05 18:27:21 2015 +0100
+++ b/WorkspaceApplication.st Wed Oct 07 08:07:02 2015 +0100
@@ -416,100 +416,102 @@
<resource: #canvas>
^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'Workspace'
- name: 'Workspace'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 640 480)
- menu: mainMenu
- )
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'ToolBar'
- layout: (LayoutFrame 0 0 0 0 0 1 32 0)
- visibilityChannel: toolBarVisibleHolder
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'hideToolBarIcon'
- name: 'HideToolBarButton'
- layout: (LayoutFrame 0 0 0 0 13 0 0 1)
- activeHelpKey: hideToolBar
- hasCharacterOrientedLabel: false
- translateLabel: true
- model: hideToolbar
- postBuildCallback: hideToolBarButtonCreated:
- )
- (NonScrollableArbitraryComponentSpec
- name: 'ToolBarView'
- layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
- "/ level: 1
- visibilityChannel: toolBarVisibleHolder
- component: toolBarView
- )
+ #(FullSpec
+ name: windowSpec
+ window:
+ (WindowSpec
+ label: 'Workspace'
+ name: 'Workspace'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 640 480)
+ menu: mainMenu
+ )
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'ToolBar'
+ layout: (LayoutFrame 0 0 0 0 0 1 32 0)
+ level: #'application.toolbarLevel'
+ visibilityChannel: toolBarVisibleHolder
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'hideToolBarIcon'
+ name: 'HideToolBarButton'
+ layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+ activeHelpKey: hideToolBar
+ hasCharacterOrientedLabel: false
+ translateLabel: true
+ model: hideToolbar
+ postBuildCallback: hideToolBarButtonCreated:
+ )
+ (NonScrollableArbitraryComponentSpec
+ name: 'ToolBarView'
+ layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
+ visibilityChannel: toolBarVisibleHolder
+ component: toolBarView
)
-
- )
- )
- (ViewSpec
- name: 'EditToolBar'
- layout: (LayoutFrame 0 0 32 0 0 1 64 0)
- visibilityChannel: editToolBarVisibleHolder
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'hideToolBarIcon'
- name: 'HideEditToolBarButton'
- layout: (LayoutFrame 0 0 0 0 13 0 0 1)
- activeHelpKey: hideEditToolBar
- hasCharacterOrientedLabel: false
- translateLabel: true
- model: hideEditToolbar
- postBuildCallback: hideToolBarButtonCreated:
- )
- (MenuPanelSpec
- name: 'EditToolBar1'
- layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
- visibilityChannel: editToolBarVisibleHolder
- menu: editToolBarMenu
- textDefault: true
- )
+ )
+
+ )
+ )
+ (ViewSpec
+ name: 'EditToolBar'
+ layout: (LayoutFrame 0 0 32 0 0 1 64 0)
+ visibilityChannel: editToolBarVisibleHolder
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'hideToolBarIcon'
+ name: 'HideEditToolBarButton'
+ layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+ activeHelpKey: hideEditToolBar
+ hasCharacterOrientedLabel: false
+ translateLabel: true
+ model: hideEditToolbar
+ postBuildCallback: hideToolBarButtonCreated:
+ )
+ (MenuPanelSpec
+ name: 'EditToolBar1'
+ layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
+ visibilityChannel: editToolBarVisibleHolder
+ menu: editToolBarMenu
+ textDefault: true
)
-
- )
- )
- (NoteBookViewSpec
- name: 'NoteBook'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -26 1.0)
- model: selectedWorkspaceIndexHolder
- menu: tabList
- useIndex: true
- accessTabMenuAction: tabMenuAt:
- destroyTabAction: destroyTab:
- canvas: workspaceHolder
- canvasInset: 0
- keepCanvasAlive: true
- tabLevel: 1
- )
- (UISubSpecification
- name: 'infoBarSubSpec'
- layout: (LayoutFrame 0 0.0 -26 1 0 1.0 0 1.0)
- visibilityChannel: infoVisibleHolder
- majorKey: WorkspaceApplication
- minorKey: windowSpecForInfoBar
- keepSpaceForOSXResizeHandleH: true
- )
+ )
+
+ )
)
-
- )
- )
+ (NoteBookViewSpec
+ name: 'NoteBook'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -26 1.0)
+ model: selectedWorkspaceIndexHolder
+ menu: tabList
+ useIndex: true
+ accessTabMenuAction: tabMenuAt:
+ translateLabel: true
+ destroyTabAction: destroyTab:
+ canvas: workspaceHolder
+ canvasInset: 0
+ keepCanvasAlive: true
+ tabLevel: 1
+ )
+ (UISubSpecification
+ name: 'infoBarSubSpec'
+ layout: (LayoutFrame 0 0.0 -26 1 -16 1.0 0 1.0)
+ level: #'infobar.level'
+ visibilityChannel: infoVisibleHolder
+ majorKey: WorkspaceApplication
+ minorKey: windowSpecForInfoBar
+ keepSpaceForOSXResizeHandleH: true
+ )
+ )
+
+ )
+ )
!
windowSpecForInfoBar
--- a/resources/de.rs Mon Oct 05 18:27:21 2015 +0100
+++ b/resources/de.rs Wed Oct 07 08:07:02 2015 +0100
@@ -2990,7 +2990,7 @@
'Change' 'Ändern'
'defaults' 'Voreinstellungen'
-'FONT_SETTINGS_INFO' 'Bitte beachten Sie, daß sich diese Einstellungen nur auf neue Fenster auswirken.\Bereits offene Fenster behalten den ursprünglichen Zeichensatz.\Falls nötig, sollten Sie die Fenster neu öffnen. Dies gilt auch für den Launcher selbst.\\Beachten Sie auch:\Fall nicht gesichert, gelten diese Einstellungen nur für die aktuelle Sitzung.'
+'FONT_SETTINGS_INFO' 'Bitte beachten Sie, daß sich diese Einstellungen nur auf neue Fenster auswirken.\Bereits offene Fenster behalten den ursprünglichen Zeichensatz.\Falls nötig, sollten Sie die Fenster neu öffnen.\Dies gilt auch für den Launcher selbst.\\Beachten Sie auch: Falls nicht gesichert,\gelten diese Einstellungen nur für die aktuelle Sitzung.'
'Memory manager settings' 'Einstellung der Speicherverwaltung'
'Common Settings' 'Standardeinstellungen'