Changeset 471 for trunk


Ignore:
Timestamp:
Dec 4, 2023, 12:08:50 AM (12 months ago)
Author:
chronos
Message:
  • Fixed: More units uses items corrected for high DPI support.
Location:
trunk
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/Inp.pas

    r468 r471  
    66uses
    77  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, ButtonA, StdCtrls,
    8   System.UITypes,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
     8  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
    109  Graphics, Controls, Forms{$ENDIF};
    1110

  • trunk/Integrated.lpr

    r468 r471  
    66  cthreads, clocale,
    77  {$ENDIF}
    8   {$IFDEF DPI}Dpi.Forms,{$ELSE}Forms,{$ENDIF}
    98  Interfaces, SysUtils, Protocol, GameServer, Direct, Start, Messg, Inp,
    109  Back, Log, LocalPlayer, ClientTools, Tribes, IsoEngine, Term, CityScreen, Nego,
    11   NoTerm, ScreenTools, Directories;
     10  NoTerm, ScreenTools, Directories,
     11  {$IFDEF DPI}Dpi.Forms{$ELSE}Forms{$ENDIF};
    1212
    1313{$if declared(UseHeapTrace)}

  • trunk/LocalPlayer/Battle.pas

    r468 r471  
    55
    66uses
    7   ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType, UITypes,
     7  ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
    88  SysUtils, Classes, DrawDlg, IsoEngine,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
    1010  Graphics, Controls, Forms{$ENDIF};
    1111

  • trunk/LocalPlayer/CityScreen.pas

    r469 r471  
    88  Protocol, ClientTools, ScreenTools, IsoEngine, BaseWin, LCLIntf, LCLType,
    99  Messages, SysUtils, Classes, ButtonA, ButtonC, Area, GraphType, Texture,
    10   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
     10  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, System.UITypes{$ELSE}
    1111  Graphics, Controls, Forms, ExtCtrls{$ENDIF};
    1212

  • trunk/LocalPlayer/Draft.pas

    r468 r471  
    66uses
    77  Protocol, ClientTools, ScreenTools, BaseWin, LCLIntf, LCLType, SysUtils,
    8   Classes, ButtonA, ButtonB, Area, System.UITypes,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls{$ELSE}
     8  Classes, ButtonA, ButtonB, Area,
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls,
     10  System.UITypes{$ELSE}
    1011  Graphics, Controls, Forms, ExtCtrls{$ENDIF};
    1112

  • trunk/LocalPlayer/Help.pas

    r468 r471  
    55
    66uses
    7   Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType, System.UITypes,
     7  Protocol, ScreenTools, BaseWin, StringTables, Math, LCLIntf, LCLType,
    88  Messages, SysUtils, Classes, ButtonB, PVSB, Types, Generics.Collections, IsoEngine,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Common{$ELSE}
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Common,
     10  System.UITypes{$ELSE}
    1011  Graphics, Controls, Forms, ExtCtrls{$ENDIF};
    1112

  • trunk/LocalPlayer/MessgEx.pas

    r468 r471  
    66uses
    77  Messg, Protocol, ScreenTools, Platform, DateUtils, LCLIntf, LCLType, Messages,
    8   SysUtils, Classes, ButtonA, ButtonB, DrawDlg, Help, System.UITypes,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Common{$ELSE}
     8  SysUtils, Classes, ButtonA, ButtonB, DrawDlg, Help,
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Common,
     10  System.UITypes{$ELSE}
    1011  Graphics, Controls, Forms, StdCtrls{$ENDIF};
    1112

  • trunk/LocalPlayer/Nego.pas

    r468 r471  
    66uses
    77  ScreenTools, BaseWin, Protocol, LCLType, SysUtils, Classes, ButtonA, ButtonB,
    8   ButtonN, System.UITypes,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
     8  ButtonN,
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
    1010  Graphics, Controls, Forms{$ENDIF};
    1111

  • trunk/LocalPlayer/Select.pas

    r468 r471  
    55
    66uses
    7   Protocol, ClientTools, ScreenTools, PVSB, BaseWin, System.UITypes,
    8   LCLIntf, LCLType, Messages, SysUtils, Classes, ButtonB, ButtonBase, Types,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus{$ELSE}
     7  Protocol, ClientTools, ScreenTools, PVSB, BaseWin, LCLIntf, LCLType, Messages,
     8  SysUtils, Classes, ButtonB, ButtonBase, Types,
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.ExtCtrls, Dpi.Menus,
     10  System.UITypes{$ELSE}
    1011  Graphics, Controls, Forms, ExtCtrls, Menus{$ENDIF};
    1112

  • trunk/LocalPlayer/Term.pas

    r470 r471  
    1212{$ENDIF}
    1313  Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
    14   LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, System.UITypes,
     14  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types,
    1515  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area,
    1616  GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
    … …  
    1818  Help,
    1919  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Menus, Dpi.ExtCtrls,
    20   Dpi.PixelPointer, Dpi.Common{$ELSE}
     20  Dpi.PixelPointer, Dpi.Common, System.UITypes{$ELSE}
    2121  Graphics, Controls, Forms, Menus, ExtCtrls, PixelPointer{$ENDIF};
    2222

  • trunk/Messg.pas

    r468 r471  
    66uses
    77  ScreenTools, LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes,
    8   ButtonA, DrawDlg, System.UITypes,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
     8  ButtonA, DrawDlg,
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
    1010  Graphics, Controls, Forms{$ENDIF};
    1111

  • trunk/MiniMap.pas

    r468 r471  
    2121    Bitmap: TBitmap; { game world sample preview }
    2222    Size: TPoint;
    23     Colors: array [0 .. 11, 0 .. 1] of TColor;
     23    Colors: array [0..31, 0..1] of TColor;
    2424    Mode: TMiniMode;
    2525    MapOptions: TMapOptions;

  • trunk/NoTerm.pas

    r468 r471  
    66uses
    77  ScreenTools, Protocol, Messg, LCLIntf, LCLType, DateUtils, Platform,
    8   SysUtils, Classes, ButtonB, DrawDlg, System.UITypes,
    9   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms{$ELSE}
     8  SysUtils, Classes, ButtonB, DrawDlg,
     9  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
    1010  Graphics, Controls, Forms{$ENDIF};
    1111

  • trunk/Packages/CevoComponents/Area.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}
    7   Graphics, Controls,{$ENDIF}
    8   Classes;
     6  Classes,
     7  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls{$ELSE}
     8  Graphics, Controls{$ENDIF};
    99
    1010type

  • trunk/Packages/CevoComponents/BaseWin.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms,{$ELSE}
    7   Graphics, Controls, Forms,{$ENDIF}
    8   ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg, System.UITypes;
     6  ScreenTools, LCLIntf, LCLType, SysUtils, Classes, DrawDlg,
     7  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, System.UITypes{$ELSE}
     8  Graphics, Controls, Forms{$ENDIF};
    99
    1010type

  • trunk/Packages/CevoComponents/ButtonA.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
    7   ButtonBase, Classes, LCLIntf, LCLType, ScreenTools, Types;
     6  ButtonBase, Classes, LCLIntf, LCLType, ScreenTools, Types,
     7  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
    88
    99type

  • trunk/Packages/CevoComponents/ButtonB.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
    7   ButtonBase, Classes, LCLIntf, LCLType;
     6  ButtonBase, Classes, LCLIntf, LCLType,
     7  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
    88
    99type

  • trunk/Packages/CevoComponents/ButtonBase.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}
    7   Graphics, Controls,{$ENDIF}
    8   Classes;
     6  Classes,
     7  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls{$ELSE}
     8  Graphics, Controls{$ENDIF};
    99
    1010type

  • trunk/Packages/CevoComponents/ButtonN.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls,{$ELSE}Graphics, Controls,{$ENDIF}
    7   Classes, LCLIntf, LCLType, ScreenTools;
     6  Classes, LCLIntf, LCLType, ScreenTools,
     7  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls{$ELSE}Graphics, Controls{$ENDIF};
    88
    99type

  • trunk/Packages/CevoComponents/DrawDlg.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Forms, Dpi.Common,{$ELSE}
    7   Forms,{$ENDIF}
    86  Classes, SysUtils, LCLIntf, LCLType, {$IFDEF UNIX}LMessages,{$ENDIF}
    9   Messages, Graphics, Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
    10   {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF};
     7  Messages, ButtonBase, ButtonA, ButtonB, Area, ScreenTools
     8  {$IFDEF LCLGTK2}, Gtk2Globals{$ENDIF},
     9  {$IFDEF DPI}Dpi.Forms, Dpi.Common, Dpi.Graphics, Dpi.Controls{$ELSE}
     10  Forms, Graphics, Controls{$ENDIF};
    1111
    1212type
    … …  
    9898  Pos: TPoint;
    9999begin
    100   if BorderStyle <> bsNone then
     100  if BorderStyle <> TBorderStyle.bsNone then
    101101    inherited
    102102  else
    … …  
    252252  Left := (Screen.Width - Width) div 2;
    253253  Canvas.Font.Assign(UniFont[ftNormal]);
    254   Canvas.Brush.Style := bsClear;
     254  Canvas.Brush.Style := TBrushStyle.bsClear;
    255255  MessgText := '';
    256256  TopSpace := 0;

  • trunk/Packages/CevoComponents/EOTButton.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
    7   ButtonBase, Classes, SysUtils, LCLIntf, LCLType;
     6  ButtonBase, Classes, SysUtils, LCLIntf, LCLType,
     7  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
    88
    99const

  • trunk/Packages/CevoComponents/GraphicSet.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics,{$ELSE}
    7   Graphics,{$ENDIF}
    86  Classes, SysUtils, Generics.Collections, LCLType, DOM,
    9   XMLRead, XMLWrite, XML;
     7  XMLRead, XMLWrite, XML,
     8  {$IFDEF DPI}Dpi.Graphics{$ELSE}
     9  Graphics{$ENDIF};
    1010
    1111type

  • trunk/Packages/CevoComponents/Texture.pas

    r468 r471  
    44
    55uses
    6   {$IFDEF DPI}Dpi.Graphics,{$ELSE}Graphics,{$ENDIF}
    7   Classes, SysUtils;
     6  Classes, SysUtils,
     7  {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
    88
    99type

  • trunk/Packages/DpiControls/Dpi.Controls.pas

    r468 r471  
    1414  TKeyEvent = Controls.TKeyEvent;
    1515  TAlign = Controls.TAlign;
     16  TBorderStyle = Controls.TBorderStyle;
    1617
    1718  { TControlEx }

  • trunk/Settings.pas

    r468 r471  
    55uses
    66  Classes, SysUtils, FileUtil, Dialogs, LCLProc, ScreenTools, Messg, ButtonA,
    7   Directories, DrawDlg, ButtonC, KeyBindings, Languages, System.UITypes,
    8   {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls{$ELSE}
     7  Directories, DrawDlg, ButtonC, KeyBindings, Languages,
     8  {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls, System.UITypes{$ELSE}
    99  Forms, Controls, Graphics, StdCtrls{$ENDIF};
    1010

  • trunk/Start.pas

    r470 r471  
    88  LCLIntf, LCLType, SysUtils, Classes,
    99  Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain, Translator,
    10   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus{$ELSE}
     10  {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls, Dpi.Menus,
     11  System.UITypes{$ELSE}
    1112  Graphics, Controls, Forms, StdCtrls, Menus{$ENDIF};
    1213
Note: See TracChangeset for help on using the changeset viewer.