From 8179211f2731c9217433ed2fa5885bc47ffb0357 Mon Sep 17 00:00:00 2001 From: yukihane Date: Fri, 5 Aug 2011 12:39:50 +0900 Subject: [PATCH] =?utf8?q?GUI=E3=81=ABmylist.txt=E7=94=A8=E9=A0=85?= =?utf8?q?=E7=9B=AE=E3=80=81=E7=B7=A8=E9=9B=86=E3=83=9C=E3=82=BF=E3=83=B3?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/nicobrowser/gui/config/ConfigFrame.form | 60 ++++++++++++++++++-------- src/nicobrowser/gui/config/ConfigFrame.java | 67 +++++++++++++++++++---------- 2 files changed, 87 insertions(+), 40 deletions(-) diff --git a/src/nicobrowser/gui/config/ConfigFrame.form b/src/nicobrowser/gui/config/ConfigFrame.form index 794f58e..04c82de 100644 --- a/src/nicobrowser/gui/config/ConfigFrame.form +++ b/src/nicobrowser/gui/config/ConfigFrame.form @@ -1,4 +1,4 @@ - +
@@ -24,10 +24,10 @@ - - - + + + @@ -40,7 +40,7 @@ - + @@ -70,20 +70,26 @@ - - + + + - - + + + + + + + + + + + - - - - @@ -97,9 +103,14 @@ + - + + + + + @@ -118,7 +129,7 @@ - + @@ -126,9 +137,24 @@ - + + + + + + + + + + + + + + + + - + diff --git a/src/nicobrowser/gui/config/ConfigFrame.java b/src/nicobrowser/gui/config/ConfigFrame.java index 98e178d..183a0d5 100644 --- 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; -- 2.11.0