2003.08.07 (木) 23:50:31 <u*j*2*6*> 設定→Other→Other2ページのレイアウトの都合でまとめました
2003.08.07 (木) 23:52:34 <u*j*2*6*> あとでアイドルユーザー切断の判定時間を設定できるようにするため、場所とりをしただけです

shuusei24173:日本語ID・チャンネル名を有効にするオプションを1つにまとめた

diff --dos -ur 24172/constants.pas 24173/constants.pas
--- 24172/constants.pas	Thu Aug 07 09:34:16 2003
+++ 24173/constants.pas	Thu Aug 07 23:42:14 2003
@@ -27,7 +27,7 @@
  SLAVANAP_VERSION             = '2.4.1';
  SLAVANAP_BUILD               = '108';
  SLAVANAP_BUILD_DATE          = '24 January 2003';
- SLAVANAP_SHUUSEI             = '72';
+ SLAVANAP_SHUUSEI             = '73';
  SLAVANAP_SHUUSEI_DATE        = '7 August 2003';
  SLAVANAP_VERSION_SHORT       = SLAVANAP_TITLE+' '+SLAVANAP_VERSION;
  SLAVANAP_FULL                = SLAVANAP_TITLE+' '+SLAVANAP_VERSION+
diff --dos -ur 24172/lang.pas 24173/lang.pas
--- 24172/lang.pas	Sat Mar 29 13:27:32 2003
+++ 24173/lang.pas	Thu Aug 07 23:31:32 2003
@@ -1160,8 +1160,7 @@
  LNG_S_SHOTHER3_CB_ENABLE_LOGINIM              = 1796;
  LNG_S_SHOTHER3_LABEL155                       = 1797;
  LNG_S_SHOTHER3_CB_CHANNELS_FORCEENTER         = 1798;
- LNG_S_SHOTHER3_CB_ALLOW_2BYTEID               = 1799;
- LNG_S_SHOTHER3_CB_ALLOW_2BYTECHANNEL          = 1800;
+ LNG_S_SHOTHER3_CB_ALLOW_2BYTENAME             = 1799;
  LNG_S_SHOTHER3_CB_CHECK_LOGINPASS             = 1801;
  LNG_S_SHOTHER3_CB_ENABLE_MSGSERV              = 1802;
  LNG_S_SHOTHER3_CB_RESTRICT_HITPERUSER         = 1803;
@@ -2528,8 +2527,7 @@
   GetIni(ini,LNG_S_SHOTHER3_CB_ENABLE_LOGINIM               ,'Settings','S_SHOTHER3_CB_ENABLE_LOGINIM');
   GetIni(ini,LNG_S_SHOTHER3_LABEL155                        ,'Settings','S_SHOTHER3_LABEL155');
   GetIni(ini,LNG_S_SHOTHER3_CB_CHANNELS_FORCEENTER          ,'Settings','S_SHOTHER3_CB_CHANNELS_FORCEENTER');
-  GetIni(ini,LNG_S_SHOTHER3_CB_ALLOW_2BYTEID                ,'Settings','S_SHOTHER3_CB_ALLOW_2BYTEID');
-  GetIni(ini,LNG_S_SHOTHER3_CB_ALLOW_2BYTECHANNEL           ,'Settings','S_SHOTHER3_CB_ALLOW_2BYTECHANNEL');
+  GetIni(ini,LNG_S_SHOTHER3_CB_ALLOW_2BYTENAME              ,'Settings','S_SHOTHER3_CB_ALLOW_2BYTENAME');
   GetIni(ini,LNG_S_SHOTHER3_CB_CHECK_LOGINPASS              ,'Settings','S_SHOTHER3_CB_CHECK_LOGINPASS');
   GetIni(ini,LNG_S_SHOTHER3_CB_ENABLE_MSGSERV               ,'Settings','S_SHOTHER3_CB_ENABLE_MSGSERV');
   GetIni(ini,LNG_S_SHOTHER3_CB_RESTRICT_HITPERUSER          ,'Settings','S_SHOTHER3_CB_RESTRICT_HITPERUSER');
