Skip to content
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

Initial cleanup of load process; remove GemStone cursor #1

Merged
merged 6 commits into from
Jul 23, 2018
Merged

Initial cleanup of load process; remove GemStone cursor #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfd6378
Fix load-time errors:
Jul 22, 2018
79a4f5e
Use standard Windows wait cursor instead of large GemStone icon.
Jul 22, 2018
5219827
Don't include saved Rowan Project Browser layout in Git.
Jul 22, 2018
7da4645
Update Transcript menu to remove duplicate shortcuts. The new Open Pr…
Jul 22, 2018
d9a72f8
Add missing method for cursor reset.
Jul 23, 2018
1c7d04f
Merge branch 'eric' into james
Jul 23, 2018
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
Prev Previous commit
Next Next commit
Use standard Windows wait cursor instead of large GemStone icon. 
Reset cursor during idle if it got stuck as busy.
  • Loading branch information
James Foster committed Jul 22, 2018
commit 79a4f5e88ffe52999071dceac5779499d75fa29b
11 changes: 1 addition & 10 deletions sources/GciSession.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ withExplanation: aString doA: aBlock
SessionManager inputState loopWhile: [shouldRunEventLoop].
shouldRunEventLoop := true.
] ifFalse: [
self class cursor showWhile: [
Cursor wait showWhile: [
SessionManager inputState loopWhile: [shouldRunEventLoop].
shouldRunEventLoop := true.
].
Expand Down Expand Up @@ -956,14 +956,6 @@ withExplanation: aString doA: aBlock

!GciSession class methodsFor!

cursor

GemCursor isNil ifTrue: [
GemCursor := Cursor fromFile: 'icons\GS16.ico'.
].
^GemCursor.
!

libraryClass: libraryClass
stoneNRS: stoneNRS
gemNRS: gemNRS
Expand Down Expand Up @@ -1005,7 +997,6 @@ publishedEventsOfInstances
yourself.

! !
!GciSession class categoriesFor: #cursor!public! !
!GciSession class categoriesFor: #libraryClass:stoneNRS:gemNRS:userID:password:hostUserID:password:initials:useSocket:debugPath:!public! !
!GciSession class categoriesFor: #new!public! !
!GciSession class categoriesFor: #publishedEventsOfInstances!public! !
Expand Down
10 changes: 10 additions & 0 deletions sources/JadeTranscript.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ onCloseRequested: boolValueHolder
].
!

onIdleEntered

gciSession isCallInProgress ifFalse: [
Cursor current ifNotNil: [
[Cursor current ifNotNil: [Cursor current: nil]] forkAt: Processor userBackgroundPriority.
].
].
^super onIdleEntered!

onViewOpened

super onViewOpened.
Expand Down Expand Up @@ -177,6 +186,7 @@ updateCaption
!JadeTranscript categoriesFor: #hasClassSideSelected!public! !
!JadeTranscript categoriesFor: #inspectOop!event handling!public! !
!JadeTranscript categoriesFor: #onCloseRequested:!event handling!public! !
!JadeTranscript categoriesFor: #onIdleEntered!public! !
!JadeTranscript categoriesFor: #onViewOpened!public!updating! !
!JadeTranscript categoriesFor: #queryCommand:!public!updating! !
!JadeTranscript categoriesFor: #resetCursor!event handling!public! !
Expand Down