From: yukihane <yukihane.feather@gmail.com>
Date: Sat, 17 Sep 2011 12:30:51 +0000 (+0900)
Subject: ネットワークタブ内の項目表示準変更
X-Git-Tag: rel20110922_ver2.1.0~21^2~4
X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=commitdiff_plain;h=51a34341b895dc6a88874a858de9be245675c61a

ネットワークタブ内の項目表示準変更
---

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()
             )
         );