GUIにmylist.txt用項目、編集ボタンを追加

diff --git a/src/nicobrowser/gui/config/ConfigFrame.form b/src/nicobrowser/gui/config/ConfigFrame.form
index 794f58e..04c82de 100644 (file)
--- a/src/nicobrowser/gui/config/ConfigFrame.form
+++ b/src/nicobrowser/gui/config/ConfigFrame.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
 
 <Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
   <Properties>
@@ -24,10 +24,10 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
-              <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jPanel5" alignment="0" max="32767" attributes="0"/>
+          <Group type="102" alignment="1" attributes="0">
+              <Group type="103" groupAlignment="1" attributes="0">
                   <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
+                  <Component id="jPanel5" alignment="0" max="32767" attributes="0"/>
                   <Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
                   <Component id="jPanel4" alignment="0" max="32767" attributes="0"/>
                   <Component id="jPanel6" alignment="0" max="32767" attributes="0"/>
@@ -40,7 +40,7 @@
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
-              <Component id="jPanel1" min="-2" pref="90" max="-2" attributes="0"/>
+              <Component id="jPanel1" min="-2" pref="100" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jPanel2" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
@@ -70,20 +70,26 @@
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
-                  <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="configFileLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="1" max="-2" attributes="0">
+                      <Component id="mylistFileLabel" alignment="0" min="0" pref="0" max="32767" attributes="1"/>
+                      <Component id="configFileLabel" alignment="0" max="32767" attributes="1"/>
                       <Component id="feedFileLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
                   <Group type="103" groupAlignment="0" attributes="0">
-                      <Component id="feedFileField" alignment="0" pref="376" max="32767" attributes="0"/>
-                      <Component id="configFileField" alignment="0" pref="376" max="32767" attributes="0"/>
+                      <Group type="102" attributes="0">
+                          <Component id="mylistFileField" pref="331" max="32767" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="mylistFileEditButton" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="feedFileField" pref="331" max="32767" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="feedFileEditButton" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                      <Component id="configFileField" alignment="0" pref="395" max="32767" attributes="0"/>
                   </Group>
               </Group>
-              <Group type="102" alignment="0" attributes="0">
-                  <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-              </Group>
           </Group>
         </DimensionLayout>
         <DimensionLayout dim="1">
@@ -97,9 +103,14 @@
                   <Group type="103" groupAlignment="3" attributes="0">
                       <Component id="feedFileField" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="feedFileLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="feedFileEditButton" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="mylistFileLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="mylistFileField" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="mylistFileEditButton" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
                   <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
@@ -118,7 +129,7 @@
         </Component>
         <Component class="javax.swing.JLabel" name="configFileLabel">
           <Properties>
-            <Property name="text" type="java.lang.String" value="&#x30b3;&#x30f3;&#x30d5;&#x30a3;&#x30b0;,&#x30de;&#x30a4;&#x30ea;&#x30b9;&#x30c8;"/>
+            <Property name="text" type="java.lang.String" value="&#x30b3;&#x30f3;&#x30d5;&#x30a3;&#x30b0;"/>
           </Properties>
         </Component>
         <Component class="javax.swing.JLabel" name="feedFileLabel">
@@ -126,9 +137,24 @@
             <Property name="text" type="java.lang.String" value="&#x30d5;&#x30a3;&#x30fc;&#x30c9;(RSS)"/>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="jLabel5">
+        <Component class="javax.swing.JLabel" name="mylistFileLabel">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="&#x30de;&#x30a4;&#x30ea;&#x30b9;&#x30c8;"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="mylistFileField">
+          <Properties>
+            <Property name="enabled" type="boolean" value="false"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="feedFileEditButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="&#x7de8;&#x96c6;"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="mylistFileEditButton">
           <Properties>
-            <Property name="text" type="java.lang.String" value="&#x30de;&#x30a4;&#x30ea;&#x30b9;&#x30c8;&#x3001;&#x30d5;&#x30a3;&#x30fc;&#x30c9;&#x306e;&#x8a2d;&#x5b9a;&#x306f;&#x4e0a;&#x8a18;&#x306e;&#x30d5;&#x30a1;&#x30a4;&#x30eb;&#x3092;&#x76f4;&#x63a5;&#x30a8;&#x30c7;&#x30a3;&#x30bf;&#x3067;&#x958b;&#x3044;&#x3066;&#x7de8;&#x96c6;&#x3057;&#x3066;&#x304f;&#x3060;&#x3055;&#x3044;"/>
+            <Property name="text" type="java.lang.String" value="&#x7de8;&#x96c6;"/>
           </Properties>
         </Component>
       </SubComponents>

