diff --git a/packages/visualgst/GtkExtend/GtkAccelGroup.st b/packages/visualgst/GtkExtend/GtkAccelGroup.st deleted file mode 100644 index 0c699c2..0000000 --- a/packages/visualgst/GtkExtend/GtkAccelGroup.st +++ /dev/null @@ -1,34 +0,0 @@ -GTK.GtkAccelGroup class extend [ - - acceleratorParse: accelerator [ - - - | cAccKey cAccMod | - cAccKey := CInt gcValue: 0. - cAccMod := CInt gcValue: 0. - GTK.Gtk acceleratorParse: accelerator acceleratorKey: cAccKey acceleratorMods: cAccMod. - ^ {cAccKey value. cAccMod value} - ] - - acceleratorGroup: aGtkAccelGroup accelerator: aString path: aPathString [ - - - | result | - result := self acceleratorParse: aString. - GTK.GtkAccelMap addEntry: aPathString accelKey: result first accelMods: result second - ] -] - -GTK.GtkAccelGroup extend [ - - append: anArray [ - - - anArray do: [ :each | - self class - acceleratorGroup: self - accelerator: each first - path: each second ] - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkButton.st b/packages/visualgst/GtkExtend/GtkButton.st deleted file mode 100644 index ac9ab3d..0000000 --- a/packages/visualgst/GtkExtend/GtkButton.st +++ /dev/null @@ -1,11 +0,0 @@ -GTK.GtkButton class extend [ - - label: aString onPressedSend: aSymbol to: anObject [ - - - ^ (GTK.GtkButton newWithLabel: aString) - connectSignal: 'pressed' to: anObject selector: aSymbol userData: nil; - yourself - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkContainer.st b/packages/visualgst/GtkExtend/GtkContainer.st deleted file mode 100644 index 7a01939..0000000 --- a/packages/visualgst/GtkExtend/GtkContainer.st +++ /dev/null @@ -1,13 +0,0 @@ -GTK.GtkContainer extend [ - - focusChildFor: aGtkWindow [ - - - | child parent | - parent := child := self. - [ (child := parent getFocusChild) isNil not ] whileTrue: [ - parent := child ]. - ^ aGtkWindow getFocus = parent - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkDialog.st b/packages/visualgst/GtkExtend/GtkDialog.st deleted file mode 100644 index 9b3ead4..0000000 --- a/packages/visualgst/GtkExtend/GtkDialog.st +++ /dev/null @@ -1,64 +0,0 @@ -GTK.GtkDialog extend [ - | codeblock destroy | - - runNonBlocking [ - - - destroy := false. - self - setModal: true; - connectSignal: 'response' to: self selector: #onDialog:response: userData: nil; - run - ] - - runNonBlockingAndDo: aCodeblock [ - - - destroy := false. - codeblock := aCodeblock. - self runNonBlocking - ] - - runNonBlockingAndDestroy [ - - - destroy := true. - self runNonBlocking - ] - - runBlocking [ - - - destroy := false. - self - setModal: false; - connectSignal: 'response' to: self selector: #onDialog:response: userData: nil; - run - ] - - runBlockingAndDo: aCodeblock [ - - - destroy := false. - codeblock := aCodeblock. - self runBlocking - ] - - runBlockingAndDestroy [ - - - destroy := true. - self - setModal: false; - connectSignal: 'response' to: self selector: #onDialog:response: userData: nil; - run - ] - - onDialog: aGtkDialog response: anInteger [ - - - destroy ifTrue: [ self destroy ]. - codeblock isNil ifFalse: [ codeblock value: aGtkDialog value: anInteger ] - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkFileChooserDialog.st b/packages/visualgst/GtkExtend/GtkFileChooserDialog.st deleted file mode 100644 index d4e19c4..0000000 --- a/packages/visualgst/GtkExtend/GtkFileChooserDialog.st +++ /dev/null @@ -1,47 +0,0 @@ -GTK.GtkFileChooserDialog class extend [ - - for: aGtkFileChooserAction title: aString parent: aGtkWidget button: aGtkStock [ - - - ^ self - new: aString - parent: aGtkWidget - action: aGtkFileChooserAction - varargs: {GTK.Gtk gtkStockCancel. - GTK.Gtk gtkResponseCancel. - aGtkStock. - GTK.Gtk gtkResponseAccept. - nil} - ] - - save: aString parent: aGtkWidget [ - - - ^ self - for: GTK.Gtk gtkFileChooserActionSave - title: aString - parent: aGtkWidget - button: GTK.Gtk gtkStockSave - ] - - load: aString parent: aGtkWidget [ - - - ^ self - for: GTK.Gtk gtkFileChooserActionOpen - title: aString - parent: aGtkWidget - button: GTK.Gtk gtkStockOpen - ] - - selectFolder: aString parent: aGtkWidget [ - - - ^ self - for: GTK.Gtk gtkFileChooserActionSelectFolder - title: aString - parent: aGtkWidget - button: GTK.Gtk gtkStockOpen - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkListStore.st b/packages/visualgst/GtkExtend/GtkListStore.st deleted file mode 100644 index a55ae82..0000000 --- a/packages/visualgst/GtkExtend/GtkListStore.st +++ /dev/null @@ -1,50 +0,0 @@ -GTK.GtkListStore extend [ - - appendItem: anArray [ - - - | iter | - iter := self append. - self at: iter put: anArray. - ^ iter - ] - - prependItem: anArray [ - - - | iter | - iter := self prepend. - self at: iter put: anArray. - ^ iter - ] - - itersDo: aBlock [ - - - | iter | - ((iter := self getIterFirst) isNil or: [ (self iterIsValid: iter) not ] ) ifTrue: [ ^ nil ]. - aBlock value: iter. - [ self iterNext: iter ] whileTrue: [ aBlock value: iter ] - ] - - do: aBlock [ - - - self itersDo: [ :iter | - aBlock value: (self at: iter) value: iter ] - ] - - lastIter [ - - - | lastIter iter path | - iter := lastIter := GTK.GtkTreeIter new. - path := GTK.GtkTreePath newFirst. - [ self getIter: iter path: path ] whileTrue: [ - lastIter := iter. - iter := GTK.GtkTreeIter new. - path next ]. - ^ lastIter - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkMenu.st b/packages/visualgst/GtkExtend/GtkMenu.st deleted file mode 100644 index fcfc867..0000000 --- a/packages/visualgst/GtkExtend/GtkMenu.st +++ /dev/null @@ -1,21 +0,0 @@ -GTK.GtkMenu extend [ - - appendSeparator [ - - - self append: GTK.GtkMenuItem new - ] - - appendMenuItems: anArray [ - - - anArray do: [ :each | - self append: - (each isEmpty - ifTrue: [ GTK.GtkMenuItem new ] - ifFalse: [ (GTK.GtkMenuItem newWithLabel: (each at: 1)) - connectSignal: 'activate' to: (each at: 2) selector: (each at: 3) userData: nil; - yourself ]) ] - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkMenuItem.st b/packages/visualgst/GtkExtend/GtkMenuItem.st deleted file mode 100644 index 848afab..0000000 --- a/packages/visualgst/GtkExtend/GtkMenuItem.st +++ /dev/null @@ -1,33 +0,0 @@ -GTK.GtkMenuItem class extend [ - - menuItem: aString connectTo: anObject selector: aSymbol userData: userData [ - - - ^ (self newWithLabel: aString) - connectSignal: 'activate' to: anObject selector: aSymbol userData: userData; - yourself - ] - - menuItem: aString connectTo: anObject selector: aSymbol [ - - - ^ self menuItem: aString connectTo: anObject selector: aSymbol userData: nil - ] - - menuItem: aString accelPath: anAccelPathString [ - - - ^ (self newWithLabel: aString) - setAccelPath: anAccelPathString; - yourself - ] - - menuItem: aString accelPath: anAccelPathString connectTo: anObject selector: aSymbol [ - - - ^ (self menuItem: aString accelPath: anAccelPathString) - connectSignal: 'activate' to: anObject selector: aSymbol userData: nil; - yourself - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkScrolledWindow.st b/packages/visualgst/GtkExtend/GtkScrolledWindow.st deleted file mode 100644 index 0a4cb86..0000000 --- a/packages/visualgst/GtkExtend/GtkScrolledWindow.st +++ /dev/null @@ -1,12 +0,0 @@ -GTK.GtkScrolledWindow class extend [ - - withChild: aGtkWidget [ - - - ^ (GTK.GtkScrolledWindow new: nil vadjustment: nil) - add: aGtkWidget; - setPolicy: GTK.Gtk gtkPolicyAutomatic vscrollbarPolicy: GTK.Gtk gtkPolicyAutomatic; - yourself - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkTextBuffer.st b/packages/visualgst/GtkExtend/GtkTextBuffer.st deleted file mode 100644 index c17ed02..0000000 --- a/packages/visualgst/GtkExtend/GtkTextBuffer.st +++ /dev/null @@ -1,49 +0,0 @@ -GTK.GtkTextBuffer extend [ - - text [ - - - ^ self getText: self getStartIter end: self getEndIter includeHiddenChars: false - ] - - applyTagByName: aSymbol startOffset: aStartInteger endOffset: anEndInteger [ - - - | end start | - start := GTK.GtkTextIter new. - end := GTK.GtkTextIter new. - self getIterAtOffset: start charOffset: aStartInteger. - self getIterAtOffset: end charOffset: anEndInteger. - self applyTagByName: aSymbol start: start end: end - ] - - getIterAtOffset: offset [ - - - | result | - result := GTK.GtkTextIter new. - self getIterAtOffset: result charOffset: offset. - ^ result - ] - - iterOfSelectedText [ - - - | iter | - self getHasSelection - ifTrue: [ iter := self getSelectionBounds ifNil: [ ^ self ]. - (iter at: 1) getOffset > ((iter at: 2) getOffset) - ifTrue: [ iter swap: 1 with: 2 ] ] - ifFalse: [ iter := {self getStartIter. self getEndIter} ]. - ^ iter - ] - - selectedText [ - - - | iter | - iter := self iterOfSelectedText. - ^ self getText: (iter at: 1) end: (iter at: 2) includeHiddenChars: false - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkTreeModel.st b/packages/visualgst/GtkExtend/GtkTreeModel.st deleted file mode 100644 index 3b319b8..0000000 --- a/packages/visualgst/GtkExtend/GtkTreeModel.st +++ /dev/null @@ -1,66 +0,0 @@ -GTK.GtkTreeModel extend [ - - at: aGtkTreeIter [ - - - | values | - aGtkTreeIter ifNil: [ ^ nil ]. - values := OrderedCollection new. - 0 to: self getNColumns - 1 do: [ :column | - values add: (self at: aGtkTreeIter column: column) ]. - ^ values - ] - - at: aGtkTreeIter column: anInteger [ - - - ^ self getOop: aGtkTreeIter column: anInteger - ] - - at: aGtkTreeIter column: anInteger put: anObject [ - - - self setOop: aGtkTreeIter column: anInteger value: anObject - ] - - at: aGtkTreeIter put: anArray [ - - - 1 to: anArray size do: [ :i | - self at: aGtkTreeIter column: i - 1 put: (anArray at: i) ] - ] - - at: aGtkTreeIter do: aBlock [ - - - (self at: aGtkTreeIter) do: aBlock - ] - - itersDo: aBlock iter: aGtkTreeIter [ - - - | childIter | - childIter := GTK.GtkTreeIter new. - aBlock value: aGtkTreeIter. - (self iterChildren: childIter parent: aGtkTreeIter) ifTrue: [ self itersDo: aBlock iter: childIter ]. - [ self iterNext: aGtkTreeIter ] whileTrue: [ - aBlock value: aGtkTreeIter. - (self iterChildren: childIter parent: aGtkTreeIter) ifTrue: [ self itersDo: aBlock iter: childIter ] ] - ] - - itersDo: aBlock [ - - - | iter child | - ((iter := self getIterFirst) isNil or: [ (self iterIsValid: iter) not ] ) ifTrue: [ ^ nil ]. - self itersDo: aBlock iter: iter - ] - - do: aBlock [ - - - self itersDo: [ :iter | - aBlock value: (self at: iter) value: iter ] - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkTreeStore.st b/packages/visualgst/GtkExtend/GtkTreeStore.st deleted file mode 100644 index 5e4c2ff..0000000 --- a/packages/visualgst/GtkExtend/GtkTreeStore.st +++ /dev/null @@ -1,47 +0,0 @@ -GTK.GtkTreeStore extend [ - - itersDo: aBlock iter: aGtkTreeIter [ - - - | childIter | - childIter := GTK.GtkTreeIter new. - aBlock value: aGtkTreeIter. - (self iterChildren: childIter parent: aGtkTreeIter) ifTrue: [ self itersDo: aBlock iter: childIter ]. - [ self iterNext: aGtkTreeIter ] whileTrue: [ - aBlock value: aGtkTreeIter. - (self iterChildren: childIter parent: aGtkTreeIter) ifTrue: [ self itersDo: aBlock iter: childIter ] ] - ] - - itersDo: aBlock [ - - - | iter child | - ((iter := self getIterFirst) isNil or: [ (self iterIsValid: iter) not ] ) ifTrue: [ ^ nil ]. - self itersDo: aBlock iter: iter - ] - - do: aBlock [ - - - self itersDo: [ :iter | - aBlock value: (self at: iter) value: iter ] - ] - - appendItem: anArray [ - - - ^ self append: nil item: anArray - ] - - append: aGtkTreeIter item: anArray [ - - - | iter | - iter := GTK.GtkTreeIter new. - self - append: iter parent: aGtkTreeIter; - at: iter put: anArray. - ^ iter - ] -] - diff --git a/packages/visualgst/GtkExtend/GtkTreeView.st b/packages/visualgst/GtkExtend/GtkTreeView.st deleted file mode 100644 index d31da25..0000000 --- a/packages/visualgst/GtkExtend/GtkTreeView.st +++ /dev/null @@ -1,66 +0,0 @@ -GTK.GtkTreeView class extend [ - - newWithTextColumn: aGtkModel title: aString [ - - - | view col render | - view := self new - setModel: aGtkModel; - yourself. - col := (GtkTreeViewColumn new) - packStart: (render := GTK.GtkCellRendererText new) expand: true; - addAttribute: render attribute: 'text' column: 0; - setTitle: aString; - yourself. - view insertColumn: col position: -1. - ^ view - ] - - newWithSortedTextColumn: aGtkModel title: aString [ - - - | view col render | - view := self new - setModel: aGtkModel; - yourself. - col := (GtkTreeViewColumn new) - packStart: (render := GtkCellRendererText new) expand: true; - addAttribute: render attribute: 'text' column: 0; - setTitle: aString; - setSortIndicator: true; - setSortColumnId: 0; - setSortOrder: Gtk gtkSortAscending; - yourself. - view - insertColumn: col position: -1. - ^ view - ] -] - -GTK.GtkTreeView extend [ - - hasSelectedItem [ - - - ^ self getSelection getSelected isNil not - ] - - numberOfItems [ - - - ^ self getModel iterNChildren: nil - ] - - selectedIter [ - - - ^ self getSelection getSelected - ] - - selectedIndex [ - - - self hasSelectedItem ifFalse: [ self error: 'Nothing is selected' ]. - ^ (self getModel getPath: self selectedIter) getIndices value + 1 - ] -] diff --git a/packages/visualgst/GtkExtend/GtkTextWidget.st b/packages/visualgst/GtkTextWidget.st similarity index 100% rename from packages/visualgst/GtkExtend/GtkTextWidget.st rename to packages/visualgst/GtkTextWidget.st diff --git a/packages/visualgst/Tetris/Tetris.st b/packages/visualgst/Tetris/Tetris.st index 20d2d62..ac71c0b 100644 --- a/packages/visualgst/Tetris/Tetris.st +++ b/packages/visualgst/Tetris/Tetris.st @@ -123,17 +123,17 @@ GtkMainWindow subclass: Tetris [ yourself ] - clearArea: aGtkAllocation on: aCairoContext [ + clearArea: aGtkAllocation [ | res | res := aGtkAllocation castTo: (CIntType arrayType: 4). - Cairo.Cairo - rectangle: aCairoContext x: 0 y: 0 width: (res at: 2) height: (res at: 3); - setOperator: aCairoContext operator: Cairo.Cairo operatorClear; - fill: aCairoContext; - setOperator: aCairoContext operator: Cairo.Cairo operatorOver + canvas saveWhile: [ + canvas + rectangle: ((address@hidden) extent: ((res at: 2) @ (res at: 3))); + operator: #clear; + fill ] ] drawArea [ @@ -187,17 +187,14 @@ GtkMainWindow subclass: Tetris [ expose: aGtkWidget event: aGdkEventExpose [ - | cr | - - cr := (GTK.Gdk cairoCreate: aGtkWidget getWindow). - canvas := Cairo.CairoContext context: cr. - - self - clearArea: aGtkWidget getAllocation on: cr; - drawArea; - drawGrid; - drawScore. - + aGtkWidget getWindow withContextDo: [ :cr | + canvas := cr. + self + clearArea: aGtkWidget getAllocation; + drawArea; + drawGrid; + drawScore. + ]. ^ true ] diff --git a/packages/visualgst/package.xml b/packages/visualgst/package.xml index cfa16a2..5f36ed5 100644 --- a/packages/visualgst/package.xml +++ b/packages/visualgst/package.xml @@ -8,27 +8,13 @@ VisualGST - GTK.Gtk gstGtkInit. - VisualGST open. + VisualGST.VisualGST open. GTK.Gtk main Tests/ExtractLiteralsTest.st - GtkExtend/GtkMenuItem.st - GtkExtend/GtkTextWidget.st - GtkExtend/GtkFileChooserDialog.st - GtkExtend/GtkAccelGroup.st - GtkExtend/GtkDialog.st - GtkExtend/GtkMenu.st - GtkExtend/GtkTextBuffer.st - GtkExtend/GtkTreeView.st - GtkExtend/GtkButton.st - GtkExtend/GtkScrolledWindow.st - GtkExtend/GtkTreeModel.st - GtkExtend/GtkListStore.st - GtkExtend/GtkTreeStore.st - GtkExtend/GtkContainer.st + GtkTextWidget.st Notification/AbstractEvent.st Notification/AddedEvent.st @@ -67,12 +53,6 @@ Debugger/GtkDebugger.st Project/Author.st - Project/Licence.st - Project/MIT.st - Project/BSD.st - Project/GPL.st - Project/LGPL.st - Project/GPLV3.st BrowserState.st NamespaceState.st @@ -174,20 +154,7 @@ GtkMethodSUnitModel.st SUnit/GtkSUnit.st - GtkExtend/GtkMenuItem.st - GtkExtend/GtkTextWidget.st - GtkExtend/GtkFileChooserDialog.st - GtkExtend/GtkAccelGroup.st - GtkExtend/GtkDialog.st - GtkExtend/GtkMenu.st - GtkExtend/GtkTextBuffer.st - GtkExtend/GtkTreeView.st - GtkExtend/GtkButton.st - GtkExtend/GtkScrolledWindow.st - GtkExtend/GtkTreeModel.st - GtkExtend/GtkListStore.st - GtkExtend/GtkTreeStore.st - GtkExtend/GtkContainer.st + GtkTextWidget.st Notification/AbstractEvent.st Notification/AddedEvent.st @@ -295,12 +262,6 @@ Debugger/GtkStackInspectorView.st Project/Author.st - Project/Licence.st - Project/MIT.st - Project/BSD.st - Project/GPL.st - Project/LGPL.st - Project/GPLV3.st BrowserState.st NamespaceState.st