added Use current channels button

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index 21760d4..2690766 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -27,7 +27,7 @@ object frmSetting: TfrmSetting
     Top = 8
     Width = 379
     Height = 306
-    ActivePage = tstGeneral
+    ActivePage = tstChannel
     Anchors = [akLeft, akTop, akRight, akBottom]
     TabOrder = 0
     object tstGeneral: TTabSheet
@@ -347,6 +347,15 @@ object frmSetting: TfrmSetting
         Caption = #36215#21205#26178#12395#33258#21205#30340#12395#12289#33258#21205#21442#21152#23550#35937#12481#12515#12531#12493#12523#12395#21152#20837'(&J)'
         TabOrder = 1
       end
+      object btnUseCurrentJoinChannels: TButton
+        Left = 168
+        Top = 192
+        Width = 193
+        Height = 25
+        Caption = #29694#22312#21442#21152#20013#12398#12481#12515#12531#12493#12523#12434#20351#29992'(&U)'
+        TabOrder = 2
+        OnClick = btnUseCurrentJoinChannelsClick
+      end
     end
     object tstRule: TTabSheet
       Caption = #12450#12463#12471#12519#12531

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index e2af00b..74ab451 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -54,6 +54,7 @@ type
     lblAutoJoinChannels: TLabel;
     memAutoJoinChannels: TMemo;
     cbxAutoStart: TCheckBox;
+    btnUseCurrentJoinChannels: TButton;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
     procedure ctvBottleNodeChecked(Sender: TObject;
@@ -61,6 +62,7 @@ type
     procedure ctvBottleNodeChecking(Sender: TObject;
       Node: TCPCConfigItemNode; var Allow: Boolean);
     procedure tstRuleShow(Sender: TObject);
+    procedure btnUseCurrentJoinChannelsClick(Sender: TObject);
   private
     { Private \90é\8c¾ }
   public
@@ -215,4 +217,9 @@ begin
   frmRuleList.UpdateDisplay;
 end;
 
+procedure TfrmSetting.btnUseCurrentJoinChannelsClick(Sender: TObject);
+begin
+  memAutoJoinChannels.Lines := JoinChannels;
+end;
+
 end.