diff --git a/src/nicobrowser/gui/config/ConfigFrame.java b/src/nicobrowser/gui/config/ConfigFrame.java
index 98e178d..183a0d5 100644 (file)
--- a/src/nicobrowser/gui/config/ConfigFrame.java
+++ b/src/nicobrowser/gui/config/ConfigFrame.java
@@ -71,7 +71,10 @@ public class ConfigFrame extends javax.swing.JFrame {
         feedFileField = new javax.swing.JTextField();
         configFileLabel = new javax.swing.JLabel();
         feedFileLabel = new javax.swing.JLabel();
-        jLabel5 = new javax.swing.JLabel();
+        mylistFileLabel = new javax.swing.JLabel();
+        mylistFileField = new javax.swing.JTextField();
+        feedFileEditButton = new javax.swing.JButton();
+        mylistFileEditButton = new javax.swing.JButton();
         jPanel2 = new javax.swing.JPanel();
         idLabel = new javax.swing.JLabel();
         passLabel = new javax.swing.JLabel();
@@ -112,27 +115,38 @@ public class ConfigFrame extends javax.swing.JFrame {
 
         feedFileField.setEditable(false);
 
-        configFileLabel.setText("コンフィグ,マイリスト");
+        configFileLabel.setText("コンフィグ");
 
         feedFileLabel.setText("フィード(RSS)");
 
-        jLabel5.setText("マイリスト、フィードの設定は上記のファイルを直接エディタで開いて編集してください");
+        mylistFileLabel.setText("マイリスト");
+
+        mylistFileField.setEnabled(false);
+
+        feedFileEditButton.setText("編集");
+
+        mylistFileEditButton.setText("編集");
 
         org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
             jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(jPanel1Layout.createSequentialGroup()
-                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(configFileLabel)
-                    .add(feedFileLabel))
+                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, mylistFileLabel, 0, 0, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, configFileLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, feedFileLabel))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(feedFileField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)
-                    .add(configFileField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)))
-            .add(jPanel1Layout.createSequentialGroup()
-                .add(jLabel5)
-                .addContainerGap())
+                    .add(jPanel1Layout.createSequentialGroup()
+                        .add(mylistFileField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 331, Short.MAX_VALUE)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(mylistFileEditButton))
+                    .add(jPanel1Layout.createSequentialGroup()
+                        .add(feedFileField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 331, Short.MAX_VALUE)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(feedFileEditButton))
+                    .add(configFileField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 395, Short.MAX_VALUE)))
         );
         jPanel1Layout.setVerticalGroup(
             jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -143,9 +157,13 @@ public class ConfigFrame extends javax.swing.JFrame {
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(feedFileField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(feedFileLabel))
+                    .add(feedFileLabel)
+                    .add(feedFileEditButton))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(jLabel5)
+                .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(mylistFileLabel)
+                    .add(mylistFileField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(mylistFileEditButton))
                 .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
@@ -350,20 +368,20 @@ public class ConfigFrame extends javax.swing.JFrame {
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jPanel5, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(jPanel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(jPanel6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel5, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
             .add(layout.createSequentialGroup()
-                .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 90, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 100, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(jPanel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
@@ -449,6 +467,7 @@ public class ConfigFrame extends javax.swing.JFrame {
     private javax.swing.JLabel configFileLabel;
     private javax.swing.JButton dbPathButton;
     private javax.swing.JTextField dbPathField;
+    private javax.swing.JButton feedFileEditButton;
     private javax.swing.JTextField feedFileField;
     private javax.swing.JLabel feedFileLabel;
     private javax.swing.JButton flvPathButton;
@@ -459,7 +478,6 @@ public class ConfigFrame extends javax.swing.JFrame {
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
-    private javax.swing.JLabel jLabel5;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JPanel jPanel3;
@@ -467,6 +485,9 @@ public class ConfigFrame extends javax.swing.JFrame {
     private javax.swing.JPanel jPanel5;
     private javax.swing.JPanel jPanel6;
     private javax.swing.JCheckBox lowDownloadCheckBox;
+    private javax.swing.JButton mylistFileEditButton;
+    private javax.swing.JTextField mylistFileField;
+    private javax.swing.JLabel mylistFileLabel;
     private javax.swing.JTextArea namePatternArea;
     private javax.swing.JTextField namePatternField;
     private javax.swing.JLabel namePatternLabel;