diff --dos -ur 24172/mainform.pas 24173/mainform.pas
--- 24172/mainform.pas	Thu Aug 07 09:38:16 2003
+++ 24173/mainform.pas	Thu Aug 07 23:30:20 2003
@@ -1472,8 +1472,7 @@
   StrHash_Clear(cons_friends);
   force_enter:=ini.ReadBool('Other2','ForceEnter',false);
   force_enter_channel:=ini.ReadString('Other2','ForceEnterChannel','#Alternative');
-  allow_2byteID:=ini.ReadBool('Other2','Allow2ByteID',false);
-  allow_2bytechannel:=ini.ReadBool('Other2','Allow2ByteChannel',false);
+  allow_2byteName:=ini.ReadBool('Other2','Allow2ByteName',false);
   check_loginpass:=ini.ReadBool('Other2','CheckLoginPass',false);
   loginpass:=ini.ReadString('Other2','LoginPass','');
   enable_msgserv:=ini.ReadBool('Other2','EnableMsgServ',false);
@@ -1958,8 +1957,7 @@
   list.Free;
   ini.WriteBool('Other2','ForceEnter',force_enter);
   ini.WriteString('Other2','ForceEnterChannel',force_enter_channel);
-  ini.WriteBool('Other2','Allow2ByteID',allow_2byteID);
-  ini.WriteBool('Other2','Allow2ByteChannel',allow_2bytechannel);
+  ini.WriteBool('Other2','Allow2ByteName',allow_2byteName);
   ini.WriteBool('Other2','CheckLoginPass',check_loginpass);
   ini.WriteString('Other2','LoginPass',loginpass);
   ini.WriteBool('Other2','EnableMsgServ',enable_msgserv);
diff --dos -ur 24172/settings.dfm 24173/settings.dfm
--- 24172/settings.dfm	Thu Aug 07 09:36:38 2003
+++ 24173/settings.dfm	Thu Aug 07 23:41:34 2003
@@ -6016,7 +6016,7 @@
         end
         object Label157: TLabel
           Left = 192
-          Top = 146
+          Top = 130
           Width = 60
           Height = 12
           Caption = 'パスワード:'
@@ -6024,7 +6024,7 @@
         end
         object Label158: TLabel
           Left = 320
-          Top = 178
+          Top = 162
           Width = 26
           Height = 12
           Caption = 'ヒット'
@@ -6032,7 +6032,7 @@
         end
         object Label159: TLabel
           Left = 320
-          Top = 210
+          Top = 186
           Width = 24
           Height = 12
           Caption = '秒毎'
@@ -6095,115 +6095,107 @@
           Text = '#Alternative'
           Visible = False
         end
-        object cb_allow_2byteID: TCheckBox
+        object cb_allow_2bytename: TCheckBox
           Left = 8
           Top = 112
-          Width = 129
+          Width = 201
           Height = 17
-          Caption = '日本語IDを許可する'
+          Caption = '日本語ID・チャンネル名を許可する'
           TabOrder = 3
         end
-        object cb_allow_2bytechannel: TCheckBox
-          Left = 8
-          Top = 128
-          Width = 185
-          Height = 17
-          Caption = '日本語チャンネル名を許可する'
-          TabOrder = 4
-        end
         object cb_check_loginpass: TCheckBox
           Left = 8
-          Top = 144
+          Top = 128
           Width = 177
           Height = 17
           Caption = 'ログインパスワードを指定する'
-          TabOrder = 5
+          TabOrder = 4
           OnClick = cb_check_loginpassClick
         end
         object edit_loginpass: TEdit
           Left = 256
-          Top = 142
+          Top = 126
           Width = 97
           Height = 20
