キャラクターなんとかJの本体
Revision | 5ae8bfb3f40ffb3bd0cb87f0be46ab283fd37e4c (tree) |
---|---|
Time | 2014-08-21 02:10:57 |
Author | seraphy <seraphy@sera...> |
Commiter | seraphy |
チケット #34209 「キャンバスの高さ設定が次回起動時に正しく読み込まれない」不具合の修正
および、プロファイル設定画面にてキャンバスサイズが1024を超える幅もしくは高さの設定を許可するように修正。
(ただし実際に表示可能であるかは検証しない。)
@@ -37,12 +37,14 @@ | ||
37 | 37 | <entry key="profile.column.name">Name</entry> |
38 | 38 | <entry key="profile.column.id">ID</entry> |
39 | 39 | <entry key="profile.column.revision">Revision</entry> |
40 | + <entry key="profile.column.canvasSize">Size</entry> | |
40 | 41 | <entry key="profile.column.description">Description</entry> |
41 | 42 | <entry key="profile.column.author">Author</entry> |
42 | 43 | <entry key="profile.column.location">Location</entry> |
43 | 44 | <entry key="profile.column.name.width">200</entry> |
44 | 45 | <entry key="profile.column.id.width">100</entry> |
45 | 46 | <entry key="profile.column.revision.width">100</entry> |
47 | + <entry key="profile.column.canvasSize.width">80</entry> | |
46 | 48 | <entry key="profile.column.description.width">300</entry> |
47 | 49 | <entry key="profile.column.author.width">150</entry> |
48 | 50 | <entry key="profile.column.location.width">300</entry> |
@@ -37,12 +37,14 @@ | ||
37 | 37 | <entry key="profile.column.name">名前</entry> |
38 | 38 | <entry key="profile.column.id">ID</entry> |
39 | 39 | <entry key="profile.column.revision">リビジョン</entry> |
40 | + <entry key="profile.column.canvasSize">サイズ</entry> | |
40 | 41 | <entry key="profile.column.description">説明</entry> |
41 | 42 | <entry key="profile.column.author">作者</entry> |
42 | 43 | <entry key="profile.column.location">場所</entry> |
43 | 44 | <entry key="profile.column.name.width">200</entry> |
44 | 45 | <entry key="profile.column.id.width">100</entry> |
45 | 46 | <entry key="profile.column.revision.width">100</entry> |
47 | + <entry key="profile.column.canvasSize.width">80</entry> | |
46 | 48 | <entry key="profile.column.description.width">300</entry> |
47 | 49 | <entry key="profile.column.author.width">150</entry> |
48 | 50 | <entry key="profile.column.location.width">300</entry> |
@@ -1,3 +1,3 @@ | ||
1 | 1 | vendor=seraphy@seraphyware |
2 | 2 | specification_version=1.0 |
3 | -implements_version=0.996b | |
3 | +implements_version=0.997 |
@@ -199,7 +199,7 @@ public class CharacterDataXMLReader { | ||
199 | 199 | if (tmpWidth != null && tmpWidth.trim().length() > 0) { |
200 | 200 | width = Integer.parseInt(tmpWidth.trim()); |
201 | 201 | } |
202 | - String tmpHeight = getLocalizedElementText(sizeElm, "Height", | |
202 | + String tmpHeight = getLocalizedElementText(sizeElm, "height", | |
203 | 203 | lang); |
204 | 204 | if (tmpHeight != null && tmpHeight.trim().length() > 0) { |
205 | 205 | height = Integer.parseInt(tmpHeight.trim()); |
@@ -364,8 +364,10 @@ public class ProfileEditDialog extends JDialog { | ||
364 | 364 | this.txtCharacterDocBase.setEditable(false); |
365 | 365 | |
366 | 366 | 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)); // 現実に可能であるかを問わず制限を設けない | |
369 | 371 | this.txtAuthor = new JTextField(); |
370 | 372 | this.txtDescription = new JTextArea(); |
371 | 373 |
@@ -1300,6 +1300,16 @@ class ProfileSelectorTableModel extends AbstractTableModel { | ||
1300 | 1300 | return cd.getRev(); |
1301 | 1301 | } |
1302 | 1302 | }, |
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 | + }, | |
1303 | 1313 | DESCRIPTION("profile.column.description") { |
1304 | 1314 | @Override |
1305 | 1315 | public String getValue(CharacterData cd) { |