Merge pull request #3 from seed-ui/feature/xm-release

3.1
seed-ui · Jan 18, 2017 · 1785d9a · 1785d9a
2 parents b696782 + 595e38d
commit 1785d9a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 16 deletions.
diff --git a/Readme.md b/Readme.md
@@ -65,6 +65,16 @@ subdivide:
 engine: EPPlus
 ```
 
+## Usage (XmSeedtable.exe)
+
+![XmSeedtable.exe](seedtable-x11/seedtable-x11.png)
+
+seedtable-gui.exeと同じくseedフォルダと設定ファイルを入力します。
+
+変換するExcelファイルを変換元で指定して「yml -> xlsx」、「xlsx -> yml」それぞれをクリックすると変換できます。
+
+Unix系OSとMac OS X等で`mono XmSeedtable.exe`または`mono --arch=64 XmSeedtable.exe`(Mac OS X等)で動作します。
+
 ## Engines
 
 seedtableではxlsxファイルを扱うバックエンドとして複数のライブラリを選択できます。
@@ -134,6 +144,22 @@ data3:
 
 ただし仕事の合間対応なので反応速度ははやいとは限りません。
 
+## Build
+
+### seedtable.exe / seedtable-gui.exe
+
+普通にseedtable.slnを開いてnugetパッケージの復元してからビルドすれば通ると思います。
+
+### XmSeedtable.exe
+
+Xlib、OpenMotif、libxpmに依存します。
+
+```
+git submodule init
+git submodule update
+```
+したのち`seedtable-x11/TonNurako/TonNurakoEx/Config.mp3`を`seedtable-x11/TonNurako/TonNurakoEx/Site.mp3`へコピーして、include先を適切なパスへ書き換えてxbuildを叩いてください。
+
 ## License
 
 このソフトウェアにはApache Licenseのもとで頒布されているソフトウェアOpen-XML-SDKと、LGPLのもとで頒布されているソフトウェアEPPlusが使われています。

diff --git a/seedtable-gui/Properties/AssemblyInfo.cs b/seedtable-gui/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@
 [assembly: AssemblyTitle("seedtable-gui")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("原色奈良阪")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Narazaka")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("seedtable")]
+[assembly: AssemblyCopyright("MIT License")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,4 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.1.*")]
diff --git a/seedtable-x11/XmSeedtable/FormValuesX11.cs b/seedtable-x11/XmSeedtable/FormValuesX11.cs
@@ -9,12 +9,14 @@ public class FormValuesX11 {
         public string SeedPath { get; set; }
         public string SettingPath { get; set; }
         public string SourcePath { get; set; }
+        public string YamlToExcelTargetFolder { get; set; }
 
         public FormValuesX11() { }
-        public FormValuesX11(string seedPath, string settingPath, string sourcePath) {
+        public FormValuesX11(string seedPath, string settingPath, string sourcePath, string yamlToExcelTargetFolder) {
             SeedPath = seedPath;
             SettingPath = settingPath;
             SourcePath = sourcePath;
+            YamlToExcelTargetFolder = yamlToExcelTargetFolder;
         }
     }
 }
diff --git a/seedtable-x11/XmSeedtable/Properties/AssemblyInfo.cs b/seedtable-x11/XmSeedtable/Properties/AssemblyInfo.cs
@@ -9,8 +9,8 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("XmSeedtable")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyProduct("seedtable")]
+[assembly: AssemblyCopyright("MIT License")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("3.1.*")]
diff --git a/seedtable-x11/XmSeedtable/SeedTableX11.cs b/seedtable-x11/XmSeedtable/SeedTableX11.cs
@@ -145,6 +145,8 @@ public partial class SeedTableX11 :
             set { sourceTextBox.Value = value; }
         }
 
+        private string YamlToExcelTargetFolder { get; set; }
+
         private ToOptions LoadSetting() {
             if (SettingPath == null || SettingPath.Length == 0) {
                 ShowMessageBox("設定ファイルを指定して下さい", "エラー");
@@ -183,17 +185,19 @@ public partial class SeedTableX11 :
             d.FileTypeMask = FileTypeMask.Directory;
             d.DialogStyle = DialogStyle.FullApplicationModal;
             d.PathMode = PathMode.Relative;
+            d.Directory = YamlToExcelTargetFolder;
             d.CancelEvent += (x,y) => {
                 d.Destroy();
             };
             d.OkEvent += (x,y) => {
-                var targetFolder = System.IO.Path.Combine(d.Directory, d.TextString);
+                YamlToExcelTargetFolder = System.IO.Path.Combine(d.Directory, d.TextString);
+                SaveFormValues();
 
                 var options = new ToOptions();
                 options.files = fileBaseNames;
                 options.seedInput = SeedPath;
                 options.xlsxInput = fileDirName;
-                options.output = targetFolder;
+                options.output = YamlToExcelTargetFolder;
                 options.columnNamesRow = setting.columnNamesRow;
                 options.dataStartRow = setting.dataStartRow;
                 options.engine = setting.engine;
@@ -238,7 +242,7 @@ public partial class SeedTableX11 :
 
 
         private void SaveFormValues() {
-            var yaml = new Serializer().Serialize(new FormValuesX11(SeedPath, SettingPath, SourcePath));
+            var yaml = new Serializer().Serialize(new FormValuesX11(SeedPath, SettingPath, SourcePath, YamlToExcelTargetFolder));
             File.WriteAllText(FormValuesPath, yaml);
         }
 
@@ -249,6 +253,7 @@ public partial class SeedTableX11 :
             SeedPath = formValues.SeedPath;
             SettingPath = formValues.SettingPath;
             SourcePath = formValues.SourcePath;
+            YamlToExcelTargetFolder = formValues.YamlToExcelTargetFolder;
         }
 
         private string FormValuesPath {

diff --git a/seedtable/AssemblyInfo.cs b/seedtable/AssemblyInfo.cs
@@ -7,17 +7,17 @@
 [assembly: AssemblyTitle("seedtable")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Œ´F“Þ—Çã")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Narazaka")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("seedtable")]
+[assembly: AssemblyCopyright("MIT License")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
 // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.1.*")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.