Merge pull request #41 from hpi-swa-teaching/feature/menu-bar

Add menu-bar
hpi-swa-teaching · May 18, 2020 · f56673a · f56673a
2 parents 6052bd1 + eae0b1b
commit f56673a
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 12 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest ]
-        smalltalk: [ Squeak64-5.3, Squeak64-5.2, Squeak64-5.1 ]
+        smalltalk: [ Squeak64-5.3, Squeak64-5.2 ]
         experimental: [false]
         include:
           - smalltalk: Squeak64-trunk

diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ os:
 smalltalk:
   - Squeak-trunk
   - Squeak-5.2
-  - Squeak-5.1
 
 matrix:
   allow_failures:

diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditor.class/instance/buildWith..st b/packages/MarkdownEditor-Core.package/MarkdownEditor.class/instance/buildWith..st
@@ -1,11 +1,9 @@
 building
 buildWith: aBuilder
-	
+
 	| windowSpec |
-	windowSpec := aBuilder pluggableWindowSpec new
-		model: self;
-		children: {self buildEditorTextMorphWith: aBuilder};
-		label: 'Markdown Editor';
-		yourself.
-	^ aBuilder build: windowSpec
-
+	windowSpec := self buildWindowWith: aBuilder specs: {
+		(LayoutFrame fractions: (0 @ 0 corner: 1 @ 0) offsets: (0 @ 0 corner: 0 @ (MarkdownEditorMenuBar height))) -> [MarkdownEditorMenuBar buildWith: aBuilder].
+		(LayoutFrame fractions: (0 @ 0 corner: 1 @ 1) offsets: (0 @ (MarkdownEditorMenuBar height) corner: 0 @ 0)) -> [self buildEditorTextMorphWith: aBuilder]}.
+
+	 ^ aBuilder build: windowSpec
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditor.class/instance/windowTitle.st b/packages/MarkdownEditor-Core.package/MarkdownEditor.class/instance/windowTitle.st
@@ -0,0 +1,4 @@
+accessing
+windowTitle
+
+	^ 'Markdown Editor'
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditor.class/methodProperties.json b/packages/MarkdownEditor-Core.package/MarkdownEditor.class/methodProperties.json
@@ -5,6 +5,7 @@
 		"open" : "kgr 4/29/2019 13:18" },
 	"instance" : {
 		"buildEditorTextMorphWith:" : "jko 6/25/2019 20:37",
-		"buildWith:" : "lpf 6/13/2019 15:28",
+		"buildWith:" : "MK 5/11/2020 14:33",
 		"markdownText" : "lpf 6/13/2019 15:26",
-		"markdownText:" : "lpf 6/13/2019 15:27" } }
+		"markdownText:" : "lpf 6/13/2019 15:27",
+		"windowTitle" : "MK 5/11/2020 19:00" } }
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/README.md b/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/README.md
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/class/buildWith..st b/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/class/buildWith..st
@@ -0,0 +1,25 @@
+as yet unclassified
+buildWith: aBuilder
+
+	^ aBuilder pluggablePanelSpec new
+		layout: #horizontal;
+		children: {
+			aBuilder pluggableButtonSpec new
+				label: 'new';
+				model: self;
+				enabled: true;
+				action: 'MarkdownEditor new' asSymbol;
+				yourself.
+			aBuilder pluggableButtonSpec new
+				label: 'Save';
+				model: self;
+				enabled: false;
+				action: #showNextTip;
+				yourself.
+			aBuilder pluggableButtonSpec new
+				label: 'Options';
+				model: self;
+				action: #close;
+				enabled: false;
+				yourself };
+		yourself
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/class/height.st b/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/class/height.st
@@ -0,0 +1,4 @@
+as yet unclassified
+height
+
+	^ 2 * Preferences standardButtonFont height
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/instance/height.st b/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/instance/height.st
@@ -0,0 +1,4 @@
+as yet unclassified
+height
+
+	^ Preferences standardButtonFont height * 2
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/methodProperties.json b/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/methodProperties.json
@@ -0,0 +1,6 @@
+{
+	"class" : {
+		"buildWith:" : "MK 5/11/2020 14:36",
+		"height" : "MK 5/11/2020 14:36" },
+	"instance" : {
+		"height" : "MK 5/11/2020 14:29" } }
diff --git a/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/properties.json b/packages/MarkdownEditor-Core.package/MarkdownEditorMenuBar.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "MarkdownEditor-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "MarkdownEditorMenuBar",
+	"pools" : [
+		 ],
+	"super" : "Object",
+	"type" : "normal" }
diff --git a/packages/MarkdownEditor-Tests.package/MarkdownEditorTest.class/instance/testMenuBarExists.st b/packages/MarkdownEditor-Tests.package/MarkdownEditorTest.class/instance/testMenuBarExists.st
@@ -0,0 +1,4 @@
+tests - window
+testMenuBarExists
+
+	self assert: (window submorphs select: [:each | each class = PluggablePanelMorph]) size > 0
diff --git a/packages/MarkdownEditor-Tests.package/MarkdownEditorTest.class/methodProperties.json b/packages/MarkdownEditor-Tests.package/MarkdownEditorTest.class/methodProperties.json
@@ -8,6 +8,7 @@
 		"testApplyingThemeDoesNotThrowErrorForInlineStyling" : "7/1/2019 15:19:29",
 		"testBuildingEditorReturnsWindow" : "lpf 6/13/2019 15:24",
 		"testBuildingEditorTextMorphReturnsSpec" : "lpf 6/13/2019 15:29",
+		"testMenuBarExists" : "MK 5/14/2020 13:04",
 		"testMenuOpenCommand" : "jst 5/11/2019 19:56",
 		"testTextPersistenceForBlockStyling" : "jst 6/29/2019 14:39",
 		"testTextPersistenceForInlineStyling" : "jst 6/29/2019 14:37",