OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

CharacterManaJ: Commit

キャラクターなんとかJの本体


Commit MetaInfo

Revision5ae8bfb3f40ffb3bd0cb87f0be46ab283fd37e4c (tree)
Time2014-08-21 02:10:57
Authorseraphy <seraphy@sera...>
Commiterseraphy

Log Message

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

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

Change Summary

Incremental Difference

Binary files a/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar and b/dist/CharacterManaJ.app/Contents/Resources/Java/CharacterManaJ.jar differ
Binary files a/dist/CharacterManaJ.jar and b/dist/CharacterManaJ.jar differ
Binary files a/dist/charactermanaj.exe and b/dist/charactermanaj.exe differ
Binary files a/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar and b/dist/java7mac/CharacterManaJ.app/Contents/Java/CharacterManaJ.jar differ
--- a/resources/languages/profileselectordialog.xml
+++ b/resources/languages/profileselectordialog.xml
@@ -37,12 +37,14 @@
3737 <entry key="profile.column.name">Name</entry>
3838 <entry key="profile.column.id">ID</entry>
3939 <entry key="profile.column.revision">Revision</entry>
40+ <entry key="profile.column.canvasSize">Size</entry>
4041 <entry key="profile.column.description">Description</entry>
4142 <entry key="profile.column.author">Author</entry>
4243 <entry key="profile.column.location">Location</entry>
4344 <entry key="profile.column.name.width">200</entry>
4445 <entry key="profile.column.id.width">100</entry>
4546 <entry key="profile.column.revision.width">100</entry>
47+ <entry key="profile.column.canvasSize.width">80</entry>
4648 <entry key="profile.column.description.width">300</entry>
4749 <entry key="profile.column.author.width">150</entry>
4850 <entry key="profile.column.location.width">300</entry>
--- a/resources/languages/profileselectordialog_ja.xml
+++ b/resources/languages/profileselectordialog_ja.xml
@@ -37,12 +37,14 @@
3737 <entry key="profile.column.name">名前</entry>
3838 <entry key="profile.column.id">ID</entry>
3939 <entry key="profile.column.revision">リビジョン</entry>
40+ <entry key="profile.column.canvasSize">サイズ</entry>
4041 <entry key="profile.column.description">説明</entry>
4142 <entry key="profile.column.author">作者</entry>
4243 <entry key="profile.column.location">場所</entry>
4344 <entry key="profile.column.name.width">200</entry>
4445 <entry key="profile.column.id.width">100</entry>
4546 <entry key="profile.column.revision.width">100</entry>
47+ <entry key="profile.column.canvasSize.width">80</entry>
4648 <entry key="profile.column.description.width">300</entry>
4749 <entry key="profile.column.author.width">150</entry>
4850 <entry key="profile.column.location.width">300</entry>
--- a/resources/version.properties
+++ b/resources/version.properties
@@ -1,3 +1,3 @@
11 vendor=seraphy@seraphyware
22 specification_version=1.0
3-implements_version=0.996b
3+implements_version=0.997
--- a/src/charactermanaj/model/io/CharacterDataXMLReader.java
+++ b/src/charactermanaj/model/io/CharacterDataXMLReader.java
@@ -199,7 +199,7 @@ public class CharacterDataXMLReader {
199199 if (tmpWidth != null && tmpWidth.trim().length() > 0) {
200200 width = Integer.parseInt(tmpWidth.trim());
201201 }
202- String tmpHeight = getLocalizedElementText(sizeElm, "Height",
202+ String tmpHeight = getLocalizedElementText(sizeElm, "height",
203203 lang);
204204 if (tmpHeight != null && tmpHeight.trim().length() > 0) {
205205 height = Integer.parseInt(tmpHeight.trim());
--- a/src/charactermanaj/ui/ProfileEditDialog.java
+++ b/src/charactermanaj/ui/ProfileEditDialog.java
@@ -364,8 +364,10 @@ public class ProfileEditDialog extends JDialog {
364364 this.txtCharacterDocBase.setEditable(false);
365365
366366 this.txtCharacterName = new JTextFieldEx();
367- this.txtImageWidth = new JSpinner(new SpinnerNumberModel(1, 1, 1024, 1));
368- this.txtImageHeight = new JSpinner(new SpinnerNumberModel(1, 1, 1024, 1));
367+ this.txtImageWidth = new JSpinner(new SpinnerNumberModel(1, 1,
368+ Integer.MAX_VALUE, 1)); // 現実に可能であるかを問わず制限を設けない
369+ this.txtImageHeight = new JSpinner(new SpinnerNumberModel(1, 1,
370+ Integer.MAX_VALUE, 1)); // 現実に可能であるかを問わず制限を設けない
369371 this.txtAuthor = new JTextField();
370372 this.txtDescription = new JTextArea();
371373
--- a/src/charactermanaj/ui/ProfileSelectorDialog.java
+++ b/src/charactermanaj/ui/ProfileSelectorDialog.java
@@ -1300,6 +1300,16 @@ class ProfileSelectorTableModel extends AbstractTableModel {
13001300 return cd.getRev();
13011301 }
13021302 },
1303+ CANVAS_SIZE("profile.column.canvasSize") {
1304+ @Override
1305+ public String getValue(CharacterData cd) {
1306+ Dimension siz = cd.getImageSize();
1307+ if (siz != null) {
1308+ return siz.width + "x" + siz.height;
1309+ }
1310+ return "";
1311+ }
1312+ },
13031313 DESCRIPTION("profile.column.description") {
13041314 @Override
13051315 public String getValue(CharacterData cd) {
Show on old repository browser