Update UI from Spec to Spec2

Pharo-IRC-GUI.package/IRCBasicChannelInput.class/instance/defaultLayout.st

@@ -0,0 +1,10 @@
+as yet unclassified
+defaultLayout
+
+	^ SpBoxLayout newTopToBottom
+		  add: (SpBoxLayout newLeftToRight
+				   add: logArea;
+				   add: users width: 200;
+				   yourself);
+		  add: input height: 25;
+		  yourself

Pharo-IRC-GUI.package/IRCBasicChannelInput.class/instance/initializeWidgets.st

@@ -1,8 +1,8 @@
 initialization
 initializeWidgets
 	super initializeWidgets.
-	users := self instantiate: ListModel.
+	users := self newList.
 	users
-		displayBlock: [ :item |
+		display: [ :item |
 			item nickname ].
 	self commandHandler channel: self channel.

Pharo-IRC-GUI.package/IRCBasicDisplay.class/class/on..st

@@ -5,5 +5,5 @@ on: anIRCConnection
 	to connect"
 	| model |
 	model := self connection: anIRCConnection.
-	model openWithSpec.
+	model open.
 	model window whenClosedDo: [ model windowCloseAction ].

Pharo-IRC-GUI.package/IRCBasicDisplay.class/instance/connection..st

@@ -1,19 +1,17 @@
 accessing
 connection: anIRCConnection
-	| newTab |
-	newTab := TabModel new.
+
 	connection := anIRCConnection.
-	self serverLog 
+	self serverLog
 		connection: anIRCConnection;
 		addSubscriber: anIRCConnection on: #handleInputAnnouncement:;
-		commandHandler: (IRCTextCommandHandler new connection: anIRCConnection).
-	anIRCConnection
-		addSubscriber: (self serverLog) on: #handleIncoming:.
+		commandHandler:
+			(IRCTextCommandHandler new connection: anIRCConnection).
+	anIRCConnection addSubscriber: self serverLog on: #handleIncoming:.
 	anIRCConnection privAnnouncer
 		when: IRCJoinedChannelAnnouncement
 		send: #handleJoinChannel:
 		to: self.
-	newTab
-		label: (anIRCConnection hostname);
-		contents: (self serverLog buildWithSpec).
-	self channelTabs addTab: newTab.
+	self channelTabs addPage: (SpNotebookPage
+			 title: anIRCConnection hostname
+			 provider: [ self serverLog ])

Pharo-IRC-GUI.package/IRCBasicDisplay.class/instance/defaultLayout.st

@@ -0,0 +1,6 @@
+accessing
+defaultLayout
+
+	^ SpBoxLayout newTopToBottom
+		  add: channelTabs;
+		  yourself

Pharo-IRC-GUI.package/IRCBasicDisplay.class/instance/handleJoinChannel..st

@@ -1,28 +1,23 @@
 as yet unclassified
 handleJoinChannel: anAnnouncement
-	| newTab chanInput |
-	newTab := TabModel new.
-	chanInput := IRCBasicChannelInput new.
+
+	| chanInput |
+	chanInput := self instantiate: IRCBasicChannelInput.
 	chanInput
-		addSubscriber: (anAnnouncement channel connection) on: #handleInputAnnouncement:;
-		channelName: (anAnnouncement channel name);
-		channel: (anAnnouncement channel);
+		addSubscriber: anAnnouncement channel connection
+		on: #handleInputAnnouncement:;
+		channelName: anAnnouncement channel name;
+		channel: anAnnouncement channel;
 		formatter: (IRCBasicTextFormatter new showOutbound: false).
-	anAnnouncement channel
-		addSubscriber: chanInput on: #handleIncoming:.
-	(anAnnouncement channel privAnnouncer)
+	anAnnouncement channel addSubscriber: chanInput on: #handleIncoming:.
+	anAnnouncement channel privAnnouncer
 		when: IRCChanInfoAnnouncement
 		send: #channelInfoUpdate:
 		to: chanInput.
-	(anAnnouncement channel privAnnouncer)
+	anAnnouncement channel privAnnouncer
 		when: IRCQuitAnnouncement
 		send: #connectionQuit:
 		to: chanInput.
-	newTab
-		label: (anAnnouncement channel name);
-		contents: chanInput buildWithSpec.
-	self channelTabs addTab: newTab.
-	newTab selected: true.
-	chanInput input textArea keyboardFocusChange: true.
-
-
+	self channelTabs addPage: (SpNotebookPage
+			 title: anAnnouncement channel name
+			 provider: [ chanInput ])

Pharo-IRC-GUI.package/IRCBasicDisplay.class/instance/initializeWidgets.st

@@ -1,11 +1,5 @@
 initialization
 initializeWidgets
-	| tabItem |
-	channelTabs := self instantiate: TabManagerModel.
-	serverLog := IRCBasicInput new.
-	tabItem := TabModel new.
-	tabItem
-		label: 'No Connection';
-		contents: serverLog buildWithSpec.
-
+	channelTabs := self newNotebook.
+	serverLog := IRCBasicInput new
 

Pharo-IRC-GUI.package/IRCBasicDisplay.class/properties.json

@@ -1,6 +1,6 @@
 {
 	"commentStamp" : "EricGade 2/23/2018 17:58",
-	"super" : "ComposableModel",
+	"super" : "SpPresenter",
 	"category" : "Pharo-IRC-GUI",
 	"classinstvars" : [ ],
 	"pools" : [ ],

Pharo-IRC-GUI.package/IRCBasicInput.class/class/connection..st

@@ -10,4 +10,4 @@ connection: anIRCConnection
 		when: IRCJoinedChannelAnnouncement 
 		send: #handleJoinChannel:
 		to: inst.
-	^ inst openWithSpec.
+	^ inst open.

Pharo-IRC-GUI.package/IRCBasicInput.class/instance/addTextToLog..st

@@ -1,5 +1,5 @@
 adding
 addTextToLog: aText
 	self logText: aText.
-	self logArea textArea appendText: aText.
+	self logArea insert: aText at: self logArea text size.
 	"self logArea sourceTextArea setScrollValue: (self logArea sourceTextArea extent)."

Pharo-IRC-GUI.package/IRCBasicInput.class/instance/defaultLayout.st

@@ -0,0 +1,7 @@
+initialization
+defaultLayout
+
+	^ SpBoxLayout newTopToBottom
+		  add: logArea;
+		  add: input height: 25;
+		  yourself

Pharo-IRC-GUI.package/IRCBasicInput.class/instance/handleInput.st → Pharo-IRC-GUI.package/IRCBasicInput.class/instance/handleInput..st

@@ -1,12 +1,11 @@
 as yet unclassified
-handleInput
+handleInput: text
 	"Action to take when the user
 	has submitted text in the input area"
-	| inputText |
 	"inputText := self input text veryDeepCopy.
 	(inputText beginsWith: '/')
 		ifTrue: [ 
 			self doCommand: inputText ]
 		ifFalse: [ self doNonCommandText: inputText ]."
-	self commandHandler parse: (self input text).
+	self commandHandler parse: text.
 	self input text: ''.

Pharo-IRC-GUI.package/IRCBasicInput.class/instance/initializeWidgets.st

@@ -1,10 +1,16 @@
 initialization
 initializeWidgets
-	logArea := self instantiate: TextModel.
-	logArea color: (Color r: 0.301 g: 0.301 b: 0.301 alpha: 1.0).
-	input := self instantiate: TextInputFieldModel.
+
+	logArea := self newText.
+	logArea beNotEditable.
+	logArea color: (Color
+			 r: 0.301
+			 g: 0.301
+			 b: 0.301
+			 alpha: 1.0).
+	input := self newTextInput.
 	ann := Announcer new.
 	formatter := IRCBasicTextFormatter new.
 	cmdHandler := IRCTextCommandHandler new.
 	cmdHandler connection: self connection.
-	self input whenTextIsAccepted: [self handleInput].
+	self input whenSubmitDo: [ :text | text ifNotEmpty: [ self handleInput: text ] ]

Pharo-IRC-GUI.package/IRCBasicInput.class/properties.json

@@ -1,6 +1,6 @@
 {
 	"commentStamp" : "EricGade 2/23/2018 18:05",
-	"super" : "ComposableModel",
+	"super" : "SpPresenter",
 	"category" : "Pharo-IRC-GUI",
 	"classinstvars" : [ ],
 	"pools" : [ ],

README.md

@@ -12,7 +12,7 @@ To easily install everything with Metacello:
 ```smalltalk
 Metacello new
     baseline: 'PharoIRC';
-    repository: 'github://darth-cheney/pharo-irc';
+    repository: 'github://badetitou/pharo-irc';
     load.
 ```
 
@@ -26,7 +26,7 @@ connection
     nickname: 'pharo-user';
     hostname: 'irc.freenode.net'.
 display := IRCBasicDisplay connection: connection.
-display openWithSpec.
+display open.
 connection connect.
 ```
 ## IRCBasicDisplay commands ##