Реализован раздельный вывод сообщений для различных бесед

Author: kangreon

gui/MessageWidget/MessageControl.pas

@@ -16,7 +16,7 @@ interface
 uses
   {$I tox-uses.inc}
   Classes, SysUtils, Controls, Graphics, StringUtils, MessageList,
-  MessageDraw, Messages, ActiveRegion, MessageItem;
+  MessageDraw, Messages, ActiveRegion, MessageItem, FriendItem;
 
 type
   TMessagePosition = (mpBefore, mpAfter);
@@ -26,7 +26,7 @@   TMessageControl = class(TCustomControl)
     FIsDown: Boolean;
     FPosition: Integer;
     FActive: TActiveRegion;
-    FFrienSelect: AnsiString;
+    FFrienSelect: TFriendItem;
     FMessageList: TMessageList;
     FDraw: TMessageDraw;
     procedure MessageGet(Sender: TObject; const Index: Integer; out Exist: Boolean;
@@ -44,7 +44,7 @@   TMessageControl = class(TCustomControl)
     constructor Create(AOwner: TComponent; MessageList: TMessageList); reintroduce;
     destructor Destroy; override;
 
-    procedure SelectFriend(FriendId: AnsiString);
+    procedure SelectFriend(Friend: TFriendItem);
   end;
 
 implementation
@@ -96,14 +96,14 @@ procedure TMessageControl.ActiveOnMessage(Sender: TObject; RegionMessage: TRegio
 function TMessageControl.DoMouseWheelDown(Shift: TShiftState;
   MousePos: TPoint): Boolean;
 begin
-  FDraw.ScrollDown(4);
+  FDraw.ScrollDown(40);
   Result := True;
 end;
 
 function TMessageControl.DoMouseWheelUp(Shift: TShiftState;
   MousePos: TPoint): Boolean;
 begin
-  FDraw.ScrollUp(4);
+  FDraw.ScrollUp(40);
   Result := True;
 end;
 
@@ -119,7 +119,6 @@ procedure TMessageControl.CreateWnd;
   FDraw.Align := alClient;
   FDraw.Parent := Self;
   FDraw.OnGet := MessageGet;
-  FDraw.Redraw(FMessageList.GetMessageCount(nil) - 1);
   FActive.Parent := Self;
 end;
 
@@ -128,14 +127,21 @@ procedure TMessageControl.CreateWnd;
 procedure TMessageControl.MessageGet(Sender: TObject; const Index: Integer;
   out Exist: Boolean; out Mess: TMessageItem);
 begin
-//  Exist := FMessageList.GetMessage(FFrienSelect, Index, Mess);
+  if not Assigned(FFrienSelect) then
+    Exist := False
+  else
+    Exist := FMessageList.GetMessage(FFrienSelect.ClientId, Index, Mess);
 end;
 
 { *  Открытие диалога с новым пользователем
   * }
-procedure TMessageControl.SelectFriend(FriendId: AnsiString);
+procedure TMessageControl.SelectFriend(Friend: TFriendItem);
+var
+  LastMessage: Integer;
 begin
-  FFrienSelect := FriendId;
+  LastMessage := FMessageList.GetMessageCount(Friend.ClientId) - 1;
+  FFrienSelect := Friend;
+  FDraw.Redraw(LastMessage);
 end;
 
 procedure TMessageControl.WndProc(var Message: TMessage);

gui/MessageWidget/MessageDraw.pas

@@ -214,7 +214,7 @@ procedure TMessageDraw.Paint;
   end;
   PaintTime := Now - PaintTime;
 
-  Canvas.TextOut(0, 0, 'Message count: ' + IntToStr(Length(FDrawItems)));
+  Canvas.TextOut(0, 0, 'Message draw count: ' + IntToStr(Length(FDrawItems)));
   Canvas.TextOut(0, 13, 'Calc time: ' + FormatDateTime('ss.zzz', FCalcTime));
   Canvas.TextOut(0, 26, 'Paint time: ' + FormatDateTime('ss.zzz', PaintTime));
 end;
@@ -564,7 +564,7 @@ procedure TMessageDraw.RecreateItems;
   end
   else
   begin
-    ActiveItem := nil
+    ActiveItem := nil;
   end;
 end;
 
@@ -600,12 +600,20 @@ procedure TMessageDraw.CombineDrawInfoArrays(var ItemOld, ItemNew: TDrawItemList
   *  указанного. Указанное сообщение будет в самом низу компонента.
   * }
 procedure TMessageDraw.Redraw(BottomMessageIndex: Integer);
+var
+  Item: TMessageInfo;
 begin
+  for Item in FDrawItems do
+    Item.Free;
+
+  SetLength(FDrawItems, 0);
+
   FIsCreateList := False;
   FBottomMessageIndex := BottomMessageIndex;
-  FBottomMessagePosition := -20;
+  FBottomMessagePosition := 0;
   //RecreateItems;
   Resize;
+  Invalidate;
 end;
 
 procedure TMessageDraw.Resize;
@@ -681,6 +689,7 @@ procedure TMessageDraw.ScrollPage(Value: Integer);
   end;
 end;
 
+
 procedure TMessageDraw.SetDrawFont;
 begin
   if not Assigned(Parent) then

gui/UserList.pas

@@ -34,13 +34,15 @@   TUserList = class(TCustomControl)
     FScroll: TScrollBarNormal;
     FSortName: TSortName;
     FSortStatus: TSortStatus;
+    FOnSelectItem: TProcSelectItem;
     procedure ScrollOnScroll(Sender: TObject);
-    procedure ListOnChangeSize(Sender: TObject);
+    procedure ListChangeSize(Sender: TObject);
     procedure FriendsUpdate(Sender: TObject; Index: Integer);
     procedure LoadAllUsers;
     procedure FriendsNewItem(Sender: TObject);
     procedure SortList(UseBeginUpdate: Boolean);
     function StatusCmp(Status1, Status2: TToxUserStatus): SmallInt;
+    procedure ListSelectItem(Sender: TObject; Item: TFriendItem);
   protected
     procedure CreateWnd; override;
     function DoMouseWheelDown(Shift: TShiftState; MousePos: TPoint)
@@ -54,6 +56,9 @@   TUserList = class(TCustomControl)
       reintroduce;
 
     property Scroll: TScrollBarNormal read FScroll;
+
+    property OnSelectItem: TProcSelectItem read FOnSelectItem
+      write FOnSelectItem;
   end;
 
 implementation
@@ -89,7 +94,8 @@ procedure TUserList.CreateWnd;
   FList := TUserListDraw.Create(Self);
   FList.Align := alClient;
   FList.Parent := Self;
-  FList.OnChangeSize := ListOnChangeSize;
+  FList.OnChangeSize := ListChangeSize;
+  FList.OnSelectItem := ListSelectItem;
 
   FFriends.OnUpdateItem := FriendsUpdate;
   FFriends.OnNewItem := FriendsNewItem;
@@ -114,9 +120,11 @@ procedure TUserList.FriendsUpdate(Sender: TObject; Index: Integer);
   SortList(True);
 end;
 
+{ *  Перезагружает пользователей в список друзей в соответствии с выбранными
+  *  параметрами отображения списка и выбранной сортировкой.
+  * }
 procedure TUserList.LoadAllUsers;
 var
-  i: Integer;
   Item: TFriendItem;
   PItem: Pointer;
 begin
@@ -278,12 +286,18 @@ procedure TUserList.WndProc(var Message: TMessage);
   end;
 end;
 
-procedure TUserList.ListOnChangeSize(Sender: TObject);
+procedure TUserList.ListChangeSize(Sender: TObject);
 begin
   FScroll.ListSize := FList.Size;
   FScroll.PageSize := FList.ClientHeight;
 end;
 
+procedure TUserList.ListSelectItem(Sender: TObject; Item: TFriendItem);
+begin
+  if Assigned(FOnSelectItem) then
+    FOnSelectItem(Self, Item);
+end;
+
 procedure TUserList.ScrollOnScroll(Sender: TObject);
 begin
   FList.Position := FScroll.Position;

gui/UserListDraw.pas

@@ -30,6 +30,8 @@   TUser = record
   end;
   TUsers = array of PUser;
 
+  TProcSelectItem = procedure(Sender: TObject; Item: TFriendItem) of object;
+
   TUserListDraw = class(TGraphicControl)
   private
     FActiveRegion: TActiveRegion;
@@ -43,8 +45,9 @@   TUserListDraw = class(TGraphicControl)
     FSize: Integer;
     FStopUpdate: Boolean;
     FOnChangeSize: TNotifyEvent;
-    FOnSelectItem: TNotifyEvent;
+
     FSelectedItem: Integer;
+    FOnSelectItem: TProcSelectItem;
     procedure SetPosition(const Value: Integer);
     procedure DrawItem(Y: Integer; UserName, StatusText: DataString;
       Status: TToxUserStatus; IsNewMessage: Boolean; UserIcon: TUserIcon;
@@ -85,7 +88,7 @@   TUserListDraw = class(TGraphicControl)
     property Size: Integer read FSize;
 
     property OnChangeSize: TNotifyEvent read FOnChangeSize write FOnChangeSize;
-    property OnSelectItem: TNotifyEvent read FOnSelectItem write FOnSelectItem;
+    property OnSelectItem: TProcSelectItem read FOnSelectItem write FOnSelectItem;
   end;
 
 implementation
@@ -263,6 +266,8 @@ procedure TUserListDraw.SetActiveItem(x, y: Integer; const IsRepaint: Boolean);
   end;
 end;
 
+{ *  Выделение элемента, расположенного в указанных координатах x и y.
+  * }
 procedure TUserListDraw.SetSelectItem(x, y: Integer);
 var
   Item: Integer;
@@ -275,8 +280,9 @@ procedure TUserListDraw.SetSelectItem(x, y: Integer);
     FItems[Item].State := dsDown;
 
     FSelectedItem := Item;
+
     if Assigned(FOnSelectItem) then
-      FOnSelectItem(Self);
+      FOnSelectItem(Self, FItems[Item].Item);
 
     Invalidate;
   end;

sqlite/SQLiteTable3.pas

@@ -960,6 +960,18 @@ constructor TSQLiteTable.Create(DB: TSQLiteDatabase; const SQL: Ansistring);
   Create(DB, SQL, []);
 end;
 
+function IsIntegerColumn(ColumnName: PAnsiChar): Boolean;
+begin
+  Result := (ColumnName = 'INTEGER') or (ColumnName = 'BOOLEAN') or
+    (ColumnName = 'BOOL')
+end;
+
+function IsNumericColumn(ColumnName: PAnsiChar): Boolean;
+begin
+  Result := (ColumnName = 'NUMERIC') or (ColumnName = 'FLOAT') or
+    (ColumnName = 'DOUBLE') or (ColumnName = 'REAL');
+end;
+
 constructor TSQLiteTable.Create(DB: TSQLiteDatabase; const SQL: Ansistring;
   const Bindings: array of const);
 var
@@ -1013,15 +1025,14 @@ constructor TSQLiteTable.Create(DB: TSQLiteDatabase; const SQL: Ansistring;
                 new(thisColType);
                 DeclaredColType := Sqlite3_ColumnDeclType(Stmt, I);
                 if DeclaredColType = nil then
+                begin
                   thisColType^ := Sqlite3_ColumnType(Stmt, I)
                   // use the actual column type instead
                   // seems to be needed for last_insert_rowid
-                else if (DeclaredColType = 'INTEGER') or
-                  (DeclaredColType = 'BOOLEAN') then
+                end
+                else if IsIntegerColumn(DeclaredColType) then
                   thisColType^ := dtInt
-                else if (DeclaredColType = 'NUMERIC') or
-                  (DeclaredColType = 'FLOAT') or (DeclaredColType = 'DOUBLE') or
-                  (DeclaredColType = 'REAL') then
+                else if IsNumericColumn(DeclaredColType) then
                   thisColType^ := dtNumeric
                 else if DeclaredColType = 'BLOB' then
                   thisColType^ := dtBlob