From f05952205fe5d861ce272ef377bc5ad96284d577 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 2 Sep 2010 02:01:19 -0700
Subject: Removed broken edit button from spell check prefs, added a new debug
 setting DicDownloadBaseURL

---
 linden/indra/newview/app_settings/settings.xml       | 11 +++++++++++
 linden/indra/newview/lggdicdownload.cpp              |  5 +++--
 linden/indra/newview/lgghunspell_wrapper.cpp         | 20 +++++++++-----------
 .../default/xui/en-us/panel_preferences_advanced.xml |  6 +++---
 4 files changed, 26 insertions(+), 16 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f096811..894473b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1537,6 +1537,17 @@
 
   <!-- Begin: Spellcheck & Translation -->
 
+  <key>DicDownloadBaseURL</key>
+  <map>
+    <key>Comment</key>
+    <string>Base url for download dictionaries</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>http://www.imprudenceviewer.org/app/dics/</string>
+  </map>
   <key>EmeraldEnableAutoCorrect</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/lggdicdownload.cpp b/linden/indra/newview/lggdicdownload.cpp
index bd383e2..5b8b13a 100644
--- a/linden/indra/newview/lggdicdownload.cpp
+++ b/linden/indra/newview/lggdicdownload.cpp
@@ -44,6 +44,7 @@
 #include "llcombobox.h"
 #include "llview.h"
 #include "llprefsadvanced.h"
+#include "llviewercontrol.h"
 #include "llhttpclient.h"
 #include "llbufferstream.h"
 
@@ -128,8 +129,8 @@ void lggDicDownloadFloater::onClickDownload(void* data)
 			{
 				index--;
 				std::string newDict(self->sNames[index]);
-				LLHTTPClient::get("http://www.imprudenceviewer.org/app/dics/"+newDict+".aff", new EmeraldDicDownloader(self,newDict+".aff"));
-				LLHTTPClient::get("http://www.imprudenceviewer.org/app/dics/"+newDict+".dic", new EmeraldDicDownloader(NULL,newDict+".dic"));
+				LLHTTPClient::get(gSavedSettings.getString("DicDownloadBaseURL")+newDict+".aff", new EmeraldDicDownloader(self,newDict+".aff"));
+				LLHTTPClient::get(gSavedSettings.getString("DicDownloadBaseURL")+newDict+".dic", new EmeraldDicDownloader(NULL,newDict+".dic"));
 				
 				LLButton* butt = self->getChild<LLButton>("Emerald_dic_download");
 				if(butt)
diff --git a/linden/indra/newview/lgghunspell_wrapper.cpp b/linden/indra/newview/lgghunspell_wrapper.cpp
index ff5a3d0..5879bac 100644
--- a/linden/indra/newview/lgghunspell_wrapper.cpp
+++ b/linden/indra/newview/lgghunspell_wrapper.cpp
@@ -503,7 +503,7 @@ void lggHunSpell_Wrapper::setNewDictionary(std::string newDict)
 	myHunspell = new Hunspell(dicaffpath.c_str(),dicdicpath.c_str());
 	llinfos << "Adding custom dictionary " << llendl;
 	createCustomDic();
-	addDictionary("emerald_custom");
+	addDictionary("custom");
 	std::vector<std::string> toInstall = getInstalledDicts();
 	for(int i =0;i<(int)toInstall.size();i++)
 		addDictionary(toInstall[i]);
@@ -513,7 +513,7 @@ void lggHunSpell_Wrapper::setNewDictionary(std::string newDict)
 void lggHunSpell_Wrapper::createCustomDic()
 {
 	std::string filename(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
-		"dictionaries", "emerald_custom.dic"));
+		"dictionaries", "custom.dic"));
 	if(!gDirUtilp->fileExists(filename))
 	{
 		llofstream export_file;	
@@ -527,7 +527,7 @@ void lggHunSpell_Wrapper::addWordToCustomDictionary(std::string wordToAdd)
 {
 	if(!myHunspell)return;
 	myHunspell->add(wordToAdd.c_str());
-	std::string filename(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "emerald_custom.dic"));
+	std::string filename(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", "custom.dic"));
 	std::vector<std::string> lines;
 	if(gDirUtilp->fileExists(filename))
 	{
@@ -847,7 +847,7 @@ void lggHunSpell_Wrapper::getMoreButton(void * data)
 {
 	std::vector<std::string> shortNames;
 	std::vector<std::string> longNames;
-	LLSD response = LLHTTPClient::blockingGet("http://www.imprudenceviewer.org/app/dics/dic_list.xml");
+	LLSD response = LLHTTPClient::blockingGet(gSavedSettings.getString("DicDownloadBaseURL")+"dic_list.xml");
 	if(response.has("body"))
 	{
 		const LLSD &dict_list = response["body"];
@@ -866,16 +866,14 @@ void lggHunSpell_Wrapper::getMoreButton(void * data)
 }
 void lggHunSpell_Wrapper::editCustomButton()
 {
-	std::string dicdicpath(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", std::string("emerald_custom.dic")).c_str());
-	
-	std::vector<std::string> lines;
-	
+	std::string dicdicpath(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "dictionaries", std::string("custom.dic")).c_str());
+
 	if(!gDirUtilp->fileExists(dicdicpath))
 	{
-		createCustomDic();
-		//glggHunSpell->addWordToCustomDictionary("temp");
+			createCustomDic();
+			//glggHunSpell->addWordToCustomDictionary("temp");
 	}
-
+	
 	gViewerWindow->getWindow()->ShellEx(dicdicpath);
 }
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 74ea621..857d1f1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -162,9 +162,9 @@
       <check_box bottom_delta="-50" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
        label="Show misspelled words in red" left="5" mouse_opaque="true" name="EmeraldSpellDisplay"
        control_name="EmeraldSpellDisplay" width="126"/>
-      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
-         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>
-      <text bottom_delta="20" follows="left|top" font="SansSerifSmall" height="16" left="250"
+      <!--<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="18" label="Edit Custom dictionary"
+         name="EmSpell_EditCustom" tool_tip="" left_delta="20" width="130"/>-->
+      <text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="250"
          name="EmSpell_txt4" width="512">
         To spellcheck, right click a misspelled word
         (red or not) and click on its replacement
-- 
cgit v1.1