チケット #34209 「キャンバスの高さ設定が次回起動時に正しく読み込まれない」不具合の修正

および、プロファイル設定画面にてキャンバスサイズが1024を超える幅もしくは高さの設定を許可するように修正。
(ただし実際に表示可能であるかは検証しない。)

diff --git a/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar b/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar
index aac4512..8536ab5 100755 (executable)
Binary files a/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar and b/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar differ

diff --git a/dist/CharacterManaJ.jar b/dist/CharacterManaJ.jar
index f726816..8536ab5 100755 (executable)
Binary files a/dist/CharacterManaJ.jar and b/dist/CharacterManaJ.jar differ

diff --git a/dist/charactermanaj.exe b/dist/charactermanaj.exe
index b12ae43..a3ee047 100644 (file)
Binary files a/dist/charactermanaj.exe and b/dist/charactermanaj.exe differ

diff --git a/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar b/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar
index aac4512..8536ab5 100755 (executable)
Binary files a/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar and b/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar differ

diff --git a/resources/languages/profileselectordialog.xml b/resources/languages/profileselectordialog.xml
index e5936e3..d159983 100644 (file)
--- a/resources/languages/profileselectordialog.xml
+++ b/resources/languages/profileselectordialog.xml
@@ -37,12 +37,14 @@
        <entry key="profile.column.name">Name</entry>\r
        <entry key="profile.column.id">ID</entry>\r
        <entry key="profile.column.revision">Revision</entry>\r
+       <entry key="profile.column.canvasSize">Size</entry>\r
        <entry key="profile.column.description">Description</entry>\r
        <entry key="profile.column.author">Author</entry>\r
        <entry key="profile.column.location">Location</entry>\r
        <entry key="profile.column.name.width">200</entry>\r
        <entry key="profile.column.id.width">100</entry>\r
        <entry key="profile.column.revision.width">100</entry>\r
+       <entry key="profile.column.canvasSize.width">80</entry>\r
        <entry key="profile.column.description.width">300</entry>\r
        <entry key="profile.column.author.width">150</entry>\r
        <entry key="profile.column.location.width">300</entry>\r

diff --git a/resources/languages/profileselectordialog_ja.xml b/resources/languages/profileselectordialog_ja.xml
index 5d466bf..473525e 100644 (file)
--- a/resources/languages/profileselectordialog_ja.xml
+++ b/resources/languages/profileselectordialog_ja.xml
@@ -37,12 +37,14 @@
        <entry key="profile.column.name">名前</entry>\r
        <entry key="profile.column.id">ID</entry>\r
        <entry key="profile.column.revision">リビジョン</entry>\r
+       <entry key="profile.column.canvasSize">サイズ</entry>\r
        <entry key="profile.column.description">説明</entry>\r
        <entry key="profile.column.author">作者</entry>\r
        <entry key="profile.column.location">場所</entry>\r
        <entry key="profile.column.name.width">200</entry>\r
        <entry key="profile.column.id.width">100</entry>\r
        <entry key="profile.column.revision.width">100</entry>\r
+       <entry key="profile.column.canvasSize.width">80</entry>\r
        <entry key="profile.column.description.width">300</entry>\r
        <entry key="profile.column.author.width">150</entry>\r
        <entry key="profile.column.location.width">300</entry>\r

diff --git a/resources/version.properties b/resources/version.properties
index 87a0f35..be12475 100644 (file)
--- a/resources/version.properties
+++ b/resources/version.properties
@@ -1,3 +1,3 @@
 vendor=seraphy@seraphyware\r
 specification_version=1.0\r
-implements_version=0.996b\r
+implements_version=0.997\r

diff --git a/src/charactermanaj/model/io/CharacterDataXMLReader.java b/src/charactermanaj/model/io/CharacterDataXMLReader.java
index cc31636..dd477f8 100644 (file)
--- a/src/charactermanaj/model/io/CharacterDataXMLReader.java
+++ b/src/charactermanaj/model/io/CharacterDataXMLReader.java
@@ -199,7 +199,7 @@ public class CharacterDataXMLReader {
                                if (tmpWidth != null && tmpWidth.trim().length() > 0) {\r
                                        width = Integer.parseInt(tmpWidth.trim());\r
                                }\r
-                               String tmpHeight = getLocalizedElementText(sizeElm, "Height",\r
+                               String tmpHeight = getLocalizedElementText(sizeElm, "height",\r
                                                lang);\r
                                if (tmpHeight != null && tmpHeight.trim().length() > 0) {\r
                                        height = Integer.parseInt(tmpHeight.trim());\r

diff --git a/src/charactermanaj/ui/ProfileEditDialog.java b/src/charactermanaj/ui/ProfileEditDialog.java
index c54828b..9a34a49 100644 (file)
--- a/src/charactermanaj/ui/ProfileEditDialog.java
+++ b/src/charactermanaj/ui/ProfileEditDialog.java
@@ -364,8 +364,10 @@ public class ProfileEditDialog extends JDialog {
                this.txtCharacterDocBase.setEditable(false);\r
 \r
                this.txtCharacterName = new JTextFieldEx();\r
-               this.txtImageWidth = new JSpinner(new SpinnerNumberModel(1, 1, 1024, 1));\r
-               this.txtImageHeight = new JSpinner(new SpinnerNumberModel(1, 1, 1024, 1));\r
+               this.txtImageWidth = new JSpinner(new SpinnerNumberModel(1, 1,\r
+                               Integer.MAX_VALUE, 1)); // 現実に可能であるかを問わず制限を設けない\r
+               this.txtImageHeight = new JSpinner(new SpinnerNumberModel(1, 1,\r
+                               Integer.MAX_VALUE, 1)); // 現実に可能であるかを問わず制限を設けない\r
                this.txtAuthor = new JTextField();\r
                this.txtDescription = new JTextArea();\r
                \r

diff --git a/src/charactermanaj/ui/ProfileSelectorDialog.java b/src/charactermanaj/ui/ProfileSelectorDialog.java
index 3a2595b..f6f7f7a 100644 (file)
--- a/src/charactermanaj/ui/ProfileSelectorDialog.java
+++ b/src/charactermanaj/ui/ProfileSelectorDialog.java
@@ -1300,6 +1300,16 @@ class ProfileSelectorTableModel extends AbstractTableModel {
                                return cd.getRev();\r
                        }\r
                },\r
+               CANVAS_SIZE("profile.column.canvasSize") {\r
+                       @Override\r
+                       public String getValue(CharacterData cd) {\r
+                               Dimension siz = cd.getImageSize();\r
+                               if (siz != null) {\r
+                                       return siz.width + "x" + siz.height;\r
+                               }\r
+                               return "";\r
+                       }\r
+               },\r
                DESCRIPTION("profile.column.description") {\r
                        @Override\r
                        public String getValue(CharacterData cd) {\r