2004.02.19 (木) 03:33:46 <u*j*2*6*> SlavaNap用コンポーネントをTksoOfficeDock?, TksoOfficeToolbar?, TSpectrumComboBox?, TSlavaSplitter?, TRxTrayIcon?の5つにしぼりました。
2004.02.19 (木) 03:35:28 <u*j*2*6*> 使われていないファイルはプロジェクトファイルからはずしました。
2004.02.19 (木) 03:37:32 <u*j*2*6*> 次回のフルインストール版からは、RXシリーズのコンポーネントをダウンロードしなくてよくなると思います
2004.02.19 (木) 03:39:48 <u*j*2*6*> 修正箇所はCVSでもみれます
2004.02.19 (木) 03:41:01 <u*j*2*6*> 場所はCVS→test241です

shuusei241109:必要のないコンポーネントを整理した

コンポーネント用ファイルの修正箇所

Only in 241108\components: BitmapHolder.dcr
Only in 241108\components: BitmapHolder.pas
Only in 241108\components: Grafxes.pas
Only in 241108\components: Pages.dcr
Only in 241108\components: Pages.pas
Only in 241108\components: Pages2.pas
Only in 241109\components: RXShell.pas
Only in 241108\components: SlavaPanel.dcr
Only in 241108\components: SlavaPanel.pas
Only in 241108\components: autocombo.pas
diff -ur 241108\components/slavanap.cfg 241109\components/slavanap.cfg
--- 241108\components/slavanap.cfg	Sat Aug 09 04:38:42 2003
+++ 241109\components/slavanap.cfg	Wed Feb 18 22:58:56 2004
@@ -34,8 +34,8 @@
 -N"..\output\unit"
 -LE"..\output"
 -LN"c:\program files\borland\delphi6\Projects\Bpl"
--U"..\;dfw0.62\LIB;rx275d6\Units;freevcl-1-0-0\sources"
--O"..\;dfw0.62\LIB;rx275d6\Units;freevcl-1-0-0\sources"
--I"..\;dfw0.62\LIB;rx275d6\Units;freevcl-1-0-0\sources"
--R"..\;dfw0.62\LIB;rx275d6\Units;freevcl-1-0-0\sources"
+-U"testkso"
+-O"testkso"
+-I"testkso"
+-R"testkso"
 -Z
Binary files 241108\components/slavanap.dcr and 241109\components/slavanap.dcr differ
diff -ur 241108\components/slavanap.dof 241109\components/slavanap.dof
--- 241108\components/slavanap.dof	Sat Aug 09 04:49:08 2003
+++ 241109\components/slavanap.dof	Wed Feb 18 22:58:56 2004
@@ -45,7 +45,7 @@
 UnitOutputDir=..\output\unit
 PackageDLLOutputDir=..\output
 PackageDCPOutputDir=
-SearchPath=..\;dfw0.62\LIB;rx275d6\Units;freevcl-1-0-0\sources
+SearchPath=testkso
 Packages=vcl;rtl;vclx;vclshlctrls;VclSmp
 Conditionals=
 DebugSourceDirs=
diff -ur 241108\components/slavanap.dpk 241109\components/slavanap.dpk
--- 241108\components/slavanap.dpk	Sat Aug 09 04:37:28 2003
+++ 241109\components/slavanap.dpk	Wed Feb 18 22:58:48 2004
@@ -1,9 +1,6 @@
 package slavanap;
 
 {$R *.res}
-{$R 'Pages.dcr'}
-{$R 'BitmapHolder.dcr'}
-{$R 'SlavaPanel.dcr'}
 {$ALIGN 8}
 {$ASSERTIONS ON}
 {$BOOLEVAL OFF}
@@ -31,40 +28,18 @@
 
 requires
   vcl,
-  rtl,
-  vclx,
-  VclSmp,
-  designide;
+  rtl;
 
 contains
+  RXShell,
   basecombo in 'basecombo.pas',
   BaseComboForm,
-  Classes2,
-  ComboBox,
-  comboedit,
-  ComboForm,
-  Grafxes,
-  IcoList,
-  MaxMin,
-  OfficeButtons in '..\OfficeButtons.pas',
-  OfficeConsts,
-  OfficeTypes,
+  OfficeTypes in 'OfficeTypes.pas',
   OfficeUtils,
-  RXCConst,
-  RXConst,
-  SpectrumCombo in '..\SpectrumCombo.pas',
+  OfficeToolBar,
+  SpectrumCombo,
   SpectrumComboForm,
-  VCLUtils,
-  OfficeToolBar in 'freevcl-1-0-0\Sources\OfficeToolBar.pas',
-  OfficeEdit in 'freevcl-1-0-0\Sources\OfficeEdit.pas',
-  OfficePanel in 'freevcl-1-0-0\Sources\OfficePanel.pas',
-  OfficeControls in '..\OfficeControls.pas',
-  RXShell in 'rx275d6\Units\RXSHELL.PAS',
-  Pages in 'Pages.pas',
-  BitmapHolder in 'BitmapHolder.pas',
-  SlavaPanel in 'SlavaPanel.pas',
   SlavaSplitter in 'SlavaSplitter.pas',
-  Pages2 in 'Pages2.pas',
   slavareg in 'slavareg.pas';
 
 end.
diff -ur 241108\components/slavareg.pas 241109\components/slavareg.pas
--- 241108\components/slavareg.pas	Sat Aug 09 04:36:40 2003
+++ 241109\components/slavareg.pas	Wed Feb 18 22:56:44 2004
@@ -4,7 +4,7 @@
 
 interface
 
-uses SysUtils, Windows, Messages, Classes, Graphics, Controls, Forms, StdCtrls;
+uses Classes, Controls;
 
 
 procedure Register;
@@ -12,16 +12,9 @@
 implementation
 
 uses
-  combobox,
+  RXShell,
   OfficeToolBar,
-  OfficeEdit,
-  OfficePanel,
-  OfficeControls,
-  OfficeButtons,
-  RXSHELL,
-  //Spin2000,
-  SpectrumCombo,
-  SlavaPanel;
+  SpectrumCombo;
 {$R slavanap.dcr}
 
 type
@@ -30,21 +23,10 @@
 procedure Register;
 begin
   RegisterComponents('SlavaNap', [
-    TksoComboBox,
-    TksoEdit,
-    TksoOfficeButton,
-    TksoOfficeCheckBox,
+    TRxTrayIcon,
     TksoOfficeDock,
-    TksoOfficeGroupBox,
-    TksoOfficeMemo,
-    TksoOfficePanel,
-    TksoOfficeRadioButton,
-    TksoOfficeSpeedButton,
     TksoOfficeToolBar,
-    TksoSpectrumComboBox,
-    TRxTrayIcon,
-    TSlavaPanel
-    // TSpinEdit2000
+    TksoSpectrumComboBox
   ]);
 
 end;

プロジェクトファイルの修正箇所

Only in 241108: OfficeButtons.pas
Only in 241108: OfficeControls.pas
diff --dos -ur 241108/RXShell.pas 241109/RXShell.pas
--- 241108/RXShell.pas	Mon Jan 27 15:27:50 2003
+++ 241109/RXShell.pas	Wed Feb 18 22:54:54 2004
@@ -16,14 +16,19 @@
 
 unit RXShell;
 
-{$I RX.INC}
+//{$I RX.INC}
 {$P+,W-,R-}
 
 interface
 
 uses {$IFDEF WIN32} Windows, {$ELSE} WinTypes, WinProcs, {$ENDIF} Messages,
-  Classes, Graphics, SysUtils, Forms, Controls, Menus, ShellAPI,
-  {$IFDEF USE_TIMER} ExtCtrls, {$ENDIF} IcoList;
+  Classes, Graphics, SysUtils, Forms, Controls, Menus,
+  {$IFDEF USE_TIMER} ExtCtrls, {$ENDIF} ShellAPI;//IcoList;
+
+const
+//RXConst.pasより抜粋
+{ Notify message for TRxTrayIcon }
+  CM_TRAYICON        = CM_BASE + 84;
 
 type
 {$IFNDEF WIN32}
@@ -48,19 +53,12 @@
     FHandle: HWnd;
     FActive: Boolean;
     FAdded: Boolean;
-    FAnimated: Boolean;
     FEnabled: Boolean;
     FClicked: TMouseButtons;
     FIconIndex: Integer;
     FInterval: Word;
     FIconData: TNotifyIconData;
     FIcon: TIcon;
-    FIconList: TIconList;
-{$IFDEF USE_TIMER}
-    FTimer: TTimer;
-{$ELSE}
-    FTimer: TThread;
-{$ENDIF}
     FHint: string;
     FShowDesign: Boolean;
     FPopupMenu: TPopupMenu;
