Merge remote-tracking branch 'origin/master' add success text

# Conflicts: # tabler/Forms/GridUI.Designer.cs # tabler/Forms/GridUI.resx # tabler/Properties/AssemblyInfo.cs
bux · Jul 22, 2016 · d88afbc · d88afbc
2 parents 1cb896c + 18c017a
commit d88afbc
Show file tree

Hide file tree

Showing 8 changed files with 304 additions and 283 deletions.
diff --git a/tabler/Classes/TranslationManager.cs b/tabler/Classes/TranslationManager.cs
@@ -1,7 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using OfficeOpenXml;
+using tabler.Classes;
+
 
 namespace tabler {
     public class TranslationManager {
@@ -81,23 +84,30 @@ public void ConvertExcelToXml(DirectoryInfo lastPathToDataFiles) {
             SaveModInfosToXml(lastPathToDataFiles, lstModInfos);
         }
 
-        private static void SaveModInfosToXml(DirectoryInfo lastPathToDataFiles, List<ModInfoContainer> lstModInfos) {
-            //if going through mods instead of files, 
-            // we could create files
-            // too tired :D ->  TODO
-            List<FileInfo> filesByNameInDirectory = FileSystemHelper.GetFilesByNameInDirectory(lastPathToDataFiles, STRINGTABLE_NAME, SearchOption.AllDirectories);
+        private static bool SaveModInfosToXml(DirectoryInfo lastPathToDataFiles, List<ModInfoContainer> lstModInfos) {
+            try {
+                //if going through mods instead of files, 
+                // we could create files
+                // too tired :D ->  TODO
+                List<FileInfo> filesByNameInDirectory = FileSystemHelper.GetFilesByNameInDirectory(lastPathToDataFiles, STRINGTABLE_NAME, SearchOption.AllDirectories);
+
+                var xh = new XmlHelper();
+                xh.UpdateXmlFiles(filesByNameInDirectory, lstModInfos);
+            } catch (Exception e) {
+                Logger.Log(e.Message);
+                return false;
+            }
 
-            var xh = new XmlHelper();
-            xh.UpdateXmlFiles(filesByNameInDirectory, lstModInfos);
+            return true;
         }
 
 
         public TranslationComponents GetGridData(DirectoryInfo lastPathToDataFiles) {
             return GetTranslationComponents(lastPathToDataFiles, false);
         }
 
-        public void SaveGridData(DirectoryInfo lastPathToDataFiles, List<ModInfoContainer> lstModInfos) {
-            SaveModInfosToXml(lastPathToDataFiles, lstModInfos);
+        public bool SaveGridData(DirectoryInfo lastPathToDataFiles, List<ModInfoContainer> lstModInfos) {
+            return SaveModInfosToXml(lastPathToDataFiles, lstModInfos);
         }
     }
 }
diff --git a/tabler/Forms/AboutBox.resx b/tabler/Forms/AboutBox.resx
diff --git a/tabler/Forms/GridUI.cs b/tabler/Forms/GridUI.cs
@@ -90,7 +90,11 @@ private void openModFolderToolStripMenuItem_Click(object sender, EventArgs e) {
         private void saveToolStripMenuItem_Click(object sender, EventArgs e) {
             var lstModInfos = _gridUiHelper.ParseAllTables();
 
-            TranslationManager.SaveGridData(ConfigHelper.GetLastPathOfDataFiles(), lstModInfos);
+            var success = TranslationManager.SaveGridData(ConfigHelper.GetLastPathOfDataFiles(), lstModInfos);
+
+            if (success) {
+                Logger.Log(Resources.GridUI_saveToolStripMenuItem_Click_Successfully_saved);
+            }
         }
 
         private void tabControl1_Selected(object sender, TabControlEventArgs e) {

diff --git a/tabler/Forms/GridUI.resx b/tabler/Forms/GridUI.resx
diff --git a/tabler/Properties/Resources.Designer.cs b/tabler/Properties/Resources.Designer.cs
diff --git a/tabler/Properties/Resources.de.resx b/tabler/Properties/Resources.de.resx
@@ -153,4 +153,7 @@ Eintrag: '{2}'</value>
   <data name="GridUI_No_stringtable_xml_files_found" xml:space="preserve">
     <value>Keine 'stringtable.xml'-Dateien gefunden.</value>
   </data>
+  <data name="GridUI_saveToolStripMenuItem_Click_Successfully_saved" xml:space="preserve">
+    <value>Erfolgreich gespeichert</value>
+  </data>
 </root>
diff --git a/tabler/Properties/Resources.resx b/tabler/Properties/Resources.resx
@@ -154,4 +154,7 @@ Entry: '{2}'</value>
   <data name="GridUI_CheckForNewVersion_Download_the_new_version_at" xml:space="preserve">
     <value>Download the new version at</value>
   </data>
+  <data name="GridUI_saveToolStripMenuItem_Click_Successfully_saved" xml:space="preserve">
+    <value>Successfully saved.</value>
+  </data>
 </root>
diff --git a/tabler/tabler.csproj b/tabler/tabler.csproj
@@ -243,6 +243,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Icon-32.png" />
+    <Content Include="Content\Icon-256.png" />
     <Content Include="Content\Icon-48.png" />
     <Content Include="icon.ico" />
   </ItemGroup>