From 1eefbd42383e86105da2338dd005d8f035dc61f7 Mon Sep 17 00:00:00 2001 From: Pablo Tesone Date: Mon, 18 Mar 2024 13:43:57 +0100 Subject: [PATCH 1/2] Fix partially Pharo #14700 - The StPharoApplication should reset the backend when starting the image. - The Spotter help should have the "shortcut" class to correct show the CMD character --- src/NewTools-Core/StPharoApplication.class.st | 12 +++++++++++- .../StSpotterHeaderPresenter.class.st | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/NewTools-Core/StPharoApplication.class.st b/src/NewTools-Core/StPharoApplication.class.st index b8104684a..99105fb80 100644 --- a/src/NewTools-Core/StPharoApplication.class.st +++ b/src/NewTools-Core/StPharoApplication.class.st @@ -77,6 +77,15 @@ StPharoApplication >> newIconProvider [ ^ StPharoDefaultIconProvider new ] +{ #category : 'private - running' } +StPharoApplication >> resetBackend [ + + | backendName | + + backendName := backend ifNil: [ self class defaultBackendName ] ifNotNil: [ backend name ]. + self useBackend: backendName. +] + { #category : 'initialization' } StPharoApplication >> resetConfiguration [ @@ -104,7 +113,8 @@ StPharoApplication >> start [ { #category : 'system startup' } StPharoApplication >> startUp: resuming [ - self resetConfiguration + self resetConfiguration. + self resetBackend. ] { #category : 'settings' } diff --git a/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st b/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st index 2f61e3a34..b413af3a5 100644 --- a/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st +++ b/src/NewTools-Spotter/StSpotterHeaderPresenter.class.st @@ -102,6 +102,7 @@ StSpotterHeaderPresenter >> initializePresenters [ self addStyle: 'stSpotterHeader'. amountLabelPresenter addStyle: 'dim'. helpLabelPresenter addStyle: 'dim'. + helpLabelPresenter addStyle: 'shortcut'. diveButtonPresenter image: (self application iconNamed: #smallForward). diveButtonPresenter eventHandler whenMouseDownDo: [ :event | From 168b35344123c9fe299abe16546ffe3c2e5e209b Mon Sep 17 00:00:00 2001 From: Esteban Lorenzano Date: Mon, 18 Mar 2024 14:47:13 +0100 Subject: [PATCH 2/2] format --- src/NewTools-Core/StPharoApplication.class.st | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NewTools-Core/StPharoApplication.class.st b/src/NewTools-Core/StPharoApplication.class.st index 99105fb80..60898ec27 100644 --- a/src/NewTools-Core/StPharoApplication.class.st +++ b/src/NewTools-Core/StPharoApplication.class.st @@ -79,10 +79,11 @@ StPharoApplication >> newIconProvider [ { #category : 'private - running' } StPharoApplication >> resetBackend [ - | backendName | - backendName := backend ifNil: [ self class defaultBackendName ] ifNotNil: [ backend name ]. + backendName := backend + ifNil: [ self class defaultBackendName ] + ifNotNil: [ backend name ]. self useBackend: backendName. ]