Fix more folder locations

CasperTech · Jun 14, 2014 · 83d3ed4 · 83d3ed4
1 parent 1f27b57
commit 83d3ed4
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/METAbolt/GUI/Consoles/ChatConsole.cs b/METAbolt/GUI/Consoles/ChatConsole.cs
@@ -109,7 +109,7 @@ public partial class ChatConsole : UserControl
         private string afffile = string.Empty;
         private string dicfile = string.Empty;
         private string dic = string.Empty;
-        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Spelling\\";
+        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\Spelling\\";
 
         private ToolTip toolTip = new ToolTip();
         private string tooltiptext = string.Empty;

diff --git a/METAbolt/GUI/Consoles/FriendsConsole.cs b/METAbolt/GUI/Consoles/FriendsConsole.cs
@@ -537,7 +537,7 @@ private void FriendsConsole_Load(object sender, EventArgs e)
             cbofgroups.Items.Add("...All friends");
             cbofgroups.SelectedIndex = 0;
 
-            string fconffile = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\" + client.Self.AgentID.ToString() + "_fr_groups.ini";
+            string fconffile = METAbolt.DataFolder.GetDataFolder()  + client.Self.AgentID.ToString() + "_fr_groups.ini";
 
             if (!System.IO.File.Exists(fconffile))
             {

diff --git a/METAbolt/GUI/Consoles/IMTabWindow.cs b/METAbolt/GUI/Consoles/IMTabWindow.cs
@@ -62,7 +62,7 @@ public partial class IMTabWindow : UserControl
         private string afffile = string.Empty;
         private string dicfile = string.Empty;
         private string dic = string.Empty;
-        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Spelling\\";
+        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\Spelling\\";
         private string avloc = string.Empty;
 
 

diff --git a/METAbolt/GUI/Consoles/IMTabWindowsGroup.cs b/METAbolt/GUI/Consoles/IMTabWindowsGroup.cs
@@ -70,7 +70,7 @@ public partial class IMTabWindowGroup : UserControl
         private string afffile = string.Empty;
         private string dicfile = string.Empty;
         private string dic = string.Empty;
-        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Spelling\\";
+        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\Spelling\\";
 
 
         internal class ThreadExceptionHandler

diff --git a/METAbolt/GUI/Consoles/MainConsole.cs b/METAbolt/GUI/Consoles/MainConsole.cs
@@ -961,7 +961,7 @@ private void label4_Click(object sender, EventArgs e)
 
         private void button1_Click(object sender, EventArgs e)
         {
-            string fullfile = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Grids.txt"; ;
+            string fullfile = METAbolt.DataFolder.GetDataFolder() + "\\Grids.txt"; ;
 
             try
             {

diff --git a/METAbolt/GUI/Consoles/Preferences/PrefSpelling.cs b/METAbolt/GUI/Consoles/Preferences/PrefSpelling.cs
@@ -16,7 +16,7 @@ namespace METAbolt
     public partial class PrefSpelling : System.Windows.Forms.UserControl, IPreferencePane
     {
         private METAboltInstance instance;
-        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Spelling\\";
+        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\Spelling\\";
         private string lang = string.Empty;
         private Popup toolTip3;
         private CustomToolTip customToolTip;

diff --git a/METAbolt/GUI/Dialogs/About.cs b/METAbolt/GUI/Dialogs/About.cs
@@ -53,7 +53,7 @@ public frmAbout()
 
             lblVersion.Text = Properties.Resources.METAboltTitle + " V " + Properties.Resources.METAboltVersion;   
             txtDir.Text =  Application.StartupPath.ToString();
-            textBox1.Text = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\";
+            textBox1.Text = METAbolt.DataFolder.GetDataFolder() ;
             //platform = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE").ToString();
 
             //lblVersion.Text += " (" + Properties.Resources.PlatformType + ")";

diff --git a/METAbolt/GUI/Dialogs/META3D.cs b/METAbolt/GUI/Dialogs/META3D.cs
@@ -1970,7 +1970,7 @@ private void capScreenBeforeNextSwap()
             bmp.UnlockBits(data);
             bmp.RotateFlip(RotateFlipType.RotateNoneFlipY);
 
-            string path = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\";
+            string path = METAbolt.DataFolder.GetDataFolder() ;
             string filename = "Object_Snaphot_" + DateTime.Now.ToString() + ".png";
             filename = filename.Replace("/", "-");
             filename = filename.Replace(":", "-");
@@ -2012,7 +2012,7 @@ private void getScreehShot()
             bmp.UnlockBits(data);
             bmp.RotateFlip(RotateFlipType.RotateNoneFlipY);
 
-            string path = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\";
+            string path = METAbolt.DataFolder.GetDataFolder() ;
             string filename = "Object_Snaphot_" + DateTime.Now.ToString() + ".png";
             filename = filename.Replace("/", "-");
             filename = filename.Replace(":", "-");

diff --git a/METAbolt/GUI/Dialogs/frmPluginManager.cs b/METAbolt/GUI/Dialogs/frmPluginManager.cs
@@ -163,7 +163,7 @@ private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
 
         private void button5_Click(object sender, EventArgs e)
         {
-            Process.Start("explorer.exe", METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Extensions\\");
+            Process.Start("explorer.exe", METAbolt.DataFolder.GetDataFolder() + "\\Extensions\\");
         }
 
         private void button6_Click(object sender, EventArgs e)

diff --git a/METAbolt/GUI/Dialogs/frmSpelling.cs b/METAbolt/GUI/Dialogs/frmSpelling.cs
@@ -18,7 +18,7 @@ public partial class frmSpelling : Form
         private METAboltInstance instance;
         private SLNetCom netcom;
         private Hunspell hunspell = new Hunspell();   //("en_us.aff", "en_us.dic");
-        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\METAbolt\\Spelling\\";
+        private string dir = METAbolt.DataFolder.GetDataFolder() + "\\Spelling\\";
         //private string words = string.Empty;
         private int start = 0;
         private int indexOfSearchText = 0;

diff --git a/METAbolt/Properties/AssemblyInfo.cs b/METAbolt/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("0.9.70.0")]
+[assembly: AssemblyFileVersion("0.9.71")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/METAbolt/Properties/Resources.Designer.cs b/METAbolt/Properties/Resources.Designer.cs
diff --git a/METAbolt/Properties/Resources.resx b/METAbolt/Properties/Resources.resx
@@ -131,7 +131,7 @@
     <value>..\Resources\turnleft.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="METAboltVersion" xml:space="preserve">
-    <value>0.9.70.0 (BETA)</value>
+    <value>0.9.71 (BETA)</value>
   </data>
   <data name="play" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\play.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

diff --git a/metabolt.sln b/metabolt.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "METAbolt", "METAbolt\METAbolt.csproj", "{A6D955CD-1F55-459F-A7AD-01E591404989}"
 EndProject