@@ -71,25 +69,16 @@
     FOnMouseUp: TMouseEvent;
     CM_TASKBAR_RECREATE: UINT;
     procedure ChangeIcon;
-{$IFDEF USE_TIMER}
-    procedure Timer(Sender: TObject);
-{$ELSE}
-    procedure Timer;
-{$ENDIF}
     procedure SendCancelMode;
     function CheckMenuPopup(X, Y: Integer): Boolean;
     function CheckDefaultMenuItem: Boolean;
     procedure SetHint(const Value: string);
     procedure SetIcon(Value: TIcon);
-    procedure SetIconList(Value: TIconList);
     procedure SetPopupMenu(Value: TPopupMenu);
     procedure Activate;
     procedure Deactivate;
     procedure SetActive(Value: Boolean);
-    function GetAnimated: Boolean;
-    procedure SetAnimated(Value: Boolean);
     procedure SetShowDesign(Value: Boolean);
-    procedure SetInterval(Value: Word);
     procedure IconChanged(Sender: TObject);
     procedure WndProc(var Message: TMessage);
     function GetActiveIcon: TIcon;
@@ -113,10 +102,7 @@
     property Enabled: Boolean read FEnabled write FEnabled default True;
     property Hint: string read FHint write SetHint;
     property Icon: TIcon read FIcon write SetIcon;
-    property Icons: TIconList read FIconList write SetIconList;
     { Ensure Icons is declared before Animated }
-    property Animated: Boolean read GetAnimated write SetAnimated default False;
-    property Interval: Word read FInterval write SetInterval default 150;
     property PopupMenu: TPopupMenu read FPopupMenu write SetPopupMenu;
     property ShowDesign: Boolean read FShowDesign write SetShowDesign stored False;
     property OnClick: TMouseEvent read FOnClick write FOnClick;
@@ -126,7 +112,6 @@
     property OnMouseUp: TMouseEvent read FOnMouseUp write FOnMouseUp;
   end;
 
-function IconExtract(const FileName: string; Id: Integer): TIcon;
 procedure WinAbout(const AppName, Stuff: string);
 
 type
@@ -136,10 +121,15 @@
   InitialState: TExecState): THandle;
 function FileExecuteWait(const FileName, Params, StartDir: string;
   InitialState: TExecState): Integer;
+procedure SwitchToWindow(Wnd: HWnd; Restore: Boolean);
 
 implementation
 
-uses RxConst, RxCConst, VCLUtils, MaxMin;
+//uses
+     //RxConst, //CM_TRAYICONの参照のためだけに使う
+     //RxCConst, //IconExtractの中でSFileNotExecを呼ぶためだけに使う
+     //VCLUtils;//SwitchToWindowをよぶためだけに使う
+     //, MaxMin; //不要
 
 {$IFNDEF WIN32}
 const
@@ -151,6 +141,19 @@
   far; external Shell;
 {$ENDIF WIN32}
 
+//VCLUtilsより抜粋
+procedure SwitchToWindow(Wnd: HWnd; Restore: Boolean);
+begin
+  if IsWindowEnabled(Wnd) then begin
+    SetForegroundWindow(Wnd);
+    if Restore and IsWindowVisible(Wnd) then begin
+      if not IsZoomed(Wnd) then
+        SendMessage(Wnd, WM_SYSCOMMAND, SC_RESTORE, 0);
+      SetFocus(Wnd);
+    end;
+  end;
+end;
+
 procedure WinAbout(const AppName, Stuff: string);
 var
 {$IFNDEF WIN32}
@@ -172,34 +175,6 @@
 {$ENDIF}
 end;
 
-function IconExtract(const FileName: string; Id: Integer): TIcon;
-var
-  S: array[0..255] of char;
-  IconHandle: HIcon;
-  Index: Word;
-begin
-  Result := TIcon.Create;
-  try
-    StrPLCopy(S, FileName, SizeOf(S) - 1);
-    IconHandle := ExtractIcon(hInstance, S, Id);
-    if IconHandle < 2 then begin
-      Index := Id;
-      IconHandle := ExtractAssociatedIcon(hInstance, S, Index);
-    end;
-    if IconHandle < 2 then begin
-      if IconHandle = 1 then
-        raise EResNotFound.Create(LoadStr(SFileNotExec))
-      else begin
-        Result.Free;
-        Result := nil;
-      end;
-    end else Result.Handle := IconHandle;
-  except
-    Result.Free;
-    raise;
-  end;
-end;
-
 const
   ShowCommands: array[TExecState] of Integer =
     (SW_SHOWNORMAL, SW_MINIMIZE, SW_SHOWMAXIMIZED, SW_HIDE);
@@ -262,46 +237,6 @@
 end;
 {$ENDIF}
 
-{$IFNDEF USE_TIMER}
-
-{ TTimerThread }
-
-type
-  TTimerThread = class(TThread)
-  private
-    FOwnerTray: TRxTrayIcon;
-  protected
-    procedure Execute; override;
-  public
-    constructor Create(TrayIcon: TRxTrayIcon; CreateSuspended: Boolean);
-  end;
-
-constructor TTimerThread.Create(TrayIcon: TRxTrayIcon; CreateSuspended: Boolean);
-begin
-  FOwnerTray := TrayIcon;
-  inherited Create(CreateSuspended);
-  FreeOnTerminate := True;
-end;
-
-procedure TTimerThread.Execute;
-
-  function ThreadClosed: Boolean;
-  begin
-    Result := Terminated or Application.Terminated or (FOwnerTray = nil);
-  end;
-
-begin
-  while not Terminated do begin
-    if not ThreadClosed then
-      if SleepEx(FOwnerTray.FInterval, False) = 0 then begin
-        if not ThreadClosed and FOwnerTray.Animated then
-          FOwnerTray.Timer;
-      end;
-  end;
-end;
-
-{$ENDIF USE_TIMER}
-
 {$IFNDEF WIN32}
 
 type
@@ -375,8 +310,6 @@
   FHandle := Classes.AllocateHWnd(WndProc);
   FIcon := TIcon.Create;
   FIcon.OnChange := IconChanged;
-  FIconList := TIconList.Create;
-  FIconList.OnChange := IconChanged;
   FIconIndex := -1;
   FEnabled := True;
   FInterval := 150;
@@ -387,15 +320,12 @@
 begin
   Destroying;
   FEnabled := False;
-  FIconList.OnChange := nil;
   FIcon.OnChange := nil;
-  SetAnimated(False);
+  //SetAnimated(False);
   Deactivate;
   Classes.DeallocateHWnd(FHandle);
   FIcon.Free;
   FIcon := nil;
-  FIconList.Free;
-  FIconList := nil;
   inherited Destroy;
 end;
 
@@ -484,52 +414,9 @@
   FIcon.Assign(Value);
 end;
 
-procedure TRxTrayIcon.SetIconList(Value: TIconList);
-begin
-  FIconList.Assign(Value);
-end;
-
 function TRxTrayIcon.GetActiveIcon: TIcon;
 begin
   Result := FIcon;
-  if (FIconList <> nil) and (FIconList.Count > 0) and Animated then
-    Result := FIconList[Max(Min(FIconIndex, FIconList.Count - 1), 0)];
-end;
-
-function TRxTrayIcon.GetAnimated: Boolean;
-begin
-  Result := FAnimated;
-end;
-
-procedure TRxTrayIcon.SetAnimated(Value: Boolean);
-begin
-  Value := Value and Assigned(FIconList) and (FIconList.Count > 0);
-  if Value <> Animated then begin
-    if Value then begin
-{$IFDEF USE_TIMER}
-      FTimer := TTimer.Create(Self);
-      FTimer.Enabled := FAdded;
-      FTimer.Interval := FInterval;
-      FTimer.OnTimer := Timer;
-{$ELSE}
-      FTimer := TTimerThread.Create(Self, not FAdded);
-{$ENDIF}
-      FAnimated := True;
-    end
-    else begin
-      FAnimated := False;
-{$IFDEF USE_TIMER}
-      FTimer.Free;
-      FTimer := nil;
-{$ELSE}
-      TTimerThread(FTimer).FOwnerTray := nil;
-      while FTimer.Suspended do FTimer.Resume;
-      FTimer.Terminate;
-{$ENDIF}
-    end;
-    FIconIndex := 0;
-    ChangeIcon;
-  end;
 end;
 
 procedure TRxTrayIcon.SetActive(Value: Boolean);
@@ -559,30 +446,6 @@
   end;
 end;
 
