Browse Source

无修改

lqq 9 years ago
parent
commit
38c4332978

File diff suppressed because it is too large
+ 1 - 1
AppCom/AppCentreCom.dproj


BIN
AppCom/AppCentreCom.res


File diff suppressed because it is too large
+ 1 - 1
CA/CA.dproj


BIN
CA/CA.res


File diff suppressed because it is too large
+ 1 - 1
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.dproj


BIN
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.res


File diff suppressed because it is too large
+ 1 - 1
Client/Lxtalk.dproj


BIN
Client/Lxtalk.res


+ 26 - 11
Client/MainFrm.dfm

@@ -8511,6 +8511,10 @@ object MainForm: TMainForm
             object tsAddrBook: TTabSheet
               Caption = #36890#35759#24405
               ImageIndex = 5
+              ExplicitLeft = 0
+              ExplicitTop = 0
+              ExplicitWidth = 0
+              ExplicitHeight = 0
               object pnlAddrBook: TPanel
                 Left = 0
                 Top = 0
@@ -9089,10 +9093,9 @@ object MainForm: TMainForm
                   Left = 213
                   Top = 0
                   Width = 6
-                  Height = 22
+                  Height = 12
                   Align = alRight
                   Layout = tlCenter
-                  ExplicitHeight = 12
                 end
               end
               object pnlNDToolBar: TPanel
@@ -10407,10 +10410,14 @@ object MainForm: TMainForm
                       TabOrder = 0
                       object tsUploadingFiles: TTabSheet
                         TabVisible = False
+                        ExplicitWidth = 0
+                        ExplicitHeight = 0
                       end
                       object tsDownloadingFiles: TTabSheet
                         ImageIndex = 1
                         TabVisible = False
+                        ExplicitWidth = 0
+                        ExplicitHeight = 0
                       end
                     end
                     object TabSetNDMissions: TTabSet
@@ -10441,6 +10448,10 @@ object MainForm: TMainForm
             object tsCustomerService: TTabSheet
               Caption = #20540#29677#31995#32479
               ImageIndex = 1
+              ExplicitLeft = 0
+              ExplicitTop = 0
+              ExplicitWidth = 0
+              ExplicitHeight = 0
               object pnlCustomerServiceStatus: TPanel
                 Left = 0
                 Top = 280
@@ -11038,6 +11049,10 @@ object MainForm: TMainForm
             object tsCustomers: TTabSheet
               Caption = #23458#26381#20154#21592#21015#34920
               ImageIndex = 6
+              ExplicitLeft = 0
+              ExplicitTop = 0
+              ExplicitWidth = 0
+              ExplicitHeight = 0
             end
           end
         end
