Przeglądaj źródła

添加了ado组件修复工具

lqq 9 lat temu
rodzic
commit
079f3c74b9

Plik diff jest za duży
+ 1 - 1
AppCom/AppCentreCom.dproj


BIN
AppCom/AppCentreCom.res


Plik diff jest za duży
+ 1 - 1
CA/CA.dproj


BIN
CA/CA.res


Plik diff jest za duży
+ 1 - 1
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.dproj


BIN
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.res


Plik diff jest za duży
+ 1 - 1
Client/Lxtalk.dproj


BIN
Client/Lxtalk.res


+ 9 - 2
Client/TalkingFrm.dfm

@@ -2284,7 +2284,6 @@ object TalkingForm: TTalkingForm
             ParentBackground = False
             TabOrder = 1
             Visible = False
-            ExplicitTop = 18
           end
         end
       end
@@ -4363,6 +4362,8 @@ object TalkingForm: TTalkingForm
               object tsYourHeadImage: TTabSheet
                 TabVisible = False
                 OnShow = tsYourHeadImageShow
+                ExplicitWidth = 0
+                ExplicitHeight = 0
                 DesignSize = (
                   177
                   124)
@@ -4805,6 +4806,8 @@ object TalkingForm: TTalkingForm
                 ImageIndex = 2
                 TabVisible = False
                 OnShow = tsYourVideoShow
+                ExplicitWidth = 0
+                ExplicitHeight = 0
                 object ImgYourVideo: TImage
                   Left = 0
                   Top = 0
@@ -5896,6 +5899,8 @@ object TalkingForm: TTalkingForm
               object tsMyHeadImage: TTabSheet
                 TabVisible = False
                 OnShow = tsMyHeadImageShow
+                ExplicitWidth = 0
+                ExplicitHeight = 0
                 DesignSize = (
                   177
                   124)
@@ -6337,6 +6342,8 @@ object TalkingForm: TTalkingForm
                 ImageIndex = 2
                 TabVisible = False
                 OnShow = tsMyVideoShow
+                ExplicitWidth = 0
+                ExplicitHeight = 0
                 object ImgMyVideo: TImage
                   Left = 0
                   Top = 0