-procedure TRxTrayIcon.SetInterval(Value: Word);
-begin
-  if FInterval <> Value then begin
-    FInterval := Value;
-{$IFDEF USE_TIMER}
-    if Animated then FTimer.Interval := FInterval;
-{$ENDIF}
-  end;
-end;
-
-{$IFDEF USE_TIMER}
-procedure TRxTrayIcon.Timer(Sender: TObject);
-{$ELSE}
-procedure TRxTrayIcon.Timer;
-{$ENDIF}
-begin
-  if not (csDestroying in ComponentState) and Animated then begin
-    Inc(FIconIndex);
-    if (FIconList = nil) or (FIconIndex >= FIconList.Count) then
-      FIconIndex := 0;
-    ChangeIcon;
-  end;
-end;
-
 procedure TRxTrayIcon.IconChanged(Sender: TObject);
 begin
   ChangeIcon;
@@ -630,12 +493,6 @@
     FAdded := Shell_NotifyIcon(NIM_ADD, @FIconData);
     if (GetShortHint(FHint) = '') and FAdded then
       Shell_NotifyIcon(NIM_MODIFY, @FIconData);
-{$IFDEF USE_TIMER}
-    if Animated then FTimer.Enabled := True;
-{$ELSE}
-    if Animated then
-      while FTimer.Suspended do FTimer.Resume;
-{$ENDIF}
   end;
 end;
 
@@ -644,18 +501,12 @@
   Shell_NotifyIcon(NIM_DELETE, @FIconData);
   FAdded := False;
   FClicked := [];
-{$IFDEF USE_TIMER}
-  if Animated then FTimer.Enabled := False;
-{$ELSE}
-  if Animated and not FTimer.Suspended then FTimer.Suspend;
-{$ENDIF}
 end;
 
 procedure TRxTrayIcon.ChangeIcon;
 var
   Ico: TIcon;
 begin
-  if (FIconList = nil) or (FIconList.Count = 0) then SetAnimated(False);
   if FAdded then begin
     Ico := GetActiveIcon;
     if (Ico <> nil) and not Ico.Empty then begin
Only in 241108: SlavaPanel.pas
Only in 241108: Spin2000.pas
diff --dos -ur 241108/announceform.dfm 241109/announceform.dfm
--- 241108/announceform.dfm	Thu Feb 13 18:47:46 2003
+++ 241109/announceform.dfm	Thu Feb 19 02:44:46 2004
@@ -151,16 +151,13 @@
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 12
-  object panel_bottom: TSlavaPanel
+  object panel_bottom: TPanel
     Left = 0
     Top = 241
     Width = 405
     Height = 21
-    BorderColor1 = clWhite
-    BorderColor2 = clGray
     Align = alBottom
     BevelOuter = bvLowered
-    BorderType = sbNone
     Caption = ' '
     ParentColor = True
     TabOrder = 0
@@ -177,16 +174,13 @@
       OnKeyPress = editKeyPress
     end
   end
-  object panel_left: TSlavaPanel
+  object panel_left: TPanel
     Left = 0
     Top = 0
     Width = 405
     Height = 241
-    BorderColor1 = clWhite
-    BorderColor2 = clGray
     Align = alClient
     BevelOuter = bvLowered
-    BorderType = sbNone
     Caption = ' '
     ParentColor = True
     TabOrder = 1
diff --dos -ur 241108/announceform.pas 241109/announceform.pas
--- 241108/announceform.pas	Tue Feb 18 03:27:00 2003
+++ 241109/announceform.pas	Wed Feb 18 21:03:34 2004
@@ -12,13 +12,13 @@
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, OfficeEdit, ExtCtrls, SlavaPanel, ComCtrls, Menus, localusers;
+  StdCtrls, ExtCtrls, ComCtrls, Menus, localusers;
 
 type
   TSlavaNapAnnounceWindow = class(TForm)
-    panel_bottom: TSlavaPanel;
+    panel_bottom: TPanel;
     edit: TEdit;
-    panel_left: TSlavaPanel;
+    panel_left: TPanel;
     log: TRichEdit;
     MainMenu1: TMainMenu;
     mnu_close: TMenuItem;
Only in 241108: autocombo.pas
diff --dos -ur 241108/chanattr.pas 241109/chanattr.pas
--- 241108/chanattr.pas	Sat Aug 09 04:40:00 2003
+++ 241109/chanattr.pas	Wed Feb 18 18:00:20 2004
@@ -20,9 +20,8 @@
 interface
 
 uses
-  Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs, stypes,
-  vars, channels, handler, constants, lang, OfficeControls, StdCtrls,
-  OfficeEdit, OfficeButtons, basecombo, ComboBox, slavastrings,
+  Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
+  stypes, vars, channels, handler, constants, lang, StdCtrls, slavastrings,
   Spin, Classes, languages;
 
 type
diff --dos -ur 241108/channelform.dfm 241109/channelform.dfm
--- 241108/channelform.dfm	Wed Mar 12 09:47:44 2003
+++ 241109/channelform.dfm	Wed Feb 18 21:01:06 2004
@@ -150,16 +150,13 @@
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 12
-  object panel_bottom: TSlavaPanel
+  object panel_bottom: TPanel
     Left = 0
     Top = 346
     Width = 555
     Height = 21
-    BorderColor1 = clWhite
-    BorderColor2 = clGray
     Align = alBottom
     BevelOuter = bvLowered
-    BorderType = sbNone
     Caption = ' '
     ParentColor = True
     TabOrder = 0
@@ -569,16 +566,13 @@
       BorderColor1 = clBtnFace
       BorderColor2 = clBtnFace
     end
-    object panel_right: TSlavaPanel
+    object panel_right: TPanel
       Left = 385
       Top = 0
       Width = 170
       Height = 346
-      BorderColor1 = clWhite
-      BorderColor2 = clGray
       Align = alRight
       BevelOuter = bvLowered
-      BorderType = sbNone
       Caption = ' '
       ParentColor = True
       TabOrder = 0
@@ -606,16 +600,13 @@
         OnResize = usersResize
       end
     end
-    object panel_left: TSlavaPanel
+    object panel_left: TPanel
       Left = 0
       Top = 0
       Width = 378
       Height = 346
-      BorderColor1 = clWhite
-      BorderColor2 = clGray
       Align = alClient
       BevelOuter = bvLowered
-      BorderType = sbNone
       Caption = ' '
       ParentColor = True
       TabOrder = 1
diff --dos -ur 241108/channelform.pas 241109/channelform.pas
--- 241108/channelform.pas	Wed Mar 26 10:54:36 2003
+++ 241109/channelform.pas	Wed Feb 18 21:02:04 2004
@@ -21,16 +21,16 @@
 
 uses
   Windows, Messages, SysUtils, Classes, Classes2, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, ExtCtrls, SlavaPanel, SlavaSplitter, ComCtrls, Menus, clipbrd;
+  StdCtrls, ExtCtrls, SlavaSplitter, ComCtrls, Menus, clipbrd;
 
 type
   TSlavaNapChannelWindow = class(TForm)
-    panel_bottom: TSlavaPanel;
+    panel_bottom: TPanel;
     edit: TEdit;
     panel_client: TPanel;
-    panel_right: TSlavaPanel;
+    panel_right: TPanel;
     SlavaSplitter1: TSlavaSplitter;
-    panel_left: TSlavaPanel;
+    panel_left: TPanel;
     log: TRichEdit;
     users: TListView;
     PopupMenu1: TPopupMenu;
diff --dos -ur 241108/chatform.dfm 241109/chatform.dfm
--- 241108/chatform.dfm	Tue Jan 28 17:05:12 2003
+++ 241109/chatform.dfm	Wed Feb 18 21:02:36 2004
@@ -150,17 +150,14 @@
   OnResize = FormResize
   OnShow = FormShow
   PixelsPerInch = 96
-  TextHeight = 13
-  object panel_bottom: TSlavaPanel
+  TextHeight = 12
+  object panel_bottom: TPanel
     Left = 0
-    Top = 239
+    Top = 241
     Width = 405
-    Height = 23
-    BorderColor1 = clWhite
-    BorderColor2 = clGray
+    Height = 21
     Align = alBottom
     BevelOuter = bvLowered
-    BorderType = sbNone
     Caption = ' '
     ParentColor = True
     TabOrder = 0
@@ -168,25 +165,22 @@
     object edit: TEdit
       Left = 2
       Top = 2
-      Width = 401
-      Height = 19
+      Width = 370
+      Height = 17
       BorderStyle = bsNone
       TabOrder = 0
       Text = 'edit'
-      OnKeyPress = editKeyPress
       OnKeyDown = editKeyDown
+      OnKeyPress = editKeyPress
     end
   end
