Merge pull request #62 from plantec/OnBloc-removal

On bloc removal

src/BaselineOfToplo/BaselineOfToplo.class.st

@@ -22,8 +22,8 @@ BaselineOfToplo >> baselineForCommon: spec [
 BaselineOfToplo >> dependencies: spec [
 
 	spec
-		baseline: 'OnBloc'
-		with: [ spec repository: 'github://plantec/OnBloc/src' ].
+		baseline: 'Bloc'
+		with: [ spec repository: 'github://pharo-graphics/bloc/src' ].
 
 	spec
 		baseline: 'Album'
@@ -35,7 +35,7 @@ BaselineOfToplo >> registerPackages: spec [
 	"Core"
 	spec 
 		package: #Toplo 
-		with: [ spec requires: #( #OnBloc #Album ) ].
+		with: [ spec requires: #( #Bloc #Album ) ].
 
 	"IDE"
 	spec 

src/Toplo-LookAndFeel-Tests/SpaceTests.class.st

@@ -17,7 +17,7 @@ SpaceTests >> createDefaultButton [
 SpaceTests >> testCannotSwitchThemeDarkOrLight [
 
 	| space theme |
-	space := OBlSpace new.
+	space := BlSpace new.
 	theme := ToCustomNoDarkNoLightTestTheme new.
 	space toTheme: theme.
 	self assert: space toTheme isSupportLightAndDark not.
@@ -36,7 +36,7 @@ SpaceTests >> testChangeSpaceTheme [
 	"test button skin tokens"
 	self assert: (button skin token: #background) equals: (ToThemeLight new colorBgContainer).
 
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root addChild: button.
 
 	space toTheme: ToThemeDark new.
@@ -57,7 +57,7 @@ SpaceTests >> testChangeSpaceThemeAndDontTouchSpecifiedElementTheme [
 
 	button2 := self createDefaultButton.
 
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root addChild: button1.
 	space root addChild: button2.
 
@@ -77,7 +77,7 @@ SpaceTests >> testChangeSpaceThemeAndDontTouchSpecifiedElementTheme [
 SpaceTests >> testDefaultSpaceTheme [
 
 	| space |
-	space := OBlSpace new.
+	space := BlSpace new.
 	self assert: space toTheme class equals: ToAbstractTheme current class.
 
 ]
@@ -86,15 +86,15 @@ SpaceTests >> testDefaultSpaceTheme [
 SpaceTests >> testSpaceBackground [
 
 	| space |
-	space := OBlSpace new.
+	space := BlSpace new.
 	self assert: space root background paint color equals: space toTheme backgroundColor
 ]
 
 { #category : #tests }
 SpaceTests >> testSwitchThemeDarkOrLight [
 
 	| space |
-	space := OBlSpace new.
+	space := BlSpace new.
 	self assert: space toTheme isLight.
 
 	space switchThemeDarkOrLight.

src/Toplo-LookAndFeel-Tests/ToCustomThemeTest.class.st

@@ -32,7 +32,7 @@ ToCustomThemeTest >> testChangeSpaceTheme [
 	| button space |
 
 	button := ToButton skinType: #default.
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root addChild: button.
 
 	space toTheme: ToThemeDark new.
@@ -51,7 +51,7 @@ ToCustomThemeTest >> testChangeSpaceTheme [
 ToCustomThemeTest >> testChangeThemeAddChildInAParentInASpace [
 
 	| space button pane |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space toTheme: ToCustomNoDarkNoLightTestTheme new.
 
 	pane := ToPane horizontal.
@@ -109,7 +109,7 @@ ToCustomThemeTest >> testNoDarkAndNoLightTheme [
 ToCustomThemeTest >> testOtherThemeThanDefaultBeforeAddElement [
 
 	| space button |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space toTheme: ToCustomNoDarkNoLightTestTheme new.
 
 	button := ToButton skinType: #default.

src/Toplo-LookAndFeel-Tests/ToThemeTest.class.st

@@ -35,7 +35,7 @@ ToThemeTest >> testSkins [
 ToThemeTest >> testThemeBeforeAddElement [
 
 	| space button |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space toTheme: ToThemeDark new.
 
 	button := ToButton skinType: #default.

src/Toplo-LookAndFeel/ToLAFExamples.class.st

@@ -8,7 +8,7 @@ Class {
 ToLAFExamples class >> example_ButtonSkins [
 
 	| space button1 button2 button3 button4 button5 pane |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root layout: (BlLinearLayout vertical cellSpacing: 10).
 
 	pane := ToPane horizontal.
@@ -142,7 +142,7 @@ ToLAFExamples class >> example_ButtonSkins_Dark [
 ToLAFExamples class >> example_LabelsSkins [
 
 	| space label1 label2 label3 label4 label5 label6 |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root layout: (BlLinearLayout vertical cellSpacing: 10).
 
 	label1 := ToLabel skinType: #default.
@@ -188,7 +188,7 @@ ToLAFExamples class >> example_LabelsSkins_Dark [
 ToLAFExamples class >> example_MoreButtonSkins [
 
 	| space |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root layout: (BlFlowLayout horizontal).
 
 	1 to: 100 do:[ :i | | button1 button2 button3 button4 button5 |
@@ -231,7 +231,7 @@ ToLAFExamples class >> example_MoreButtonSkins_Dark [
 ToLAFExamples class >> example_RadioButtonSkins [
 
 	| space button1 button2 pane |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root layout: (BlLinearLayout vertical cellSpacing: 10).
 
 	pane := ToPane horizontal.
@@ -262,7 +262,7 @@ ToLAFExamples class >> example_RadioButtonSkins_Dark [
 ToLAFExamples class >> example_TitleLabelsSkins [
 
 	| space label1 label2 label3 label4 label5 |
-	space := OBlSpace new.
+	space := BlSpace new.
 	space root layout: (BlLinearLayout vertical cellSpacing: 10).
 
 	label1 := ToLabel skinType: #h1.
@@ -342,7 +342,7 @@ ToLAFExamples class >> example_themeColorCustomization [
 ToLAFExamples class >> example_toButtonChangeThemeOnClickChangeSkinOnRightClick [
 
 	| but space |
-	space := OBlSpace new.
+	space := BlSpace new.
 
 	but := ToButton skinType: #default.
 	but labelText: 'Switch to the dark theme'.

src/Toplo-Tests/OBlSpace.extension.st → src/Toplo-Tests/BlSpace.extension.st

@@ -1,7 +1,7 @@
-Extension { #name : #OBlSpace }
+Extension { #name : #BlSpace }
 
 { #category : #'*Toplo-Tests' }
-OBlSpace class >> pulseUntilEmptyTaskQueue: aSpace timeout: aDuration [
+BlSpace class >> pulseUntilEmptyTaskQueue: aSpace timeout: aDuration [
 	"Wait until a BlSpace doesn't have available tasks to execute. 
 	
 	Inspired on BlDevScripterWaitStep>>#forEmptySpaceTaskQueueTimeout:"

src/Toplo-Tests/ToNotebookTest.class.st

@@ -1,6 +1,6 @@
 Class {
 	#name : #ToNotebookTest,
-	#superclass : #OBlParameterizedTest,
+	#superclass : #BlParameterizedTest,
 	#category : #'Toplo-Tests-Widget-Notebook'
 }
 
@@ -34,12 +34,12 @@ ToNotebookTest >> testBodyFactoryIsValuedOnSelect [
 	self assert: redCount equals: 1.
 	self assert: greenCount equals: 0.
 
-	OBlSpace simulateClickOn: greenPage titleElement.
+	BlSpace simulateClickOn: greenPage titleElement.
 	self waitTestingSpaces.
 	self assert: redCount equals: 1.
 	self assert: greenCount equals: 1.
 
-	OBlSpace simulateClickOn: redPage titleElement.
+	BlSpace simulateClickOn: redPage titleElement.
 	self waitTestingSpaces.
 	self assert: redCount equals: 2.
 	self assert: greenCount equals: 1
@@ -69,7 +69,7 @@ ToNotebookTest >> testClosePage [
 	self waitTestingSpaces.
 	self assert: (aNotebook pages includes: redPage).
 
-	OBlSpace simulateClickOn: redPage closeButton.
+	BlSpace simulateClickOn: redPage closeButton.
 	self waitTestingSpaces.
 	self deny: (aNotebook pages includes: redPage).
 	self assert: greenPage isSelected.
@@ -113,7 +113,7 @@ ToNotebookTest >> testSelectPage [
 	self assert: orangePage isSelected.
 	self deny: greenPage isSelected.
 
-	OBlSpace simulateClickOn: greenPage titleElement.
+	BlSpace simulateClickOn: greenPage titleElement.
 	self waitTestingSpaces.
 	self assert: greenPage isSelected.
 	self deny: orangePage isSelected.

src/Toplo-Tests/ToObservableCollectionDataSourceTest.class.st

@@ -13,7 +13,7 @@ ToObservableCollectionDataSourceTest >> testRangeChangedNotification [
 	| datasource rangeEvent |
 	datasource := ToObservableCollectionDataSource new.
 	datasource
-		when: OBlInfiniteDataSourceItemRangeChanged
+		when: BlInfiniteDataSourceItemRangeChanged
 		do: [ :event | rangeEvent := event ].
 	datasource data: ToObservableCollection new.
 	datasource data addAll: self statesOfAmerica.
@@ -41,7 +41,7 @@ ToObservableCollectionDataSourceTest >> testRangeInsertedNotification [
 	| datasource rangeEvent |
 	datasource := ToObservableCollectionDataSource new.
 	datasource
-		when: OBlInfiniteDataSourceItemRangeInserted
+		when: BlInfiniteDataSourceItemRangeInserted
 		do: [ :event | rangeEvent := event ].
 	datasource data: ToObservableCollection new.
 	datasource data addAll: self statesOfAmerica.
@@ -60,7 +60,7 @@ ToObservableCollectionDataSourceTest >> testRangeRemovedNotification [
 	| datasource rangeEvent |
 	datasource := ToObservableCollectionDataSource new.
 	datasource
-		when: OBlInfiniteDataSourceItemRangeRemoved
+		when: BlInfiniteDataSourceItemRangeRemoved
 		do: [ :event | rangeEvent := event ].
 	datasource data: ToObservableCollection new.
 	datasource data addAll: self statesOfAmerica.
@@ -92,7 +92,7 @@ ToObservableCollectionDataSourceTest >> testWithData [
 	| datasource changedEvent |
 	datasource := ToObservableCollectionDataSource new.
 	datasource
-		when: OBlInfiniteDataSourceChanged
+		when: BlInfiniteDataSourceChanged
 		do: [ :event | changedEvent := event ].
 	datasource data:
 		(ToObservableCollection newFrom: self statesOfAmerica).

src/Toplo/BlElement.extension.st

@@ -23,7 +23,7 @@ BlElement >> openInOBlSpaceWithoutToTheme [
 		deprecated:  'Use #openInSpaceWithoutToTheme instead' 
 		transformWith: '`@receiver openInOBlSpaceWithoutToTheme' -> '`@receiver openInSpaceWithoutToTheme	'.
 
-	sp := OBlSpace new.
+	sp := BlSpace new.
 	self flag:'labordep : temporary set a nil toTheme setup, this methods should be removed when Look&Feel management will be ok'.
 	sp toTheme: nil.
 	sp root addChild: self.
@@ -36,7 +36,7 @@ BlElement >> openInOBlSpaceWithoutToTheme [
 BlElement >> openInSpaceWithoutToTheme [
 	"This is a development method : use this method when your Space cannot support ToTheme management"
 	| sp |
-	sp := OBlSpace new.
+	sp := BlSpace new.
 	self flag:'labordep : temporary set a nil toTheme setup, this methods should be removed when Look&Feel management will be ok'.
 	sp toTheme: nil.
 	sp root addChild: self.

src/Toplo/BlHost.extension.st

@@ -4,13 +4,13 @@ Extension { #name : #BlHost }
 BlHost >> oblWorld [
 
 	^ self universe spaces
-		  detect: [ :sp | sp title = self oblWorldTitle ]
+		  detect: [ :sp | sp title = 'OnBloc World' ]
 		  ifNone: [ | w |
 				self flag:'labordep : temporary set a nil toTheme setup, this methods should be removed when Look&Feel management will be ok'.
-			  w := OBlSpace new
+			  w := BlSpace new
 				  toTheme: nil;
 				  host: self;
-				  title: self oblWorldTitle;
+				  title: 'OnBloc World' ;
 				  yourself.
 				self universe attachSpace: w.
 				w ]

src/Toplo/BlSpace.extension.st

@@ -1,7 +1,50 @@
 Extension { #name : #BlSpace }
 
-{ #category : #'*Toplo' }
-BlSpace >> popupLayer [
+{ #category : #'*Toplo-LookAndFeel' }
+BlSpace >> isSupportToTheme [
+	"Development method : to check if the Space support ToTheme management"
 
-	^ self root
+	^ self root toTheme isNil
+]
+
+{ #category : #'*Toplo-LookAndFeel' }
+BlSpace >> isThemeInstalled [
+	"This method is temporary here to detect when a Theme is installed, this is dirty and a Space need to have a dresser pattern"
+
+	self flag:'laborded : this is necessary to have this state for the first instanciation, this is temporary'.
+	^ self root userData at: #isToThemeInstalled ifAbsentPut:[ false ]
+]
+
+{ #category : #'*Toplo-LookAndFeel' }
+BlSpace >> switchThemeDarkOrLight [
+	"Switch to the opposite theme : dark or light (if available)"
+	| newTheme |
+
+	(self toTheme isNil or:[self toTheme isSupportLightAndDark not]) ifTrue:[ ^ self ].
+
+	newTheme := self toTheme isLight
+			 ifTrue: [ self toTheme darkTheme ]
+			 ifFalse: [ self toTheme lightTheme ].
+
+	newTheme ifNil:[ ^ self ].
+	self toTheme: newTheme
+]
+
+{ #category : #'*Toplo-LookAndFeel' }
+BlSpace >> toTheme [
+
+	| theme |
+	theme := self root toTheme.
+
+	"Check theme installation : this is dirty and temporary"
+	(theme notNil and:[self isThemeInstalled not]) ifTrue:[ theme installOnSpace: self ].
+
+	^ theme
+]
+
+{ #category : #'*Toplo-LookAndFeel' }
+BlSpace >> toTheme: aTheme [
+
+	aTheme ifNotNil: [ aTheme installOnSpace: self ].
+	self root toTheme: aTheme
 ]