@@ -11050,7 +11065,7 @@ object MainForm: TMainForm
     Left = 463
     Top = 441
     Bitmap = {
-      494C010108000900000320002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010108000900080320002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       00000000000036000000280000008000000060000000010020000000000000C0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -13627,7 +13642,7 @@ object MainForm: TMainForm
     Left = 367
     Top = 440
     Bitmap = {
-      494C010106000900000310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010106000900080310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000002000000001002000000000000020
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000010185A0018299C002139
@@ -14027,7 +14042,7 @@ object MainForm: TMainForm
     Left = 400
     Top = 440
     Bitmap = {
-      494C010101000400000310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010101000400080310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -14201,7 +14216,7 @@ object MainForm: TMainForm
     Left = 496
     Top = 442
     Bitmap = {
-      494C010102000400000310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000400080310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -14585,7 +14600,7 @@ object MainForm: TMainForm
     Left = 366
     Top = 472
     Bitmap = {
-      494C010102000400000310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000400080310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -14728,7 +14743,7 @@ object MainForm: TMainForm
     Left = 399
     Top = 473
     Bitmap = {
-      494C010103000400000310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010103000400080310001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000949494009494940094949400949494009494940094949400949494009494
@@ -14873,7 +14888,7 @@ object MainForm: TMainForm
     Left = 335
     Top = 440
     Bitmap = {
-      494C010105000900000318001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010105000900080318001800FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000600000003000000001002000000000000048
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -15761,7 +15776,7 @@ object MainForm: TMainForm
     Left = 280
     Top = 72
     Bitmap = {
-      494C01010600090000030B000B00FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01010600090008030B000B00FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       00000000000036000000280000002C000000160000000100200000000000200F
       00000000000000000000000000000000000000000000000000008CA5C6001852
       B5001839C6001831BD001839C6001852B5008CA5C60000000000000000000000
@@ -15900,7 +15915,7 @@ object MainForm: TMainForm
     Left = 312
     Top = 72
     Bitmap = {
-      494C010106000900000309000900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010106000900080309000900FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000024000000120000000100200000000000200A
       00000000000000000000000000000000000000000000F7F7F7002163B5001842
       C6002139C6001842C6002163B500F7F7F7000000000000000000F7F7F7002984

+ 17 - 2
Client/MainFrm.pas

@@ -13858,8 +13858,10 @@ begin
   MainForm.RealICQClient.OnManageAddrBookResult := GettedManageAddrBookResult;
   RealICQClient.SendGetAddrBookGroup;
 
-  if RealICQClient.ShowMiniPage then
-    RealICQClient.SendGetNewInformation(2);
+//  if RealICQClient.ShowMiniPage then
+//    RealICQClient.SendGetNewInformation(2);
+  if TCustomerConfig.GetConfig.ShowGuideView then
+    btShowMiniPageClick(nil);
 
   try
     pgcMainWorkArea.ActivePageIndex := 0;
@@ -13907,9 +13909,22 @@ end;
 procedure TMainForm.btShowMiniPageClick(Sender: TObject);
 var
   AShowMiniPageSet, AShowMiniPageWhenEverLoginSet: Boolean;
+  jo: ISuperObject;
 begin
+  jo := SO();
+  if TConditionConfig.GetConfig.RemoteUI then
+  begin
+    jo.S['url'] := Format('%s/guideview/#/',[TConditionConfig.GetConfig.RemoteUIHost]);
+  end
+  else
+    jo.S['url'] := ExtractFilePath(paramstr(0))+ 'html/guideview/#/';
+  jo.S['caption'] := 'Òýµ¼Ò³';
+  jo.B['center'] := True;
+  jo.B['unsizeable'] := True;
+
 //  if not Assigned(AGuideViewForm) then
   AGuideViewForm := TGuideViewForm.Create(Self);
+  AGuideViewForm.SetFormInfo(jo.AsString);
   AGuideViewForm.Show;
 //  AShowMiniPageSet := RealICQClient.ShowMiniPageSet;
 //  AShowMiniPageWhenEverLoginSet := RealICQClient.ShowMiniPageWhenEverLoginSet;

+ 16 - 17
Client/Views/GuideView.dfm

@@ -4,26 +4,25 @@ inherited GuideViewForm: TGuideViewForm
   Margins.Right = 0
   Margins.Bottom = 0
   Caption = 'GuideViewForm'
-  ClientHeight = 448
-  ClientWidth = 673
+  ClientHeight = 560
+  ClientWidth = 750
   OnClose = FormClose
   OnCreate = FormCreate
-  OnShow = FormShow
-  ExplicitWidth = 689
-  ExplicitHeight = 487
+  ExplicitWidth = 766
+  ExplicitHeight = 599
   PixelsPerInch = 96
   TextHeight = 13
   inherited Chrome: TChromium
-    Width = 673
-    Height = 448
-    ExplicitWidth = 264
-    ExplicitHeight = 150
+    Width = 750
+    Height = 560
+    ExplicitWidth = 673
+    ExplicitHeight = 448
   end
   object pnlClient: TPanel
     Left = 0
     Top = 0
-    Width = 673
-    Height = 448
+    Width = 750
+    Height = 560
     Align = alClient
     BevelOuter = bvNone
     Padding.Left = 7
@@ -31,15 +30,13 @@ inherited GuideViewForm: TGuideViewForm
     Padding.Right = 7
     Padding.Bottom = 7
     TabOrder = 1
-    ExplicitLeft = 176
-    ExplicitTop = 8
-    ExplicitWidth = 185
-    ExplicitHeight = 41
+    ExplicitWidth = 673
+    ExplicitHeight = 448
     object rndContent: TRealICQRoundBorderPanel
       Left = 7
       Top = 7
-      Width = 659
-      Height = 434
+      Width = 736
+      Height = 546
       Margins.Left = 0
       Margins.Top = 0
       Margins.Right = 0
@@ -52,6 +49,8 @@ inherited GuideViewForm: TGuideViewForm
       BorderColor = 11579568
       BackColor = clWhite
       RoundValue = 6
+      ExplicitWidth = 659
+      ExplicitHeight = 434
     end
   end
 end

+ 0 - 7
Client/Views/GuideView.pas

@@ -13,7 +13,6 @@ type
     pnlClient: TPanel;
     procedure FormCreate(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure FormShow(Sender: TObject);
   private
     { Private declarations }
   public
@@ -57,11 +56,5 @@ begin
   AutoFree := True;
 end;
 
-procedure TGuideViewForm.FormShow(Sender: TObject);
-begin
-  URL := ExtractFilePath(paramstr(0)) + 'html/guideView.html';
-  inherited;
-end;
-
 end.
 

File diff suppressed because it is too large
+ 1 - 1
Controls/RealICQComponents.dproj


BIN
Controls/RealICQComponents.res


File diff suppressed because it is too large
+ 1 - 1
Log/Logger.dproj


BIN
Log/Logger.res