-  object panel_left: TSlavaPanel
+  object panel_left: TPanel
     Left = 0
     Top = 0
     Width = 405
-    Height = 239
-    BorderColor1 = clWhite
-    BorderColor2 = clGray
+    Height = 241
     Align = alClient
     BevelOuter = bvLowered
-    BorderType = sbNone
     Caption = ' '
     ParentColor = True
     TabOrder = 1
@@ -194,7 +188,7 @@
       Left = 1
       Top = 1
       Width = 403
-      Height = 237
+      Height = 239
       Align = alClient
       BorderStyle = bsNone
       Lines.Strings = (
diff --dos -ur 241108/chatform.pas 241109/chatform.pas
--- 241108/chatform.pas	Wed Mar 26 10:56:06 2003
+++ 241109/chatform.pas	Wed Feb 18 21:03:34 2004
@@ -21,13 +21,13 @@
 
 uses
   Windows, Messages, SysUtils, Classes, Classes2, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, OfficeEdit, ExtCtrls, SlavaPanel, ComCtrls, Menus;
+  StdCtrls, ExtCtrls, ComCtrls, Menus;
 
 type
   TSlavaNapChatWindow = class(TForm)
-    panel_bottom: TSlavaPanel;
+    panel_bottom: TPanel;
     edit: TEdit;
-    panel_left: TSlavaPanel;
+    panel_left: TPanel;
     log: TRichEdit;
     MainMenu1: TMainMenu;
     mnu_close: TMenuItem;
diff --dos -ur 241108/console.pas 241109/console.pas
--- 241108/console.pas	Mon Oct 20 22:55:38 2003
+++ 241109/console.pas	Wed Feb 18 21:05:12 2004
@@ -20,9 +20,9 @@
 interface
 
 uses
- SysUtils, Classes, Classes2, graphics, zlibex, slavasplitter, slavapanel, winsock,
- windows, constants, stypes, lang, blcksock, synsock, users, registered,
- localusers, servers, comctrls, slavastrings, mmsystem, class_cmdlist;
+ SysUtils, Classes, Classes2, graphics, zlibex, winsock, windows, constants,
+ stypes, lang, blcksock, synsock, users, registered, localusers, servers,
+ comctrls, slavastrings, mmsystem, class_cmdlist;
 
 procedure ConsoleListRegistered;
 procedure ConsoleListUsers;
diff --dos -ur 241108/constants.pas 241109/constants.pas
--- 241108/constants.pas	Mon Feb 16 21:33:12 2004
+++ 241109/constants.pas	Thu Feb 19 02:30:48 2004
@@ -27,8 +27,8 @@
  SLAVANAP_VERSION             = '2.4.1';
  SLAVANAP_BUILD               = '108';
  SLAVANAP_BUILD_DATE          = '24 January 2003';
- SLAVANAP_SHUUSEI             = '108';
- SLAVANAP_SHUUSEI_DATE        = '16 February 2004';
+ SLAVANAP_SHUUSEI             = '109';
+ SLAVANAP_SHUUSEI_DATE        = '19 February 2004';
  SLAVANAP_VERSION_SHORT       = SLAVANAP_TITLE+' '+SLAVANAP_VERSION;
  SLAVANAP_FULL                = SLAVANAP_TITLE+' '+SLAVANAP_VERSION+
                                 ' (build '+SLAVANAP_BUILD+
diff --dos -ur 241108/editdialog.dfm 241109/editdialog.dfm
--- 241108/editdialog.dfm	Wed Mar 26 23:02:12 2003
+++ 241109/editdialog.dfm	Wed Feb 18 16:52:56 2004
@@ -25,19 +25,15 @@
     Caption = 'Label1'
     Layout = tlCenter
   end
-  object edit: TksoEdit
-    Left = 6
+  object edit: TEdit
+    Left = 14
     Top = 59
-    Width = 201
+    Width = 187
     Height = 20
-    BorderStyle = kbsSunken
     TabOrder = 0
     Text = 'edit'
-    BorderStyleFlat = kbsFlat
-    BorderStyleFocused = kbsOuterSunken
-    Flat = True
   end
-  object btn_ok: TksoOfficeButton
+  object btn_ok: TButton
     Left = 13
     Top = 89
     Width = 69
@@ -45,13 +41,8 @@
     Caption = 'btn_ok'
     TabOrder = 1
     OnClick = btn_okClick
-    BorderStyle = kbsOuterRaised
-    BorderStyleFlat = kbsOuterRaised
-    BorderStyleFocused = kbsRaised
-    BorderStyleDown = kbsDown
-    Flat = True
   end
-  object btn_cancel: TksoOfficeButton
+  object btn_cancel: TButton
     Left = 131
     Top = 89
     Width = 69
@@ -59,10 +50,5 @@
     Caption = 'btn_cancel'
     TabOrder = 2
     OnClick = btn_cancelClick
-    BorderStyle = kbsOuterRaised
-    BorderStyleFlat = kbsOuterRaised
-    BorderStyleFocused = kbsRaised
-    BorderStyleDown = kbsDown
-    Flat = True
   end
 end
diff --dos -ur 241108/editdialog.pas 241109/editdialog.pas
--- 241108/editdialog.pas	Wed Mar 26 10:56:58 2003
+++ 241109/editdialog.pas	Wed Feb 18 16:54:04 2004
@@ -21,7 +21,7 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, OfficeButtons, OfficeEdit, Classes;
+  StdCtrls, Classes;
 
 const
  SE_NAPIGATORPASS   = 0;
@@ -31,9 +31,9 @@
 type
   TSlavaNapEdit = class(TForm)
     Label1: TLabel;
-    edit: TksoEdit;
-    btn_ok: TksoOfficeButton;
-    btn_cancel: TksoOfficeButton;
+    edit: TEdit;
+    btn_ok: TButton;
+    btn_cancel: TButton;
     procedure btn_cancelClick(Sender: TObject);
     procedure btn_okClick(Sender: TObject);
     function  CheckData: Boolean;
diff --dos -ur 241108/english.lng 241109/english.lng
--- 241108/english.lng	Mon Feb 16 02:25:44 2004
+++ 241109/english.lng	Wed Feb 18 18:13:26 2004
@@ -7,7 +7,7 @@
 Version=2.4.1
 Comments=Original file by SlavaNap development team
 BUILD=108
-SHUUSEI=107
+SHUUSEI=109
 
 [Log]
 SERVER_INIT=Starting $1
@@ -862,15 +862,15 @@
 S_SHREPORT_CB_REPORT_NEW_HIDEHUB           =Hide network hub (server that has user limit < 10) in report.
 S_SHREPORT_LABEL90                         =Port:
 S_SHREPORT_CB_REPORT_TRUESTATS             =Always use true hostname for stats reports, even if alias is in use.
-S_SHREPORT_KSOOFFICEGROUPBOX2              = Old style reporting 
-S_SHREPORT_KSOOFFICEGROUPBOX3              = Extended reporting (used by report.php script) 
+S_SHREPORT_GROUPBOX2                       = Old style reporting 
+S_SHREPORT_GROUPBOX3                       = Extended reporting (used by report.php script) 
 S_SHOTHER_LABEL84                          =This page and sub-pages contain different built-in bots and other extra options.
 S_SHOTHER_CB_ANN_ENABLE                    =Enable bot
 S_SHOTHER_LABEL85                          =This bot will send announcements to all local users (it will not send any\nannouncements to users on linked servers).
 S_SHOTHER_LABEL86                          =Delay between messages (seconds):
 S_SHOTHER_LABEL87                          =Messages: (messages will be sent in random order)
 S_SHOTHER_LABEL88                          =Send all announcements from this user:
-S_SHOTHER_KSOOFFICEGROUPBOX1               = Announements bot 
+S_SHOTHER_GROUPBOX4                        = Announements bot 
 S_SHMINSHARE_LABEL91                       =Minimum number of shared files:
 S_SHMINSHARE_LABEL92                       =You can set minimum number of shared files or minimum size for all shared\nfiles or both options. If you don't want to use any option set it to "0".\nThis number doesn't apply to mods+, friends and users on linked servers.
 S_SHMINSHARE_LABEL93                       =Check number of shared files when user is online for \nthis number of minutes (it takes some time after login\nto share files. with some client software it might take\nup to 5 minutes to share all files)
diff --dos -ur 241108/handler.pas 241109/handler.pas
--- 241108/handler.pas	Fri Jan 02 13:14:32 2004
+++ 241109/handler.pas	Wed Feb 18 21:05:00 2004
@@ -19,10 +19,10 @@
 interface
 
 uses
- SysUtils, Classes2, graphics, zlibex, slavasplitter, slavapanel, winsock, windows,
- constants, users, servers, stypes, blcksock, synsock, localusers, registered,
- slavastrings, class_cmdlist, class_cmd2list, class_cmdexlist, mmsystem, ips,
- keywords, keywords2, share2, blocks;
+ SysUtils, Classes2, graphics, zlibex, winsock, windows, constants, users,
+ servers, stypes, blcksock, synsock, localusers, registered, slavastrings,
+ class_cmdlist, class_cmd2list, class_cmdexlist, mmsystem, ips, keywords,
+ keywords2, share2, blocks;
 
 function ProcessCommand(usr: TLocalUser; q: TQuery=queryNormal): Boolean;
 procedure ProcessServerCommand(srv: TServer);
diff --dos -ur 241108/invitationform.pas 241109/invitationform.pas
--- 241108/invitationform.pas	Wed Mar 26 14:51:44 2003
+++ 241109/invitationform.pas	Wed Feb 18 17:55:08 2004
@@ -21,7 +21,7 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  ExtCtrls, StdCtrls, OfficeButtons, OfficeEdit, Classes;
+  ExtCtrls, StdCtrls, Classes;
 
 type
   TSlavaNapInvitation = class(TForm)
diff --dos -ur 241108/japanese.lng 241109/japanese.lng
--- 241108/japanese.lng	Mon Feb 16 02:21:48 2004
+++ 241109/japanese.lng	Wed Feb 18 18:13:22 2004
@@ -7,7 +7,7 @@
 Version=2.4.1.108
 Comments=Translated by usj12262@hotmail.com
 BUILD=108
-SHUUSEI=107
+SHUUSEI=109
 
 [Log]
 SERVER_INIT=$1を起動中…
@@ -862,15 +862,15 @@
 S_SHREPORT_CB_REPORT_NEW_HIDEHUB          =レポートでネットワークハブ(定員10人以下のサーバー)を隠す
 S_SHREPORT_LABEL90                        =ポート:
 S_SHREPORT_CB_REPORT_TRUESTATS            =統計報告で常に実際のホスト名を使う(エイリアスを使用中でも)
-S_SHREPORT_KSOOFFICEGROUPBOX2             =古いスタイルの報告
-S_SHREPORT_KSOOFFICEGROUPBOX3             =拡張報告(report.phpスクリプトで使用)
+S_SHREPORT_GROUPBOX2                      =古いスタイルの報告
+S_SHREPORT_GROUPBOX3                      =拡張報告(report.phpスクリプトで使用)
 S_SHOTHER_LABEL84                         =内部で実装しているBotとその他の特別な機能の設定です。
 S_SHOTHER_CB_ANN_ENABLE                   =Bot有効
 S_SHOTHER_LABEL85                         =このBotはすべてのローカルユーザーにアナウンスを送ります。\n(リンクサーバーのユーザーにはなにもアナウンスしません)
 S_SHOTHER_LABEL86                         =メッセージの送信間隔(秒):
 S_SHOTHER_LABEL87                         =メッセージ:(メッセージはランダムな順番で送信されます)
 S_SHOTHER_LABEL88                         =このユーザー名で送信する:
-S_SHOTHER_KSOOFFICEGROUPBOX1              =アナウンスBot
+S_SHOTHER_GROUPBOX1                       =アナウンスBot
 S_SHMINSHARE_LABEL91                      =共有ファイル数の下限:
 S_SHMINSHARE_LABEL92                      =共有ファイル数の下限や総サイズの下限を設定できます。\nなにもオプションを使いたくなければ"0"にしてください。この数字\nは、mods+や友達やリンクサーバーのユーザーには適用されません。
 S_SHMINSHARE_LABEL93                      =ユーザーがオンラインになってからこの時間\n(分)経過したら共有ファイル数をチェックする\n(ログインからファイル登録まで多少時間がかかります。クライアント\nによってはすべてのファイルの共有に5分近くかかるかもしれません。)
diff --dos -ur 241108/lang.pas 241109/lang.pas
--- 241108/lang.pas	Fri Jan 16 01:02:40 2004
+++ 241109/lang.pas	Wed Feb 18 17:15:40 2004
@@ -1055,15 +1055,15 @@
  LNG_S_SHREPORT_CB_REPORT_NEW_HIDEHUB          = 1525;
  LNG_S_SHREPORT_LABEL90                        = 1526;
  LNG_S_SHREPORT_CB_REPORT_TRUESTATS            = 1527;
- LNG_S_SHREPORT_KSOOFFICEGROUPBOX2             = 1528;
- LNG_S_SHREPORT_KSOOFFICEGROUPBOX3             = 1529;
+ LNG_S_SHREPORT_GROUPBOX2                      = 1528;
+ LNG_S_SHREPORT_GROUPBOX3                      = 1529;
  LNG_S_SHOTHER_LABEL84                         = 1541;
  LNG_S_SHOTHER_CB_ANN_ENABLE                   = 1542;
  LNG_S_SHOTHER_LABEL85                         = 1543;
  LNG_S_SHOTHER_LABEL86                         = 1544;
  LNG_S_SHOTHER_LABEL87                         = 1545;
  LNG_S_SHOTHER_LABEL88                         = 1546;
- LNG_S_SHOTHER_KSOOFFICEGROUPBOX1              = 1547;
+ LNG_S_SHOTHER_GROUPBOX4                       = 1547;
  LNG_S_SHMINSHARE_LABEL91                      = 1561;
  LNG_S_SHMINSHARE_LABEL92                      = 1562;
  LNG_S_SHMINSHARE_LABEL93                      = 1563;
@@ -2458,15 +2458,15 @@
   GetIni(ini,LNG_S_SHREPORT_CB_REPORT_NEW_HIDEHUB           ,'Settings','S_SHREPORT_CB_REPORT_NEW_HIDEHUB');
   GetIni(ini,LNG_S_SHREPORT_LABEL90                         ,'Settings','S_SHREPORT_LABEL90');
   GetIni(ini,LNG_S_SHREPORT_CB_REPORT_TRUESTATS             ,'Settings','S_SHREPORT_CB_REPORT_TRUESTATS');
-  GetIni(ini,LNG_S_SHREPORT_KSOOFFICEGROUPBOX2              ,'Settings','S_SHREPORT_KSOOFFICEGROUPBOX2');
-  GetIni(ini,LNG_S_SHREPORT_KSOOFFICEGROUPBOX3              ,'Settings','S_SHREPORT_KSOOFFICEGROUPBOX3');
+  GetIni(ini,LNG_S_SHREPORT_GROUPBOX2                       ,'Settings','S_SHREPORT_GROUPBOX2');
+  GetIni(ini,LNG_S_SHREPORT_GROUPBOX3                       ,'Settings','S_SHREPORT_GROUPBOX3');
   GetIni(ini,LNG_S_SHOTHER_LABEL84                          ,'Settings','S_SHOTHER_LABEL84');
   GetIni(ini,LNG_S_SHOTHER_CB_ANN_ENABLE                    ,'Settings','S_SHOTHER_CB_ANN_ENABLE');
   GetIni(ini,LNG_S_SHOTHER_LABEL85                          ,'Settings','S_SHOTHER_LABEL85');
   GetIni(ini,LNG_S_SHOTHER_LABEL86                          ,'Settings','S_SHOTHER_LABEL86');
   GetIni(ini,LNG_S_SHOTHER_LABEL87                          ,'Settings','S_SHOTHER_LABEL87');
   GetIni(ini,LNG_S_SHOTHER_LABEL88                          ,'Settings','S_SHOTHER_LABEL88');
-  GetIni(ini,LNG_S_SHOTHER_KSOOFFICEGROUPBOX1               ,'Settings','S_SHOTHER_KSOOFFICEGROUPBOX1');
+  GetIni(ini,LNG_S_SHOTHER_GROUPBOX4                        ,'Settings','S_SHOTHER_GROUPBOX4');
   GetIni(ini,LNG_S_SHMINSHARE_LABEL91                       ,'Settings','S_SHMINSHARE_LABEL91');
   GetIni(ini,LNG_S_SHMINSHARE_LABEL92                       ,'Settings','S_SHMINSHARE_LABEL92');
   GetIni(ini,LNG_S_SHMINSHARE_LABEL93                       ,'Settings','S_SHMINSHARE_LABEL93');
diff --dos -ur 241108/languages.dfm 241109/languages.dfm
--- 241108/languages.dfm	Fri Jan 16 02:13:12 2004
+++ 241109/languages.dfm	Thu Feb 19 02:42:42 2004
@@ -30,12 +30,12 @@
     Height = 12
     Caption = '他の言語で使いたい人は"english.lng"を翻訳してください。'
   end
-  object ksoOfficePanel1: TPanel
+  object Panel1: TPanel
     Left = 7
     Top = 37
     Width = 474
     Height = 252
-    Caption = 'ksoOfficePanel1'
+    Caption = 'Panel1'
     TabOrder = 0
     object list: TListView
       Left = 1
diff --dos -ur 241108/languages.pas 241109/languages.pas
--- 241108/languages.pas	Fri Jan 16 00:38:48 2004
+++ 241109/languages.pas	Wed Feb 18 17:00:32 2004
@@ -27,7 +27,7 @@
   TSlavaNapLanguage = class(TForm)
     Label1: TLabel;
     Label2: TLabel;
-    ksoOfficePanel1: TPanel;
+    Panel1: TPanel;
     btn_ok: TButton;
     btn_cancel: TButton;
     list: TListView;
diff --dos -ur 241108/mainform.dfm 241109/mainform.dfm
--- 241108/mainform.dfm	Mon Feb 16 02:13:30 2004
+++ 241109/mainform.dfm	Thu Feb 19 02:46:08 2004
@@ -1,7 +1,7 @@
 object SlavaNapWindow: TSlavaNapWindow
   Left = 288
   Top = 149
-  Width = 640
+  Width = 666
   Height = 450
   Caption = 'SlavaNapWindow'
   Color = clBtnFace
@@ -22,7 +22,7 @@
   object StatusBar1: TStatusBar
     Left = 0
     Top = 386
-    Width = 632
+    Width = 658
     Height = 18
     Panels = <
       item
@@ -50,13 +50,13 @@
   object dock_toolbar: TksoOfficeDock
     Left = 0
     Top = 0
-    Width = 632
+    Width = 658
     Height = 19
     Align = alTop
     object toolbar: TksoOfficeToolBar
       Left = 0
       Top = 0
-      Width = 632
+      Width = 658
       Height = 19
       Rolled = False
       object btn_tb_log: TSpeedButton
@@ -181,7 +181,7 @@
   object dock_bottom_panel: TPanel
     Left = 0
     Top = 19
-    Width = 632
+    Width = 658
     Height = 367
     Align = alClient
     BevelOuter = bvNone
@@ -189,20 +189,20 @@
     object dock_bottom: TksoOfficeDock
       Left = 0
       Top = 297
-      Width = 632
+      Width = 658
       Height = 70
       Align = alBottom
       object bar_bottom2: TksoOfficeToolBar
         Left = 0
         Top = 0
-        Width = 632
+        Width = 658
         Height = 18
         Rolled = False
         object StatusBar2: TStatusBar
           Tag = 1
           Left = 12
           Top = 0
-          Width = 620
+          Width = 646
           Height = 18
           Panels = <
             item
@@ -225,14 +225,14 @@
       object bar_bottom3: TksoOfficeToolBar
         Left = 0
         Top = 18
-        Width = 632
+        Width = 658
         Height = 17
         Rolled = False
         object StatusBar3: TStatusBar
           Tag = 1
           Left = 12
           Top = -1
-          Width = 620
+          Width = 646
           Height = 18
           Panels = <
             item
@@ -255,13 +255,13 @@
       object bar_bottom4: TksoOfficeToolBar
         Left = 0
         Top = 35
-        Width = 632
+        Width = 658
         Height = 18
         Rolled = False
         object StatusBar4: TStatusBar
           Left = 12
           Top = 0
-          Width = 620
+          Width = 646
           Height = 18
           Panels = <
             item
@@ -284,14 +284,14 @@
       object bar_bottom5: TksoOfficeToolBar
         Left = 0
         Top = 53
-        Width = 632
+        Width = 658
         Height = 17
         Rolled = False
         object StatusBar5: TStatusBar
           Tag = 1
           Left = 12
           Top = -1
-          Width = 620
+          Width = 646
           Height = 18
           Panels = <
             item
@@ -315,7 +315,7 @@
     object client: TPanel
       Left = 0
       Top = 0
-      Width = 632
+      Width = 658
       Height = 297
       Align = alClient
       BevelOuter = bvNone
@@ -325,7 +325,7 @@
       object SlavaSplitter1: TSlavaSplitter
         Left = 0
         Top = 218
-        Width = 632
+        Width = 658
         Height = 7
         Cursor = crVSplit
         Align = alBottom
@@ -662,23 +662,20 @@
         BorderColor1 = clBtnFace
         BorderColor2 = clBtnFace
       end
-      object panel_console: TSlavaPanel
+      object panel_console: TPanel
         Left = 0
         Top = 225
-        Width = 632
+        Width = 658
         Height = 72
-        BorderColor1 = clWhite
-        BorderColor2 = clGray
         Align = alBottom
         BevelOuter = bvLowered
-        BorderType = sbNone
         Caption = ' '
         ParentColor = True
         TabOrder = 1
         object log_console: TRichEdit
           Left = 1
           Top = 1
-          Width = 630
+          Width = 656
           Height = 70
           Align = alClient
           BorderStyle = bsNone
@@ -691,7 +688,7 @@
       object pages: TPageControl
         Left = 0
         Top = 0
-        Width = 632
+        Width = 658
         Height = 218
         ActivePage = sh_users
         Align = alClient
@@ -705,7 +702,7 @@
           object dock_log: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 74
             Align = alTop
             object bar_log: TksoOfficeToolBar
@@ -796,23 +793,20 @@
               end
             end
           end
-          object panel_log: TSlavaPanel
+          object panel_log: TPanel
             Left = 0
             Top = 74
-            Width = 624
+            Width = 650
             Height = 136
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object log_main: TRichEdit
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 134
               Align = alClient
               BorderStyle = bsNone
@@ -831,13 +825,13 @@
           object ksoOfficeDock1: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 94
             Align = alTop
             object ksoOfficeToolBar1: TksoOfficeToolBar
               Left = 0
               Top = 0
-              Width = 624
+              Width = 650
               Height = 74
               Rolled = False
               object lbl_users: TLabel
@@ -988,7 +982,7 @@
             object ksoOfficeToolBar8: TksoOfficeToolBar
               Left = 0
               Top = 74
-              Width = 624
+              Width = 650
               Height = 20
               Rolled = False
               object cb_users_mods: TCheckBox
@@ -1062,23 +1056,20 @@
               end
             end
           end
-          object SlavaPanel1: TSlavaPanel
+          object Panel1: TPanel
             Left = 0
             Top = 94
-            Width = 624
+            Width = 650
             Height = 116
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_users: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 114
               Align = alClient
               BorderStyle = bsNone
@@ -1087,7 +1078,7 @@
                   AutoSize = True
                   Caption = 'User'
                   WidthType = (
-                    -128)
+                    -122)
                 end
                 item
                   Alignment = taCenter