-          TabOrder = 6
+          TabOrder = 5
           Visible = False
         end
         object cb_enable_msgserv: TCheckBox
           Left = 8
-          Top = 160
+          Top = 144
           Width = 129
           Height = 17
           Caption = '伝言機能を使用する'
-          TabOrder = 7
+          TabOrder = 6
         end
         object cb_restrict_hitperuser: TCheckBox
           Left = 8
-          Top = 176
+          Top = 160
           Width = 249
           Height = 17
           Caption = '検索で同じユーザーがヒットする数を制限'
-          TabOrder = 8
+          TabOrder = 7
           OnClick = cb_restrict_hitperuserClick
         end
         object edit_hitperuser: TSpinEdit
           Left = 256
-          Top = 174
+          Top = 158
           Width = 57
           Height = 21
           MaxValue = 1000
           MinValue = 0
-          TabOrder = 9
+          TabOrder = 8
           Value = 10
           Visible = False
         end
         object cb_refresh_servers: TCheckBox
           Left = 8
-          Top = 208
+          Top = 184
           Width = 201
           Height = 17
           Caption = 'サーバーリストを定期的に更新する'
-          TabOrder = 10
+          TabOrder = 9
           OnClick = cb_refresh_serversClick
         end
         object edit_servreftime: TSpinEdit
           Left = 256
-          Top = 206
+          Top = 182
           Width = 57
           Height = 21
           MaxValue = 3600
           MinValue = 1
-          TabOrder = 11
+          TabOrder = 10
           Value = 30
           Visible = False
         end
         object rd_xbutton_attr: TRadioGroup
-          Left = 224
+          Left = 248
           Top = 232
-          Width = 129
+          Width = 105
           Height = 65
-          Caption = '「閉じる」ボタンの動作'
+          Caption = '「×」ボタンの動作'
           ItemIndex = 0
           Items.Strings = (
             'あとで決める'
             'シャットダウン'
             '最小化')
-          TabOrder = 12
+          TabOrder = 11
         end
         object cb_minshare_noblockact: TCheckBox
           Left = 8
-          Top = 192
+          Top = 224
           Width = 217
           Height = 17
           Caption = '共有が下限以下でも検索・参照を許す'
-          TabOrder = 13
+          TabOrder = 12
         end
         object cb_kill_idleuser: TCheckBox
           Left = 8
-          Top = 224
+          Top = 208
           Width = 185
           Height = 17
           Caption = 'アイドル状態のユーザーを切断'
-          TabOrder = 14
+          TabOrder = 13
         end
         object cb_deny_listall_for_users: TCheckBox
           Left = 8
@@ -6211,7 +6203,7 @@
           Width = 209
           Height = 17
           Caption = '一般ユーザーの827番コマンドを拒否'
-          TabOrder = 15
+          TabOrder = 14
         end
         object cb_block_weird_xnapfile: TCheckBox
           Left = 8
@@ -6219,7 +6211,7 @@
           Width = 185
           Height = 17
           Caption = 'XNapの文字化け共有をブロック'
-          TabOrder = 16
+          TabOrder = 15
         end
       end
       object sh_other4: TDFWTabSheetes
diff --dos -ur 24172/settings.pas 24173/settings.pas
--- 24172/settings.pas	Thu Aug 07 09:39:12 2003
+++ 24173/settings.pas	Thu Aug 07 23:40:06 2003
@@ -586,8 +586,7 @@
     cb_channels_forceenter: TCheckBox;
     edit_channels_forceenter: TEdit;
     Label156: TLabel;
-    cb_allow_2byteID: TCheckBox;
-    cb_allow_2bytechannel: TCheckBox;
+    cb_allow_2bytename: TCheckBox;
     cb_check_loginpass: TCheckBox;
     edit_loginpass: TEdit;
     Label157: TLabel;