@@ -9072,7 +9079,7 @@ object TalkingForm: TTalkingForm
     Left = 48
     Top = 312
     Bitmap = {
-      494C010104000900F40110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010104000900F80110001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000002000000001002000000000000020
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000

+ 1 - 1
Client/TalkingFrm.pas

@@ -2774,7 +2774,7 @@ procedure TTalkingForm.FormCreate(Sender: TObject);
 var
   iLoop: Integer;
 begin
-  FMaxID := High(Integer);
+  FMaxID := MaxInt;
   FTeamUpLoadFile := TUpLoadFile.Create;
   FTeamUpLoadFile.OnProgress := TeamUpFileProgress;
   FTeamUpLoadFile.OnComplete := DownFileComplete;

+ 1 - 0
Client/Views/BaseChromeView.dfm

@@ -21,6 +21,7 @@ object BaseChromeViewForm: TBaseChromeViewForm
     Align = alClient
     DefaultUrl = 'about:blank'
     TabOrder = 0
+    OnBeforeContextMenu = ChromeBeforeContextMenu
     OnKeyEvent = ChromeKeyEvent
   end
 end

+ 11 - 0
Client/Views/BaseChromeView.pas

@@ -11,6 +11,9 @@ type
   TBaseChromeViewForm = class(TRealICQSkinForm, IUIForm)
     Chrome: TChromium;
     procedure ChromeKeyEvent(Sender: TObject; const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: PMsg; out Result: Boolean);
+    procedure ChromeBeforeContextMenu(Sender: TObject;
+      const browser: ICefBrowser; const frame: ICefFrame;
+      const params: ICefContextMenuParams; const model: ICefMenuModel);
   private
     FURL: string;
     FAutoFree: Boolean;
@@ -44,6 +47,14 @@ uses
 { TBaseChromeViewForm }
 
 
+procedure TBaseChromeViewForm.ChromeBeforeContextMenu(Sender: TObject;
+  const browser: ICefBrowser; const frame: ICefFrame;
+  const params: ICefContextMenuParams; const model: ICefMenuModel);
+begin
+  model.Clear;
+  model.AddItem(Integer(MENU_ID_COPY), '¸´ÖÆ');
+end;
+
 procedure TBaseChromeViewForm.ChromeKeyEvent(Sender: TObject; const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: PMsg; out Result: Boolean);
 begin
   if TConditionConfig.GetConfig.Dev and (event^.windows_key_code = VK_F12) then

+ 44 - 43
Client/Views/UserViews/UserCardView.dfm

@@ -1,43 +1,44 @@
-object UserCardViewForm: TUserCardViewForm
-  Left = 0
-  Top = 0
-  Caption = #29992#25143#21517#29255
-  ClientHeight = 176
-  ClientWidth = 272
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'Tahoma'
-  Font.Style = []
-  OldCreateOrder = False
-  OnCreate = FormCreate
-  OnDestroy = FormDestroy
-  OnShow = FormShow
-  PixelsPerInch = 96
-  TextHeight = 13
-  object chrm1: TChromium
-    Left = 0
-    Top = 0
-    Width = 272
-    Height = 176
-    Align = alClient
-    DefaultUrl = 'about:blank'
-    TabOrder = 0
-    OnKeyEvent = chrm1KeyEvent
-  end
-  object tmrForClose: TTimer
-    Enabled = False
-    Interval = 100
-    OnTimer = tmrForCloseTimer
-    Left = 232
-    Top = 144
-  end
-  object tmrForGoTop: TTimer
-    Enabled = False
-    Interval = 10
-    OnTimer = tmrForGoTopTimer
-    Left = 200
-    Top = 144
-  end
-end
+object UserCardViewForm: TUserCardViewForm
+  Left = 0
+  Top = 0
+  Caption = #29992#25143#21517#29255
+  ClientHeight = 176
+  ClientWidth = 272
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  OldCreateOrder = False
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 13
+  object chrm1: TChromium
+    Left = 0
+    Top = 0
+    Width = 272
+    Height = 176
+    Align = alClient
+    DefaultUrl = 'about:blank'
+    TabOrder = 0
+    OnBeforeContextMenu = chrm1BeforeContextMenu
+    OnKeyEvent = chrm1KeyEvent
+  end
+  object tmrForClose: TTimer
+    Enabled = False
+    Interval = 100
+    OnTimer = tmrForCloseTimer
+    Left = 232
+    Top = 144
+  end
+  object tmrForGoTop: TTimer
+    Enabled = False
+    Interval = 10
+    OnTimer = tmrForGoTopTimer
+    Left = 200
+    Top = 144
+  end
+end

+ 154 - 147
Client/Views/UserViews/UserCardView.pas

@@ -1,156 +1,163 @@
 unit UserCardView;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, RealICQSkinFrm, cefvcl, UserCardWebApp, ExtCtrls, ceflib, BaseWebApp;
-
-type
-  TUserCardViewForm = class(TRealICQSkinForm)
-    chrm1: TChromium;
-    tmrForClose: TTimer;
-    tmrForGoTop: TTimer;
-    procedure FormShow(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
-    procedure FormDestroy(Sender: TObject);
-    procedure tmrForGoTopTimer(Sender: TObject);
-    procedure tmrForCloseTimer(Sender: TObject);
-    procedure chrm1KeyEvent(Sender: TObject; const browser: ICefBrowser;
-      const event: PCefKeyEvent; osEvent: PMsg; out Result: Boolean);
-  private
-    FWebApp: TUserCardWebApp;
-    FLoginName: string;
-    FTargetTop: Integer;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, RealICQSkinFrm, cefvcl, UserCardWebApp, ExtCtrls, ceflib, BaseWebApp;
+
+type
+  TUserCardViewForm = class(TRealICQSkinForm)
+    chrm1: TChromium;
+    tmrForClose: TTimer;
+    tmrForGoTop: TTimer;
+    procedure FormShow(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure tmrForGoTopTimer(Sender: TObject);
+    procedure tmrForCloseTimer(Sender: TObject);
+    procedure chrm1KeyEvent(Sender: TObject; const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: PMsg; out Result: Boolean);
+    procedure chrm1BeforeContextMenu(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const params: ICefContextMenuParams; const model: ICefMenuModel);
+  private
+    FWebApp: TUserCardWebApp;
+    FLoginName: string;
+    FTargetTop: Integer;
     procedure SetTargetTop(const Value: Integer);
     { Private declarations }
-  public
-    procedure ChangeUIColor(AColor: TColor); override;
-    procedure Update(ALoginName: string);
-
-    property LoginName: string read FLoginName write FLoginName;
-    property TargetTop: Integer read FTargetTop write SetTargetTop;
-  end;
-
-var
-  UserCardViewForm: TUserCardViewForm;
-  
-implementation
-
-uses
+
+  public
+    procedure ChangeUIColor(AColor: TColor); override;
+    procedure Update(ALoginName: string);
+    property LoginName: string read FLoginName write FLoginName;
+    property TargetTop: Integer read FTargetTop write SetTargetTop;
+  end;
+
+var
+  UserCardViewForm: TUserCardViewForm;
+
+implementation
+
+uses
   MainFrm, DevToolChromeFrm, ConditionConfig;
 
 {$R *.dfm}
 
 { TUserCardViewForm }
+
+
+procedure TUserCardViewForm.ChangeUIColor(AColor: TColor);
+begin
+  inherited ChangeUIColor(AColor);
+
+end;
+
+procedure TUserCardViewForm.chrm1BeforeContextMenu(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const params: ICefContextMenuParams; const model: ICefMenuModel);
+begin
+  model.Clear;
+  model.AddItem(Integer(MENU_ID_COPY), '¸´ÖÆ');
+end;
+
+procedure TUserCardViewForm.chrm1KeyEvent(Sender: TObject; const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: PMsg; out Result: Boolean);
+begin
+  if (TConditionConfig.GetConfig.Dev) and (event^.windows_key_code = VK_F12) then
+    ShowDevTool(Self, chrm1);
+end;
+
+procedure TUserCardViewForm.FormCreate(Sender: TObject);
+begin
+  FWebApp := TUserCardWebApp.Create(chrm1);
+end;
+
+procedure TUserCardViewForm.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(FWebApp);
+end;
+
+procedure TUserCardViewForm.FormShow(Sender: TObject);
+var
+  URL: string;
+begin
+  ChangeUIColor(MainForm.FormColor);
+  if TConditionConfig.GetConfig.RemoteUI then
+  begin
+    URL := Format('%s/userview/index.html', [TConditionConfig.GetConfig.RemoteUIHost]);
+  end
+  else
+    URL := ExtractFilePath(paramstr(0)) + 'html/userview/index.html';
+
+  chrm1.Load(URL);
+end;
+
+procedure TUserCardViewForm.SetTargetTop(const Value: Integer);
+var
+  P: TPoint;
+begin
+  FTargetTop := Value - 30;
+  if FTargetTop < 0 then
+    FTargetTop := 0;
+  if FTargetTop + Height > Screen.WorkAreaHeight then
+    FTargetTop := Screen.WorkAreaHeight - Height;
+
+  P.X := 0;
+  P.Y := 0;
+  P := MainForm.pnlAll.ClientToScreen(P);
+
+  if Width > P.X then
+    Left := P.X + MainForm.pnlAll.Width + 2
+  else
+    Left := P.X - Width - 2;
+
+  if not Visible then
+  begin
+    Top := FTargetTop;
+    Show;
+  end
+  else
+  begin
+    tmrForGoTop.Enabled := True;
+  end;
+end;
+
+procedure TUserCardViewForm.tmrForCloseTimer(Sender: TObject);
+begin
+  tmrForClose.Enabled := False;
+  if (Mouse.CursorPos.X >= Left) and (Mouse.CursorPos.X <= Left + Width) and (Mouse.CursorPos.Y >= Top) and (Mouse.CursorPos.Y <= Top + Height) then
+  begin
+    tmrForClose.Enabled := True;
+  end
+  else
+  begin
+    MainForm.HideUserCardForm;
+  end;
+end;
+
+procedure TUserCardViewForm.tmrForGoTopTimer(Sender: TObject);
+begin
+  if abs(Top - FTargetTop) < 15 then
+    Top := FTargetTop;
+  tmrForGoTop.Enabled := Top <> FTargetTop;
+  if Top < FTargetTop then
+  begin
+    Top := Top + 15;
+  end
+  else if Top > FTargetTop then
+  begin
+    Top := Top - 15;
+  end;
+end;
+
+procedure TUserCardViewForm.Update(ALoginName: string);
+begin
+  if ALoginName = '' then
+    Exit;
+  FWebApp.LoginName := ALoginName;
+end;
+
+initialization
+
+finalization
+  if UserCardViewForm <> nil then
+    FreeAndNil(UserCardViewForm);
+
+end.
 
-procedure TUserCardViewForm.ChangeUIColor(AColor: TColor);
-begin
-  inherited ChangeUIColor(AColor);
-
-end;
-
-procedure TUserCardViewForm.chrm1KeyEvent(Sender: TObject;
-  const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: PMsg;
-  out Result: Boolean);
-begin
-  if (TConditionConfig.GetConfig.Dev) and (event^.windows_key_code = VK_F12) then
-    ShowDevTool(Self, chrm1);
-end;
-
-procedure TUserCardViewForm.FormCreate(Sender: TObject);
-begin
-  FWebApp := TUserCardWebApp.Create(chrm1);
-end;
-
-procedure TUserCardViewForm.FormDestroy(Sender: TObject);
-begin
-  FreeAndNil(FWebApp);
-end;
-
-procedure TUserCardViewForm.FormShow(Sender: TObject);
-var
-  URL: string;
-begin
-  ChangeUIColor(MainForm.FormColor);
-  if TConditionConfig.GetConfig.RemoteUI then
-  begin
-    URL := Format('%s/userview/index.html',[TConditionConfig.GetConfig.RemoteUIHost]);
-  end
-  else
-    URL := ExtractFilePath(paramstr(0))+ 'html/userview/index.html';
-
-  chrm1.Load(URL);
-end;
-
-procedure TUserCardViewForm.SetTargetTop(const Value: Integer);
-var
-  P: TPoint;
-begin
-  FTargetTop := Value - 30;
-  if FTargetTop < 0 then FTargetTop := 0;
-  if FTargetTop + Height > Screen.WorkAreaHeight then
-    FTargetTop := Screen.WorkAreaHeight - Height;
-
-  P.X := 0;
-  P.Y := 0;
-  P := MainForm.pnlAll.ClientToScreen(P);
-
-  if Width > P.X then
-    Left := P.X + MainForm.pnlAll.Width + 2
-  else
-    Left := P.X - Width - 2;
-
-  if not Visible then
-  begin
-    Top := FTargetTop;
-    Show;
-  end
-  else
-  begin
-    tmrForGoTop.Enabled := True;
-  end;
-end;
-
-procedure TUserCardViewForm.tmrForCloseTimer(Sender: TObject);
-begin
-  tmrForClose.Enabled := False;
-  if (Mouse.CursorPos.X >= Left) and (Mouse.CursorPos.X <= Left + Width) and
-     (Mouse.CursorPos.Y >= Top) and (Mouse.CursorPos.Y <= Top + Height) then
-  begin
-    tmrForClose.Enabled := True;
-  end
-  else
-  begin
-    MainForm.HideUserCardForm;
-  end;
-end;
-
-procedure TUserCardViewForm.tmrForGoTopTimer(Sender: TObject);
-begin
-  if abs(Top - FTargetTop) < 15 then Top := FTargetTop;
-  tmrForGoTop.Enabled := Top <> FTargetTop;
-  if Top < FTargetTop then
-  begin
-    Top := Top + 15;
-  end
-  else if Top > FTargetTop then
-  begin
-    Top := Top - 15;
-  end;
-end;
-
-procedure TUserCardViewForm.Update(ALoginName: string);
-begin
-  if ALoginName = '' then
-    Exit;
-  FWebApp.LoginName :=  ALoginName;
-end;
-
-initialization
-
-finalization
-  if UserCardViewForm <> nil then
-    FreeAndNil(UserCardViewForm);
-
-end.

Plik diff jest za duży
+ 1238 - 1189
Controls/RealICQClient/RealICQDBHistory.pas


Plik diff jest za duży
+ 1 - 1
Controls/RealICQComponents.dproj


BIN
Controls/RealICQComponents.res


Plik diff jest za duży
+ 1 - 1
Log/Logger.dproj


BIN
Log/Logger.res


+ 35 - 28
Log/LoggerTest.dpr

@@ -1,35 +1,42 @@
 program LoggerTest;
-
-uses
-  FastMM4,
-  mybean.console,
-  ceflib,
-  SysUtils,
-  Forms,
-  LoggerTestFrm in 'LoggerTestFrm.pas' {Form1},
-  SuperObjectCase in 'SuperObjectCase.pas' {SuperObjectCaseFrm},
-  GroupTestCase in 'GroupTestCase.pas' {Form3},
-  CACase in 'CACase.pas' {CACaseFrm},
-  AudioCase in 'AudioCase.pas' {Form5};
-
+
+uses
+  FastMM4,
+  mybean.console,
+  ceflib,
+  SysUtils,
+  Forms,
+  LoggerTestFrm in 'LoggerTestFrm.pas' {Form1},
+  SuperObjectCase in 'SuperObjectCase.pas' {SuperObjectCaseFrm},
+  GroupTestCase in 'GroupTestCase.pas' {Form3},
+  CACase in 'CACase.pas' {CACaseFrm},
+  AudioCase in 'AudioCase.pas' {Form5},
+  AccessDBCase in 'AccessDBCase.pas' {Form7};
+
 {$R *.res}
-
-begin
-  IsMultiThread := TRUE;
-  CefCache := ExtractFilePath(paramstr(0)) + 'cache';
-  CefSingleProcess := False;
-  if not CefLoadLibDefault then
-    Exit;
-  ApplicationContextInitialize;
-  Application.Initialize;
-  Application.MainFormOnTaskbar := True;
-  Application.CreateForm(TForm1, Form1);
-  //  Application.CreateForm(TAppCentreTestCase, AppCentreTestCase);
-//  Application.CreateForm(TSuperObjectCaseFrm, SuperObjectCaseFrm);
+
+
+
+
+begin
+  IsMultiThread := TRUE;
+  CefCache := ExtractFilePath(paramstr(0)) + 'cache';
+  CefSingleProcess := False;
+  if not CefLoadLibDefault then
+    Exit;
+  ApplicationContextInitialize;
+  Application.Initialize;
+  Application.MainFormOnTaskbar := True;
+//  Application.CreateForm(TForm1, Form1);
+  Application.CreateForm(TForm7, Form7);
+//  Application.CreateForm(TAppCentreTestCase, AppCentreTestCase);
+//  Application.CreateForm(TSuperObjectCaseFrm, SuperObjectCaseFrm);
 //  Application.CreateForm(TForm2, Form2);
 //  Application.CreateForm(TShellExecuteCaseFrm, ShellExecuteCaseFrm);
 //  Application.CreateForm(TCACaseFrm, CACaseFrm);
 //  Application.CreateForm(TForm5, Form5);
 //  Application.CreateForm(TForm3, Form3);
-  Application.Run;
-end.
+
+  Application.Run;
+end.
+

Plik diff jest za duży
+ 57 - 55
Log/LoggerTest.dproj


+ 1 - 1
ZWT/Config/condition.config

@@ -2,7 +2,7 @@
 	"faceSize":20,
 	"userInfoController":false,
 	"otherServersDisable":false,
-	"newCenterServer":true,
+	"newCenterServer":false,
 	"userInfoCheck":false,
 	"remoteUI":true,
 	"remoteUIHost":"http://172.28.93.5:8990/LXTalkUIView",

+ 1 - 1
ZWT/XML/DefaultConfig.xml

@@ -4,7 +4,7 @@
 	<UIMainColor Value="15392442"/>
 	<MainFormLeft Value="1108"/>
 	<MainFormTop Value="370"/>
-	<MainFormWidth Value="-300"/>
+	<MainFormWidth Value="258"/>
 	<MainFormHeight Value="734"/>
 	<TalkingFormLeft Value="788"/>
 	<TalkingFormTop Value="196"/>