@@ -1113,7 +1104,7 @@
                   AutoSize = True
                   Caption = 'Software'
                   WidthType = (
-                    -126)
+                    -122)
                 end
                 item
                   Alignment = taCenter
@@ -1154,7 +1145,7 @@
                   AutoSize = True
                   Caption = 'Up/Down'
                   WidthType = (
-                    -126)
+                    -122)
                 end
                 item
                   Alignment = taRightJustify
@@ -1171,13 +1162,13 @@
                   AutoSize = True
                   Caption = 'Total Up/Down'
                   WidthType = (
-                    -126)
+                    -122)
                 end
                 item
                   AutoSize = True
                   Caption = 'Server'
                   WidthType = (
-                    -126)
+                    -122)
                 end
                 item
                   Alignment = taRightJustify
@@ -1203,7 +1194,7 @@
                   AutoSize = True
                   Caption = 'Comments'
                   WidthType = (
-                    -126)
+                    -122)
                 end>
               FlatScrollBars = True
               HideSelection = False
@@ -1230,13 +1221,13 @@
           object ksoOfficeDock2: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 93
             Align = alTop
             object ksoOfficeToolBar2: TksoOfficeToolBar
               Left = 0
               Top = 0
-              Width = 624
+              Width = 650
               Height = 74
               Rolled = False
               object lbl_registered: TLabel
