少コメをコンフィグ化

diff --git a/frontend/src/yukihane/inqubus/config/Config.java b/frontend/src/yukihane/inqubus/config/Config.java
index 91dd32f..d98f4c7 100644 (file)
--- a/frontend/src/yukihane/inqubus/config/Config.java
+++ b/frontend/src/yukihane/inqubus/config/Config.java
@@ -220,6 +220,15 @@ public enum Config {
     public void setCommentSizeManual(String s) {
         config.setProperty(COMMENT_SIZE_MANUAL, s);
     }
+    private static final String COMMENT_MIN_DISABLED = "comment.minutesize.disable";
+
+    public boolean getCommentMinDisabled() {
+        return config.getBoolean(COMMENT_MIN_DISABLED, false);
+    }
+
+    public void setCommentMinDisabled(boolean s) {
+        config.setProperty(COMMENT_MIN_DISABLED, s);
+    }
     private static final String COMMENT_MIN_SIZE_AUTOSIZE = "comment.minutesize.autosize";
 
     public boolean getCommentMinSizeAutosize() {
@@ -513,23 +522,23 @@ public enum Config {
     public void setSystemWindowHeight(int s) {
         config.setProperty(SYSTEM_WINDOW_HEIGHT, s);
     }
-
     private static final String SYSTEM_WINDOW_POS_X = "system.window.posx";
+
     public int getSystemWindowPosX() {
-       return config.getInt(SYSTEM_WINDOW_POS_X, Integer.MIN_VALUE);
+        return config.getInt(SYSTEM_WINDOW_POS_X, Integer.MIN_VALUE);
     }
 
     public void setSystemWindowPosX(int s) {
-         config.setProperty(SYSTEM_WINDOW_POS_X, s);
+        config.setProperty(SYSTEM_WINDOW_POS_X, s);
     }
-
     private static final String SYSTEM_WINDOW_POS_Y = "system.window.posy";
+
     public int getSystemWindowPosY() {
-       return config.getInt(SYSTEM_WINDOW_POS_Y, Integer.MIN_VALUE);
+        return config.getInt(SYSTEM_WINDOW_POS_Y, Integer.MIN_VALUE);
     }
 
     public void setSystemWindowPosY(int s) {
-         config.setProperty(SYSTEM_WINDOW_POS_Y, s);
+        config.setProperty(SYSTEM_WINDOW_POS_Y, s);
     }
     private static final String SYSTEM_COLUMN_ID = "system.column.id";
 

diff --git a/frontend/src/yukihane/inqubus/config/ConfigCommentProfile.java b/frontend/src/yukihane/inqubus/config/ConfigCommentProfile.java
index 4086b4a..230351c 100644 (file)
--- a/frontend/src/yukihane/inqubus/config/ConfigCommentProfile.java
+++ b/frontend/src/yukihane/inqubus/config/ConfigCommentProfile.java
@@ -21,8 +21,7 @@ public class ConfigCommentProfile implements CommentProfile {
         final Config p = Config.INSTANCE;
         this.lengthRelatedCommentSize = (p.getCommentSizeAutosize()) ? -1 : Integer.parseInt(p.getCommentSizeManual());
         this.perMinCommentSize = (p.getCommentMinSizeAutosize()) ? -1 : Integer.parseInt(p.getCommentMinSizeManual());
-        // TODO disablePerMinComment がデフォルト設定値に無い
-        this.disablePerMinComment = false;
+        this.disablePerMinComment = p.getCommentMinDisabled();
         this.backLogPoint = -1L;
         this.download = !p.getCommentUseLocal();
         this.dir = new File(p.getCommentDir());

diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
index 7a9f56f..5dfe7fb 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
+++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java
@@ -356,6 +356,7 @@ public class ConfigDialog extends JDialog {
                     .addComponent(lblCommentDisplayMax))
                 .addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.LEADING)
                     .addComponent(cbCommentSizeAuto)
+                    .addComponent(cbCommentMinDisable)
                     .addComponent(cbCommentMinSizeAuto)
                     .addComponent(cbCommentDisplaySizeDefault))
                 .addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -376,6 +377,9 @@ public class ConfigDialog extends JDialog {
                     .addComponent(fldCommentSizeManual))
                 .addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.BASELINE)
                     .addComponent(lblCommentMinSize)
+                    .addComponent(cbCommentMinDisable)
+                )
+                .addGroup(gl_pnlCommentStandard.createParallelGroup(GroupLayout.Alignment.BASELINE)
                     .addComponent(cbCommentMinSizeAuto)
                     .addComponent(lblCommentMinSizeManual)
                     .addComponent(fldCommentMinSizeManual))
@@ -785,6 +789,7 @@ public class ConfigDialog extends JDialog {
     // コメント
     private final JCheckBox cbCommentSizeAuto = new JCheckBox("自動調整");
     private final NumberFormattedTextField fldCommentSizeManual = new NumberFormattedTextField();
+    private final JCheckBox cbCommentMinDisable = new JCheckBox("少コメ");
     private final JCheckBox cbCommentMinSizeAuto = new JCheckBox("自動調整");
     private final NumberFormattedTextField fldCommentMinSizeManual = new NumberFormattedTextField();
     private final JCheckBox cbCommentDisplaySizeDefault = new JCheckBox("標準(30)");
@@ -870,6 +875,7 @@ public class ConfigDialog extends JDialog {
          */
         cbCommentSizeAuto.setSelected(p.getCommentSizeAutosize());
         fldCommentSizeManual.setText(p.getCommentSizeManual());
+        cbCommentMinDisable.setSelected(p.getCommentMinDisabled());
         cbCommentMinSizeAuto.setSelected(p.getCommentMinSizeAutosize());
         fldCommentSizeManual.setText(p.getCommentMinSizeManual());
         cbCommentDisplaySizeDefault.setSelected(p.getCommentDisplaySizeDefault());
@@ -969,6 +975,7 @@ public class ConfigDialog extends JDialog {
          */
         p.setCommentSizeAutosize(cbCommentSizeAuto.isSelected());
         p.setCommentSizeManual(fldCommentSizeManual.getText());
+        p.setCommentMinDisabled(cbCommentMinDisable.isSelected());
         p.setCommentMinSizeAutosize(cbCommentMinSizeAuto.isSelected());
         p.setCommentMinSizeManual(fldCommentSizeManual.getText());
         p.setCommentDisplaySizeDefault(cbCommentDisplaySizeDefault.isSelected());

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 55571de..9989c69 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -688,8 +688,9 @@ public class MainFrame extends JFrame {
         final Config p = Config.INSTANCE;
 
         cmbId.setText("");
-        fldBackLog.setEnabled(false);
+        cbBackLogReduce.setSelected(p.getCommentMinDisabled());
         cbBackLog.setEnabled(true);
+        fldBackLog.setEnabled(false);
 
         final boolean videoLocal = p.getVideoUseLocal();
         cbVideoLocal.setSelected(videoLocal);