From 51a34341b895dc6a88874a858de9be245675c61a Mon Sep 17 00:00:00 2001 From: yukihane Date: Sat, 17 Sep 2011 21:30:51 +0900 Subject: [PATCH] =?utf8?q?=E3=83=8D=E3=83=83=E3=83=88=E3=83=AF=E3=83=BC?= =?utf8?q?=E3=82=AF=E3=82=BF=E3=83=96=E5=86=85=E3=81=AE=E9=A0=85=E7=9B=AE?= =?utf8?q?=E8=A1=A8=E7=A4=BA=E6=BA=96=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/yukihane/inqubus/gui/ConfigDialog.java | 91 +++++++++++----------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java index 08ad934..aeae92e 100644 --- a/frontend/src/yukihane/inqubus/gui/ConfigDialog.java +++ b/frontend/src/yukihane/inqubus/gui/ConfigDialog.java @@ -139,48 +139,6 @@ public class ConfigDialog extends JDialog { .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - pnlProxy.setBorder(BorderFactory.createTitledBorder("プロキシ")); - - cbProxyUse.setText("プロキシを使用する"); - - lblProxyHost.setText("ホスト名"); - - lblProxyPort.setText("ポート番号"); - - GroupLayout gl_pnlProxy = new GroupLayout(pnlProxy); - pnlProxy.setLayout(gl_pnlProxy); - gl_pnlProxy.setHorizontalGroup( - gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(gl_pnlProxy.createSequentialGroup() - .addContainerGap() - .addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(cbProxyUse) - .addGroup(gl_pnlProxy.createSequentialGroup() - .addComponent(lblProxyHost) - .addGap(18, 18, 18) - .addComponent(fldProxyHost, GroupLayout.PREFERRED_SIZE, 168, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_pnlProxy.createSequentialGroup() - .addComponent(lblProxyPort) - .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(fldProxyPort, GroupLayout.PREFERRED_SIZE, 76, GroupLayout.PREFERRED_SIZE))) - .addContainerGap(181, Short.MAX_VALUE)) - ); - gl_pnlProxy.setVerticalGroup( - gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.LEADING) - .addGroup(gl_pnlProxy.createSequentialGroup() - .addContainerGap() - .addComponent(cbProxyUse) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(lblProxyHost) - .addComponent(fldProxyHost, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.BASELINE) - .addComponent(lblProxyPort) - .addComponent(fldProxyPort, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) - .addContainerGap()) - ); - final JCheckBox cbxCookie = new JCheckBox("ブラウザのログイン情報を使用してアクセスする"); final JRadioButton btnCookieIe = new JRadioButton("IE(7以降) (Windows)"); @@ -242,6 +200,49 @@ public class ConfigDialog extends JDialog { ); + pnlProxy.setBorder(BorderFactory.createTitledBorder("プロキシ")); + + cbProxyUse.setText("プロキシを使用する"); + + lblProxyHost.setText("ホスト名"); + + lblProxyPort.setText("ポート番号"); + + GroupLayout gl_pnlProxy = new GroupLayout(pnlProxy); + pnlProxy.setLayout(gl_pnlProxy); + gl_pnlProxy.setHorizontalGroup( + gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(gl_pnlProxy.createSequentialGroup() + .addContainerGap() + .addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.LEADING) + .addComponent(cbProxyUse) + .addGroup(gl_pnlProxy.createSequentialGroup() + .addComponent(lblProxyHost) + .addGap(18, 18, 18) + .addComponent(fldProxyHost, GroupLayout.PREFERRED_SIZE, 168, GroupLayout.PREFERRED_SIZE)) + .addGroup(gl_pnlProxy.createSequentialGroup() + .addComponent(lblProxyPort) + .addPreferredGap(ComponentPlacement.RELATED) + .addComponent(fldProxyPort, GroupLayout.PREFERRED_SIZE, 76, GroupLayout.PREFERRED_SIZE))) + .addContainerGap(181, Short.MAX_VALUE)) + ); + gl_pnlProxy.setVerticalGroup( + gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.LEADING) + .addGroup(gl_pnlProxy.createSequentialGroup() + .addContainerGap() + .addComponent(cbProxyUse) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(lblProxyHost) + .addComponent(fldProxyHost, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(ComponentPlacement.RELATED) + .addGroup(gl_pnlProxy.createParallelGroup(GroupLayout.Alignment.BASELINE) + .addComponent(lblProxyPort) + .addComponent(fldProxyPort, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)) + .addContainerGap()) + ); + + GroupLayout gl_pnlNetwork = new GroupLayout(pnlNetwork); pnlNetwork.setLayout(gl_pnlNetwork); gl_pnlNetwork.setHorizontalGroup( @@ -249,9 +250,9 @@ public class ConfigDialog extends JDialog { .addGroup(GroupLayout.Alignment.TRAILING, gl_pnlNetwork.createSequentialGroup() .addContainerGap() .addGroup(gl_pnlNetwork.createParallelGroup(GroupLayout.Alignment.TRAILING) - .addComponent(pnlProxy, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(pnlAccount, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(pnlCookie, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(pnlProxy, GroupLayout.Alignment.LEADING, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ) .addContainerGap()) ); @@ -261,9 +262,9 @@ public class ConfigDialog extends JDialog { .addContainerGap() .addComponent(pnlAccount, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addPreferredGap(ComponentPlacement.RELATED) - .addComponent(pnlProxy, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) - .addPreferredGap(ComponentPlacement.RELATED) .addComponent(pnlCookie, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) + .addPreferredGap(ComponentPlacement.RELATED) + .addComponent(pnlProxy, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addContainerGap() ) ); -- 2.11.0