@@ -1367,7 +1358,7 @@
             object tb_register: TksoOfficeToolBar
               Left = 0
               Top = 74
-              Width = 624
+              Width = 650
               Height = 19
               Rolled = False
               object btn_reg_add: TSpeedButton
@@ -1417,23 +1408,20 @@
               end
             end
           end
-          object SlavaPanel2: TSlavaPanel
+          object Panel2: TPanel
             Left = 0
             Top = 93
-            Width = 624
+            Width = 650
             Height = 117
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_registered: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 115
               Align = alClient
               BorderStyle = bsNone
@@ -1669,7 +1657,7 @@
           object ksoOfficeDock3: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 55
             Align = alTop
             object ksoOfficeToolBar3: TksoOfficeToolBar
@@ -1785,23 +1773,20 @@
               end
             end
           end
-          object SlavaPanel3: TSlavaPanel
+          object Panel3: TPanel
             Left = 0
             Top = 55
-            Width = 624
+            Width = 650
             Height = 155
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_servers: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 153
               Align = alClient
               BorderStyle = bsNone
@@ -1876,7 +1861,7 @@
           object ksoOfficeDock4: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 55
             Align = alTop
             object ksoOfficeToolBar4: TksoOfficeToolBar
@@ -1956,23 +1941,20 @@
               end
             end
           end