@@ -1569,8 +1568,7 @@
      edit_loginim.Lines.Add(loginim[i]);
  cb_channels_forceenter.Checked:=force_enter;
  edit_channels_forceenter.Text:=force_enter_channel;
- cb_allow_2byteID.Checked:=allow_2byteID;
- cb_allow_2bytechannel.Checked:=allow_2bytechannel;
+ cb_allow_2bytename.Checked:=allow_2bytename;
  cb_check_loginpass.Checked:=check_loginpass;
  edit_loginpass.Text:=loginpass;
  edit_loginpass.Visible:=cb_check_loginpass.Checked;
@@ -2172,8 +2170,7 @@
        loginim[i]:=Trim(edit_loginim.Lines.Strings[i]);
    force_enter:=cb_channels_forceenter.Checked;
    force_enter_channel:=edit_channels_forceenter.Text;
-   allow_2byteID:=cb_allow_2byteID.Checked;
-   allow_2bytechannel:=cb_allow_2bytechannel.Checked;
+   allow_2bytename:=cb_allow_2bytename.Checked;
    check_loginpass:=cb_check_loginpass.Checked;
    loginpass:=edit_loginpass.Text;
    enable_msgserv:=cb_enable_msgserv.Checked;
@@ -3052,8 +3049,7 @@
   Label155.Caption                     :=GetLangI(LNG_S_SHOTHER3_CB_ENABLE_LOGINIM);
   cb_enable_loginim.Caption            :=GetLangI(LNG_S_SHOTHER3_LABEL155);
   cb_channels_forceenter.Caption       :=GetLangI(LNG_S_SHOTHER3_CB_CHANNELS_FORCEENTER);
-  cb_allow_2byteID.Caption             :=GetLangI(LNG_S_SHOTHER3_CB_ALLOW_2BYTEID);
-  cb_allow_2bytechannel.Caption        :=GetLangI(LNG_S_SHOTHER3_CB_ALLOW_2BYTECHANNEL);
+  cb_allow_2bytename.Caption           :=GetLangI(LNG_S_SHOTHER3_CB_ALLOW_2BYTENAME);
   cb_check_loginpass.Caption           :=GetLangI(LNG_S_SHOTHER3_CB_CHECK_LOGINPASS);
   cb_enable_msgserv.Caption            :=GetLangI(LNG_S_SHOTHER3_CB_ENABLE_MSGSERV);
   cb_restrict_hitperuser.Caption       :=GetLangI(LNG_S_SHOTHER3_CB_RESTRICT_HITPERUSER);
diff --dos -ur 24172/stypes.pas 24173/stypes.pas
--- 24172/stypes.pas	Tue Aug 05 11:31:50 2003
+++ 24173/stypes.pas	Thu Aug 07 23:42:24 2003
@@ -1212,7 +1212,7 @@
    if str='root'     then exit;
    for i:=0 to 4 do if str=AnsiLowerCase(levels[i]) then exit;
  end;
- if allow_2byteID then
+ if allow_2byteName then
  begin
    if Trim(str)<>str then exit;
    for i:=1 to Length(str) do
@@ -1274,7 +1274,7 @@
   Delete(str,i,1);
   i:=pos('"',str);
  end;
- if allow_2bytechannel then
+ if allow_2bytename then
  begin
    for i:=Length(str) downto 1 do
      if str[i]<=' ' then
diff --dos -ur 24172/vars.pas 24173/vars.pas
--- 24172/vars.pas	Thu Aug 07 09:37:10 2003
+++ 24173/vars.pas	Thu Aug 07 23:30:30 2003
@@ -327,8 +327,7 @@
  loginim: Array[0..MAX_LOGINIM] of String;
  force_enter: Boolean;
  force_enter_channel: String;
- allow_2byteID: Boolean;
- allow_2bytechannel: Boolean;
+ allow_2byteName: Boolean;
  check_loginpass: Boolean;
  loginpass: String;
  enable_msgserv: Boolean;