diff --git a/src/Grafoscopio/GlamourPresentationModel.class.st b/src/Grafoscopio/GlamourPresentationModel.class.st index d5d959b..1ed0d3f 100644 --- a/src/Grafoscopio/GlamourPresentationModel.class.st +++ b/src/Grafoscopio/GlamourPresentationModel.class.st @@ -20,7 +20,7 @@ ui openWithSpec " Class { #name : #GlamourPresentationModel, - #superclass : #ComposablePresenter, + #superclass : #SpPresenter, #instVars : [ 'presentation', 'glmPres' @@ -31,28 +31,9 @@ Class { { #category : #specs } GlamourPresentationModel class >> defaultSpec [ - ^ SpecLayout composed add: #presentation -] - -{ #category : #example } -GlamourPresentationModel class >> example [ - |ui lay| - - ui := DynamicComposableModel new. - ui title: 'Too Much Glamour!'. - ui instantiateModels: #( - play GlamourPresentationModel - insp GlamourPresentationModel). - - ui insp presentationClass: GTInspector startOn: 42. - - lay := SpecLayout composed - newColumn: [ :c | - c newRow: [ :r | r add: #play]; - newRow: [ :r | r add: #insp ]]; - yourself. - - ui openWithSpecLayout: lay. + ^ SpBoxLayout newHorizontal + add: #presentation; + yourself ] { #category : #deprecation } @@ -72,7 +53,7 @@ GlamourPresentationModel >> initializeWidgets [ This is because we cannot create the morph and later set the presentation. So we will do all of this in the presentation: accessor. " - + self presentation. ] { #category : #accessing } diff --git a/src/Grafoscopio/GrafoscopioAbstractNode.class.st b/src/Grafoscopio/GrafoscopioAbstractNode.class.st index 19a2cc5..8869ccd 100644 --- a/src/Grafoscopio/GrafoscopioAbstractNode.class.st +++ b/src/Grafoscopio/GrafoscopioAbstractNode.class.st @@ -34,17 +34,6 @@ GrafoscopioAbstractNode >> addTag: aTag [ ] -{ #category : #exporting } -GrafoscopioAbstractNode >> asTreeNodePresenter [ - | node | - node := SpTreeNodePresenter new. - node - hasChildren: [ false ]; - children: [ {} ]; - content: self. - ^ node -] - { #category : #'as yet unclassified' } GrafoscopioAbstractNode >> content [ self subclassResponsibility diff --git a/src/Grafoscopio/GrafoscopioCodeModel.class.st b/src/Grafoscopio/GrafoscopioCodeModel.class.st index 12a2d20..4656741 100644 --- a/src/Grafoscopio/GrafoscopioCodeModel.class.st +++ b/src/Grafoscopio/GrafoscopioCodeModel.class.st @@ -30,10 +30,7 @@ GrafoscopioCodeModel >> body: anObject [ { #category : #API } GrafoscopioCodeModel >> content: aGrafoscopioNodeContent [ - - body - presentationClass: GTPlayground - startOn: (GTPlayPage new saveContent: aGrafoscopioNodeContent) + body text: aGrafoscopioNodeContent ] { #category : #'as yet unclassified' } @@ -65,5 +62,5 @@ GrafoscopioCodeModel >> extractHtmlImages [ { #category : #initialization } GrafoscopioCodeModel >> initializeWidgets [ - body := GlamourPresentationModel new. + body := self newCode. ] diff --git a/src/Grafoscopio/GrafoscopioCodeNode.class.st b/src/Grafoscopio/GrafoscopioCodeNode.class.st index dcecc81..f3a35a7 100644 --- a/src/Grafoscopio/GrafoscopioCodeNode.class.st +++ b/src/Grafoscopio/GrafoscopioCodeNode.class.st @@ -32,3 +32,8 @@ GrafoscopioCodeNode >> header [ GrafoscopioCodeNode >> shouldAskBeforeRemove [ ^ self content isNotEmpty ] + +{ #category : #'as yet unclassified' } +GrafoscopioCodeNode >> specModelClass [ + ^ GrafoscopioCodeModel +] diff --git a/src/Grafoscopio/GrafoscopioNewNotebook.class.st b/src/Grafoscopio/GrafoscopioNewNotebook.class.st index 18dc30a..9d8e4f7 100644 --- a/src/Grafoscopio/GrafoscopioNewNotebook.class.st +++ b/src/Grafoscopio/GrafoscopioNewNotebook.class.st @@ -516,13 +516,10 @@ GrafoscopioNewNotebook >> importLinkContent [ ] { #category : #initialization } -GrafoscopioNewNotebook >> initialize [ +GrafoscopioNewNotebook >> initialize [ super initialize. - self - notebook: (self createNewExample ); - title: ' New | Grafoscopio notebook'. - self notebookContent: self notebook. - + self notebook: self createNewExample. + self notebookContent: self notebook ] { #category : #initialization } @@ -564,7 +561,16 @@ GrafoscopioNewNotebook >> initializeWidgets [ add: header; add: body; add: links. - self askOkToClose: true + +] + +{ #category : #persistence } +GrafoscopioNewNotebook >> initializeWindow: aWindowPresenter [ + super initializeWindow: aWindowPresenter. + aWindowPresenter + title: ' New | Grafoscopio notebook'; + windowIcon: self taskbarIcon; + askOkToClose: true ] { #category : #persistence } diff --git a/src/Grafoscopio/GrafoscopioNode.class.st b/src/Grafoscopio/GrafoscopioNode.class.st index 9cfe8d7..e39f0b0 100644 --- a/src/Grafoscopio/GrafoscopioNode.class.st +++ b/src/Grafoscopio/GrafoscopioNode.class.st @@ -1055,9 +1055,10 @@ GrafoscopioNode >> selectMarkupSubtreesToExport [ { #category : #accessing } GrafoscopioNode >> specModelClass [ - - (self isTaggedAs: 'código') ifTrue: [^GrafoscopioCodeModel]. - (self isTaggedAs: 'johan') ifTrue:[^GrafoscopioButtonModel]. + (self isTaggedAs: 'código') + ifTrue: [ ^ GrafoscopioCodeModel ]. + (self isTaggedAs: 'johan') + ifTrue: [ ^ GrafoscopioButtonModel ]. "por defecto" ^ GrafoscopioTextModel ] diff --git a/src/Grafoscopio/GrafoscopioTextNode.class.st b/src/Grafoscopio/GrafoscopioTextNode.class.st index ab1bd89..9edf58a 100644 --- a/src/Grafoscopio/GrafoscopioTextNode.class.st +++ b/src/Grafoscopio/GrafoscopioTextNode.class.st @@ -896,10 +896,8 @@ GrafoscopioTextNode >> shouldAskBeforeRemove [ { #category : #accessing } GrafoscopioTextNode >> specModelClass [ - - (self isTaggedAs: 'código') ifTrue: [^GrafoscopioCodeModel]. - (self isTaggedAs: 'johan') ifTrue:[^GrafoscopioButtonModel]. "por defecto" + ^ GrafoscopioTextModel ]