-          object SlavaPanel4: TSlavaPanel
+          object Panel4: TPanel
             Left = 0
             Top = 55
-            Width = 624
+            Width = 650
             Height = 155
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_channels: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 153
               Align = alClient
               BorderStyle = bsNone
@@ -2042,13 +2024,13 @@
           object ksoOfficeDock5: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 55
             Align = alTop
             object ksoOfficeToolBar5: TksoOfficeToolBar
               Left = 0
               Top = 0
-              Width = 624
+              Width = 650
               Height = 55
               Rolled = False
               object lbl_bans: TLabel
@@ -2135,23 +2117,20 @@
               end
             end
           end
-          object SlavaPanel5: TSlavaPanel
+          object Panel5: TPanel
             Left = 0
             Top = 55
-            Width = 624
+            Width = 650
             Height = 155
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_bans: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 153
               Align = alClient
               BorderStyle = bsNone
@@ -2192,7 +2171,7 @@
                   AutoSize = True
                   Caption = 'reason'
                   WidthType = (
-                    -159)
+                    -133)
                 end>
               FlatScrollBars = True
               HideSelection = False
@@ -2219,7 +2198,7 @@
           object ksoOfficeDock6: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 55
             Align = alTop
             object ksoOfficeToolBar6: TksoOfficeToolBar
@@ -2299,23 +2278,20 @@
               end
             end
           end
-          object SlavaPanel6: TSlavaPanel
+          object Panel6: TPanel
             Left = 0
             Top = 55
-            Width = 624
+            Width = 650
             Height = 155
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_lists: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 153
               Align = alClient
               BorderStyle = bsNone
@@ -2348,7 +2324,7 @@
           object ksoOfficeDock7: TksoOfficeDock
             Left = 0
             Top = 0
-            Width = 624
+            Width = 650
             Height = 55
             Align = alTop
             object ksoOfficeToolBar7: TksoOfficeToolBar
@@ -2418,23 +2394,20 @@
               end
             end
           end
-          object SlavaPanel7: TSlavaPanel
+          object Panel7: TPanel
             Left = 0
             Top = 55
-            Width = 624
+            Width = 650
             Height = 155
-            BorderColor1 = clWhite
-            BorderColor2 = clGray
             Align = alClient
             BevelOuter = bvLowered
-            BorderType = sbNone
             Caption = ' '
             ParentColor = True
             TabOrder = 1
             object list_hotlist: TListView
               Left = 1
               Top = 1
-              Width = 622
+              Width = 648
               Height = 153
               Align = alClient
               BorderStyle = bsNone
diff --dos -ur 241108/mainform.pas 241109/mainform.pas
--- 241108/mainform.pas	Mon Feb 16 21:32:58 2004
+++ 241109/mainform.pas	Wed Feb 18 21:09:32 2004
@@ -23,25 +23,24 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  ComCtrls, SlavaSplitter, SlavaPanel, ExtCtrls, StdCtrls,
-  inifiles, ShellApi, RXShell, ImgList, OfficeToolBar, Menus, winsock,
-  OfficeButtons, OfficeControls, OfficeEdit, clipbrd, channelform, chatform,
-  stypes, basecombo, ComboBox, whoisform, slavastrings, mmsystem,
-  Buttons, class_cmdlist, class_cmdexlist, class_doublecmdlist, Pages,
-  Classes, class_cmd2list, browseform, announceform, Spin;
+  ComCtrls, SlavaSplitter, ExtCtrls, StdCtrls, inifiles, ShellApi,
+  ImgList, Menus, winsock,clipbrd, channelform, chatform, stypes,
+  whoisform, slavastrings, mmsystem, Buttons, Classes, Spin,
+  class_cmdlist, class_cmdexlist, class_doublecmdlist, class_cmd2list,
+  browseform, announceform, OfficeToolBar, RXShell;
 
 type
   TSlavaNapWindow = class(TForm)
     StatusBar1: TStatusBar;
     dock_toolbar: TksoOfficeDock;
     client: TPanel;
-    panel_console: TSlavaPanel;
+    panel_console: TPanel;
     SlavaSplitter1: TSlavaSplitter;
     pages: TPageControl;
     sh_log: TTabSheet;
     sh_users: TTabSheet;
     dock_log: TksoOfficeDock;
-    panel_log: TSlavaPanel;
+    panel_log: TPanel;
     log_main: TRichEdit;
     log_console: TRichEdit;
     tray: TRxTrayIcon;
@@ -69,9 +68,9 @@
     sh_servers: TTabSheet;
     ksoOfficeDock3: TksoOfficeDock;
     ksoOfficeToolBar3: TksoOfficeToolBar;
-    SlavaPanel1: TSlavaPanel;
-    SlavaPanel2: TSlavaPanel;
-    SlavaPanel3: TSlavaPanel;
+    Panel1: TPanel;
+    Panel2: TPanel;
+    Panel3: TPanel;
     list_users: TListView;
     btn_tb_log: TSpeedButton;
     btn_tb_users: TSpeedButton;
@@ -173,13 +172,13 @@
     sh_hotlist: TTabSheet;
     ksoOfficeDock7: TksoOfficeDock;
     ksoOfficeToolBar7: TksoOfficeToolBar;
-    SlavaPanel4: TSlavaPanel;
+    Panel4: TPanel;
     list_channels: TListView;
-    SlavaPanel5: TSlavaPanel;
+    Panel5: TPanel;
     list_bans: TListView;
-    SlavaPanel6: TSlavaPanel;
+    Panel6: TPanel;
     list_lists: TListView;
-    SlavaPanel7: TSlavaPanel;
+    Panel7: TPanel;
     list_hotlist: TListView;
     btn_tb_bans: TSpeedButton;
     btn_tb_hotlist: TSpeedButton;
diff --dos -ur 241108/modeform.pas 241109/modeform.pas
--- 241108/modeform.pas	Wed Mar 26 14:53:24 2003
+++ 241109/modeform.pas	Wed Feb 18 17:43:36 2004
@@ -21,7 +21,7 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  OfficeControls, StdCtrls, OfficeButtons, Classes;
+  StdCtrls, Classes;
 
 type
   TSlavaNapMode = class(TForm)
diff --dos -ur 241108/settings.dfm 241109/settings.dfm
--- 241108/settings.dfm	Fri Jan 16 02:22:22 2004
+++ 241109/settings.dfm	Thu Feb 19 02:43:18 2004
@@ -219,7 +219,7 @@
       OnClick = btn_closeClick
     end
   end
-  object ksoOfficePanel1: TPanel
+  object Panel5: TPanel
     Left = 0
     Top = 0
     Width = 126
@@ -2775,7 +2775,7 @@
           Height = 12
           Caption = '上限: '
         end
-        object ksoOfficePanel2: TPanel
+        object Panel6: TPanel
           Left = 0
           Top = 7
           Width = 363
@@ -3046,7 +3046,7 @@
             'リンクサーバー上で有効になるかもしれないからです。'#13#10'実際のホスト名を隠したい場合はチェックしないでください。'#13#10'(リンクサーバ' +
             'ーに設定を反映するには再接続が必要です。)'
         end
-        object ksoOfficeGroupBox2: TGroupBox
+        object GroupBox2: TGroupBox
           Left = 6
           Top = 0
           Width = 348
@@ -3079,7 +3079,7 @@
             Value = 8889
           end
         end
-        object ksoOfficeGroupBox3: TGroupBox
+        object GroupBox3: TGroupBox
           Left = 6
           Top = 52
           Width = 348
@@ -3140,7 +3140,7 @@
           Height = 12
           Caption = '内部で実装しているBotとその他の特別な機能の設定です。'
         end
-        object ksoOfficeGroupBox1: TGroupBox
+        object GroupBox4: TGroupBox
           Left = 6
           Top = 22
           Width = 348
