Skip to content

Fix property sheet error from not finding labelMorph font #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix property sheet error from not finding labelMorph font #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
984e89e
Fix property sheet error from not finding labelMorph font
doublec Sep 20, 2013
375e4b2
Fix property sheet error in labelMorph on Mac OS X
doublec Sep 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions objects/ui2/canvas.self
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2186,6 +2186,13 @@ the pixmapCache some day.
pixmap <- bootstrap stub -> 'globals' -> 'quartzGlobals' -> 'bufferCanvas' -> ().
} | )

bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'quartzWindowCanvas' -> () From: ( | {
'Category: portable accessing\x7fModuleInfo: Module: canvas InitialContents: FollowSlot\x7fVisibility: public'

scalableFont = ( |
| x11Globals scalableFont).
} | )

bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'xPixmapCanvas' -> () From: ( | {
'Category: converting ui2Image\'s\x7fModuleInfo: Module: canvas InitialContents: FollowSlot\x7fVisibility: public'

Expand Down
12 changes: 6 additions & 6 deletions objects/ui2/propertySheets.self
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'$Revision: 30.11 $'
'
Copyright 1992-2012 AUTHORS.
See the LICENSE file for license information.
Copyright 1992-2011 AUTHORS.
See the legal/LICENSE file for license information and legal/AUTHORS for authors.
'


Expand Down Expand Up @@ -116,7 +116,7 @@ SlotsToOmit: parent prototype.
|
defaultButtonHolder: ui2Menu initializeDefaultButtonHolder: defaultButtonHolder.
f: enumeratedTypeLabelMorph copyItemNames: labels Values: values DefaultButtonHolder: defaultButtonHolder.
f setSelectedIndex: (values asVector keyAt: v).
f setSelectedIndex: (values asVector keyAt: v IfAbsent: [ values asVector keyAt: 'defaultFont']).
f fontSpec: globals fontSpec copyName: 'verdana' Size: outlinerPreferences mediumFontSize Style: 'bold'.
buildFieldLabel: n ContentMorph: f).
} | )
Expand Down Expand Up @@ -690,7 +690,7 @@ SlotsToOmit: parent prototype.
bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'borderPropsMorph' -> () From: ( | {
'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'

defaultButtonHolder.
defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
} | )

bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'borderPropsMorph' -> () From: ( | {
Expand Down Expand Up @@ -886,7 +886,7 @@ SlotsToOmit: parent prototype.
bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'labelPropsMorph' -> () From: ( | {
'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'

defaultButtonHolder.
defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
} | )

bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'labelPropsMorph' -> () From: ( | {
Expand Down Expand Up @@ -1119,7 +1119,7 @@ SlotsToOmit: parent prototype.
bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'resizingPropsMorph' -> () From: ( | {
'Category: property specifics\x7fModuleInfo: Module: propertySheets InitialContents: InitializeToExpression: (nil)\x7fVisibility: private'

defaultButtonHolder.
defaultButtonHolder <- bootstrap stub -> 'globals' -> 'nil' -> ().
} | )

bootstrap addSlotsTo: bootstrap stub -> 'traits' -> 'resizingPropsMorph' -> () From: ( | {
Expand Down
18 changes: 17 additions & 1 deletion objects/ui2/scalableFont.self
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,13 @@ SlotsToOmit: comment directory fileInTimeString myComment postFileIn revision su
courierItalic = '-*-courier-medium-o-normal--'.
} | )

bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
'Category: font substituion\x7fComment: Return font to be used for fonts that can\'t be found.\x7fModuleInfo: Module: scalableFont InitialContents: FollowSlot\x7fVisibility: public'

defaultFont = ( |
| times).
} | )

bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'

Expand Down Expand Up @@ -560,7 +567,7 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
lastKvetchTime: now.
('unknown font: ', sel) printLine.
].
times).
defaultFont).
} | )

bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
Expand All @@ -587,6 +594,12 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
urwAvantGardeItalic = '-*-itc avant garde-medium-o-normal-sans-'.
} | )

bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'

verdana = '-*-verdana-medium-r-normal-sans-'.
} | )

bootstrap addSlotsTo: bootstrap stub -> 'globals' -> 'x11Globals' -> 'fontFamily' -> () From: ( | {
'ModuleInfo: Module: scalableFont InitialContents: FollowSlot'

Expand Down Expand Up @@ -661,6 +674,9 @@ I print out as asterisks.\x7fModuleInfo: Module: scalableFont InitialContents: F
(reflect: x11Globals fontFamily) do: [| :slot. :name | names add: name ].
names remove: 'parent'.
names remove: 'aNoteAboutMacXFonts'.
names remove: 'undefinedSelector:Type:Delegatee:MethodHolder:Arguments:'.
names remove: 'lastKvetchTime'.
names remove: 'lastKvetchTime:'.
names asVector sort).
} | )

Expand Down