completedUser story about multiple dictionaries

hpi-swa-teaching · Jun 4, 2019 · 8acd95b · 8acd95b
1 parent 7a39f91
commit 8acd95b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 17 deletions.
diff --git a/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/addDictionary.st b/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/addDictionary.st
@@ -0,0 +1,4 @@
+dictionary loading
+addDictionary
+
+	self spellchecker hunspell addDictionary: self dictionaryPath name
diff --git a/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/buildWith..st b/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/buildWith..st
@@ -1,7 +1,7 @@
 toolbuilder
 buildWith: builder
 
-	| windowSpec ignoredWordsListSpec removeButtonSpec languageListSpec  addDictionaryButtonSpec |
+	| windowSpec ignoredWordsListSpec removeButtonSpec languageListSpec  importDictionaryButtonSpec loadLanguageButtonSpec addDictionaryButtonSpec |
 	windowSpec := builder pluggableWindowSpec new.
 	windowSpec
 		model: self;
@@ -12,7 +12,7 @@ buildWith: builder
 	ignoredWordsListSpec := builder pluggableListSpec new.
 	ignoredWordsListSpec 
 		model: self;
-		frame: (0@0 corner: 0.5@0.94);
+		frame: (0@0 corner: 0.5@0.88);
 		list: #ignoredWords;
 		getSelected: #selectedWord;
 		setSelected: #selectedWord:.
@@ -21,7 +21,7 @@ buildWith: builder
 	languageListSpec := builder pluggableListSpec new.
 	languageListSpec 
 		model: self;
-		frame: (0.5@0 corner: 1@0.94);
+		frame: (0.5@0 corner: 1@0.88);
 		list: #loadedLanguages;
 		getSelected: #selectedLanguage;
 		setSelected: #selectedLanguage:.
@@ -32,14 +32,30 @@ buildWith: builder
 		model: self;
 		label: 'remove word';
 		action: #removeFromIgnoredWords;
-		frame: (0.1@0.94 corner: 0.4@1). 
+		frame: (0.1@0.88 corner: 0.4@0.94). 
 	windowSpec children add: removeButtonSpec.
 
-	addDictionaryButtonSpec := builder pluggableButtonSpec new.
-	addDictionaryButtonSpec 
+	importDictionaryButtonSpec := builder pluggableButtonSpec new.
+	importDictionaryButtonSpec 
 		model: self;
 		label: 'import Dictionary';
 		action: #importDictionary;
+		frame: (0.1@0.94 corner: 0.4@1). 
+	windowSpec children add: importDictionaryButtonSpec.
+
+	loadLanguageButtonSpec := builder pluggableButtonSpec new.
+	loadLanguageButtonSpec 
+		model: self;
+		label: 'load selected Language';
+		action: #loadLanguage;
+		frame: (0.6@0.88 corner: 0.9@0.94). 
+	windowSpec children add: loadLanguageButtonSpec.
+
+	addDictionaryButtonSpec := builder pluggableButtonSpec new.
+	addDictionaryButtonSpec 
+		model: self;
+		label: 'add selected Dictionary';
+		action: #addDictionary;
 		frame: (0.6@0.94 corner: 0.9@1). 
 	windowSpec children add: addDictionaryButtonSpec.
 

diff --git a/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/loadLanguage.st b/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/loadLanguage.st
@@ -1,8 +1,10 @@
 dictionary loading
 loadLanguage
 
-	self spellchecker 
-		dictionaryPath: self dictionaryPath name;
-		affixPath: self affixPath name;
-		reloadHunspellHandle;
-		reloadAddedWords
+	(self selectedLanguage) ifNotNil: [
+		self spellchecker 
+			dictionaryPath: self dictionaryPath name;
+			affixPath: self affixPath name;
+			reloadHunspellHandle;
+			reloadAddedWords.
+		]
diff --git a/...ges/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/selectedLanguage..st b/...ges/Spellcheck-Core.package/SPCDictionaryManagementUI.class/instance/selectedLanguage..st
@@ -3,5 +3,5 @@ selectedLanguage: anObject
 
 	anObject ifNotNil:[
 		selectedLanguage := anObject.
-		self changed: #selectedLanguage; 
-			 loadLanguage]
+		self changed: #selectedLanguage.
+		]
diff --git a/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/methodProperties.json b/packages/Spellcheck-Core.package/SPCDictionaryManagementUI.class/methodProperties.json
@@ -6,21 +6,22 @@
 		"registerInWorldMenu" : "mka 6/3/2019 21:50",
 		"unregisterInWorldMenu" : "mka 6/3/2019 21:50" },
 	"instance" : {
+		"addDictionary" : "mka 6/4/2019 11:27",
 		"affixFileName" : "ow 7/12/2018 16:53",
 		"affixPath" : "ow 7/12/2018 17:04",
-		"buildWith:" : "mka 6/4/2019 10:36",
+		"buildWith:" : "mka 6/4/2019 11:25",
 		"dictionaryFileName" : "ow 7/12/2018 16:53",
 		"dictionaryPath" : "ow 7/12/2018 17:03",
 		"ignoredWords" : "ow 7/25/2018 20:12",
 		"importDictionary" : "mka 6/4/2019 10:38",
 		"initialize" : "ow 7/25/2018 20:12",
-		"loadLanguage" : "ow 7/25/2018 21:02",
+		"loadLanguage" : "mka 6/4/2019 11:23",
 		"loadedLanguages" : "ow 7/12/2018 16:41",
 		"open" : "RS 7/22/2018 20:56",
 		"removeFromIgnoredWords" : "ow 7/25/2018 20:12",
 		"selectUsedLanguage" : "RS 7/22/2018 21:17",
 		"selectedLanguage" : "ow 7/12/2018 09:35",
-		"selectedLanguage:" : "ow 7/23/2018 17:25",
+		"selectedLanguage:" : "mka 6/4/2019 11:22",
 		"selectedLanguageDirectoryPath" : "ow 7/12/2018 16:56",
 		"selectedWord" : "ow 7/5/2018 17:05",
 		"selectedWord:" : "RS 7/22/2018 20:52",

diff --git a/packages/Spellcheck-Core.package/monticello.meta/version b/packages/Spellcheck-Core.package/monticello.meta/version