diff --dos -ur 241108/settings.pas 241109/settings.pas
--- 241108/settings.pas	Fri Jan 16 02:19:06 2004
+++ 241109/settings.pas	Wed Feb 18 18:03:04 2004
@@ -21,14 +21,13 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  ExtCtrls, OfficePanel, ComCtrls, StdCtrls, inifiles, registry,
-  SpectrumCombo, ShellApi, Buttons, Spin, basecombo, Pages, Classes,
-  ActiveX, ShlObj, slavastrings, CheckLst, stypes;
+  ExtCtrls, ComCtrls, StdCtrls, inifiles, registry, ShellApi, Buttons, Spin,
+  Classes, ActiveX, ShlObj, slavastrings, CheckLst, stypes, SpectrumCombo, basecombo;
 
 type
   TSlavaNapSettings = class(TForm)
     Panel1: TPanel;
-    ksoOfficePanel1: TPanel;
+    Panel5: TPanel;
     Panel2: TPanel;
     Panel3: TPanel;
     header: TPaintBox;
@@ -252,7 +251,7 @@
     edit_main_handle: TSpinEdit;
     lbl_handle: TLabel;
     sh_links: TTabSheet;
-    ksoOfficePanel2: TPanel;
+    Panel6: TPanel;
     cb_link_all: TRadioButton;
     cb_link_list: TRadioButton;
     cb_link_none: TRadioButton;
@@ -287,7 +286,7 @@
     sh_report: TTabSheet;
     sh_other: TTabSheet;
     Label84: TLabel;
-    ksoOfficeGroupBox1: TGroupBox;
+    GroupBox4: TGroupBox;
     Label85: TLabel;
     cb_ann_enable: TCheckBox;
     Label86: TLabel;
@@ -296,11 +295,11 @@
     Label87: TLabel;
     Label88: TLabel;
     edit_ann_user: TEdit;
-    ksoOfficeGroupBox2: TGroupBox;
+    GroupBox2: TGroupBox;
     cb_report_old_enable: TCheckBox;
     Label89: TLabel;
     edit_report_old_port: TSpinEdit;
-    ksoOfficeGroupBox3: TGroupBox;
+    GroupBox3: TGroupBox;
     cb_report_new_enabled: TCheckBox;
     edit_report_new_port: TSpinEdit;
     cb_report_new_hidehub: TCheckBox;
@@ -3016,8 +3015,8 @@
   cb_report_new_hidehub.Caption        :=GetLangI(LNG_S_SHREPORT_CB_REPORT_NEW_HIDEHUB);
   Label90.Caption                      :=GetLangI(LNG_S_SHREPORT_LABEL90);
   cb_report_truestats.Caption          :=GetLangI(LNG_S_SHREPORT_CB_REPORT_TRUESTATS);
-  ksoOfficeGroupBox2.Caption           :=GetLangI(LNG_S_SHREPORT_KSOOFFICEGROUPBOX2);
-  ksoOfficeGroupBox3.Caption           :=GetLangI(LNG_S_SHREPORT_KSOOFFICEGROUPBOX3);
+  GroupBox2.Caption                    :=GetLangI(LNG_S_SHREPORT_GROUPBOX2);
+  GroupBox3.Caption                    :=GetLangI(LNG_S_SHREPORT_GROUPBOX3);
   //sh_other
   Label84.Caption                      :=GetLangI(LNG_S_SHOTHER_LABEL84);
   cb_ann_enable.Caption                :=GetLangI(LNG_S_SHOTHER_CB_ANN_ENABLE);
@@ -3025,7 +3024,7 @@
   Label86.Caption                      :=GetLangI(LNG_S_SHOTHER_LABEL86);
   Label87.Caption                      :=GetLangI(LNG_S_SHOTHER_LABEL87);
   Label88.Caption                      :=GetLangI(LNG_S_SHOTHER_LABEL88);
-  ksoOfficeGroupBox1.Caption           :=GetLangI(LNG_S_SHOTHER_KSOOFFICEGROUPBOX1);
+  GroupBox4.Caption                    :=GetLangI(LNG_S_SHOTHER_GROUPBOX4);
   //sh_minshare
   Label91.Caption                      :=GetLangI(LNG_S_SHMINSHARE_LABEL91);
   Label92.Caption                      :=GetLangI(LNG_S_SHMINSHARE_LABEL92);
diff --dos -ur 241108/setupform.pas 241109/setupform.pas
--- 241108/setupform.pas	Mon Feb 16 21:28:12 2004
+++ 241109/setupform.pas	Wed Feb 18 18:02:50 2004
@@ -21,7 +21,7 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  ComCtrls, StdCtrls, inifiles, constants, vars, stypes, Pages, Classes;
+  ComCtrls, StdCtrls, inifiles, constants, vars, stypes, Classes;
 
 type
   TSlavaNapSetup = class(TForm)
Only in 241108: slavalist.pas
diff --dos -ur 241108/thread.pas 241109/thread.pas
--- 241108/thread.pas	Fri Feb 13 00:20:32 2004
+++ 241109/thread.pas	Wed Feb 18 21:06:16 2004
@@ -22,10 +22,9 @@
 {$I defines.pas}
 
 uses
- SysUtils, Classes, Classes2, graphics, zlibex, slavasplitter, slavapanel, winsock,
- windows, constants, stypes, lang, blcksock, synsock, users, registered, keywords,
- localusers, servers, slavastrings, share, class_doublecmdlist, blocks,
- class_cmd2list;
+ SysUtils, Classes, Classes2, graphics, zlibex, winsock, windows, constants,
+ stypes, lang, blcksock, synsock, users, registered, keywords, localusers,
+ servers, slavastrings, share, class_doublecmdlist, blocks, class_cmd2list;
 
 type
  TMainThread = class(TThread)
diff --dos -ur 241108/vars.pas 241109/vars.pas
--- 241108/vars.pas	Mon Feb 16 21:33:00 2004
+++ 241109/vars.pas	Wed Feb 18 21:06:44 2004
@@ -20,10 +20,9 @@
 interface
 
 uses
- SysUtils, Classes, Classes2, graphics, zlibex, slavasplitter, slavapanel, winsock,
- windows, constants, stypes, bans, blcksock, synsock, users, localusers,
- registered, servers, slavastrings, class_cmdlist, class_cmdexlist,
- class_doublecmdlist, class_cmd2list;
+ SysUtils, Classes, Classes2, graphics, zlibex, winsock, windows, constants,
+ stypes, bans, blcksock, synsock, users, localusers, registered, servers,
+ slavastrings, class_cmdlist, class_cmdexlist, class_doublecmdlist, class_cmd2list;
 
 type TWQBlockMethod = (block,leech,ban);
 
diff --dos -ur 241108/whoisform.dfm 241109/whoisform.dfm
--- 241108/whoisform.dfm	Sun Jan 26 14:58:58 2003
+++ 241109/whoisform.dfm	Wed Feb 18 16:58:14 2004
@@ -149,23 +149,19 @@
   OnDestroy = FormDestroy
   PixelsPerInch = 96
   TextHeight = 13
-  object ksoOfficePanel1: TksoOfficePanel
+  object Panel1: TPanel
     Left = 0
     Top = 0
     Width = 346
     Height = 238
     Align = alClient
-    BorderStyle = kbsSunken
-    BorderStyleFlat = kbsSolid
-    BorderStyleFocused = kbsOuterSunken
-    Flat = True
-    Caption = 'ksoOfficePanel1'
+    Caption = 'Panel1'
     TabOrder = 0
     object log: TRichEdit
-      Left = 2
-      Top = 2
-      Width = 342
-      Height = 234
+      Left = 1
+      Top = 1
+      Width = 344
+      Height = 236
       Align = alClient
       BorderStyle = bsNone
       ReadOnly = True
diff --dos -ur 241108/whoisform.pas 241109/whoisform.pas
--- 241108/whoisform.pas	Wed Mar 26 14:55:42 2003
+++ 241109/whoisform.pas	Wed Feb 18 16:57:48 2004
@@ -21,7 +21,7 @@
 
 uses
   Windows, Messages, SysUtils, Classes2, Graphics, Controls, Forms, Dialogs,
-  Menus, StdCtrls, ExtCtrls, OfficePanel, ComCtrls, Classes;
+  Menus, StdCtrls, ExtCtrls, ComCtrls, Classes;
 
 type
   TSlavaNapWhois = class(TForm)
@@ -31,7 +31,7 @@
     mnu_friend: TMenuItem;
     mnu_ignore: TMenuItem;
     mnu_message: TMenuItem;
-    ksoOfficePanel1: TksoOfficePanel;
+    Panel1: TPanel;
     log: TRichEdit;
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure FormCreate(Sender: TObject);