Changeset 32


Ignore:
Timestamp:
Aug 26, 2006, 8:47:38 PM (19 years ago)
Author:
RBRi
Message:

% more source cleanup (uses)

Location:
trunk/NewView
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/NewView/BookmarksFormUnit.pas

    r18 r32  
    88
    99Uses
    10   Classes, Forms, StdCtrls, Buttons,
     10  Classes,
     11  Forms,
     12  StdCtrls,
     13  Buttons,
    1114  ACLLanguageUnit,
    1215  MiscUnit;
    … …  
    6265uses
    6366  PMWin,
    64   Dialogs,
    65   ControlsUtility, ACLDialogs, ACLStringUtility;
     67  ControlsUtility,
     68  ACLDialogs,
     69  ACLStringUtility;
    6670
    6771Procedure TBookmarksForm.BookmarksFormOnSetupShow (Sender: TObject);

  • trunk/NewView/CmdLineParameterUnit.pas

    r30 r32  
    1111
    1212uses
    13   Os2Def, BseTib, BseDos,
     13  Os2Def,
     14  BseTib,
     15  BseDos,
    1416  SysUtils,
    1517  Classes,
    16 
    1718  PMWIN,
    18 
    1919  ACLStringUtility,
    2020  ACLProfile,
    … …  
    5151
    5252     public
    53        FUNCTION getShowUsageFlag : boolean;
    54        FUNCTION getSearchTextFlag : boolean;
    55        FUNCTION getSearchText : string;
    56        FUNCTION getGlobalSearchTextFlag : boolean;
    57        FUNCTION getGlobalSearchText : string;
    58        FUNCTION getLanguage : string;
    59        FUNCTION getHelpManagerFlag : boolean;
     53       PROPERTY getShowUsageFlag : boolean read showUsageFlag;
     54       PROPERTY getSearchTextFlag : boolean read searchTextFlag;
     55       PROPERTY getSearchText : string read searchText;
     56       PROPERTY getGlobalSearchTextFlag : boolean read globalSearchTextFlag;
     57       PROPERTY getGlobalSearchText : string read globalSearchText;
     58       PROPERTY getLanguage : string read language;
     59       PROPERTY getHelpManagerFlag : boolean read helpManagerFlag;
    6060       FUNCTION setHelpManagerFlag(aNewValue : boolean) : boolean;
    61        FUNCTION getHelpManagerWindow : integer;
    62        FUNCTION getWindowPositionFlag : boolean;
    63        FUNCTION getWindowPosition : TWindowPosition;
    64        FUNCTION getOwnerWindow : integer;
    65        FUNCTION getWindowTitle : string;
    66        FUNCTION getFileNames : string;
    67        FUNCTION getTopics : string;
     61       PROPERTY getHelpManagerWindow : integer read helpManagerWindow;
     62       PROPERTY getWindowPositionFlag : boolean read windowPositionFlag;
     63       PROPERTY getWindowPosition : TWindowPosition read windowPosition;
     64       PROPERTY getOwnerWindow : integer read ownerWindow;
     65       PROPERTY getWindowTitle : string read windowTitle;
     66       PROPERTY getFileNames : string read fileNames;
     67       PROPERTY getTopics : string read topics;
    6868       PROCEDURE parseCmdLine(aSplittedCmdLine : TStringList);
    6969  end;
    … …  
    100100Implementation
    101101
    102   FUNCTION TCmdLineParameters.getShowUsageFlag : boolean;
    103   begin
    104        result := showUsageFlag;
    105   end;
    106 
    107 
    108   FUNCTION TCmdLineParameters.getSearchTextFlag : boolean;
    109   begin
    110        result := searchTextFlag;
    111   end;
    112 
    113 
    114   FUNCTION TCmdLineParameters.getSearchText : string;
    115   begin
    116        result := searchText;
    117   end;
    118 
    119 
    120   FUNCTION TCmdLineParameters.getGlobalSearchTextFlag : boolean;
    121   begin
    122        result := globalSearchTextFlag;
    123   end;
    124 
    125 
    126   FUNCTION TCmdLineParameters.getGlobalSearchText : string;
    127   begin
    128        result := globalSearchText;
    129   end;
    130 
    131 
    132   FUNCTION TCmdLineParameters.getLanguage : string;
    133   begin
    134        result := language;
    135   end;
    136 
    137 
    138   FUNCTION TCmdLineParameters.getHelpManagerFlag : boolean;
    139   begin
    140        result := helpManagerFlag;
    141   end;
    142 
    143 
    144102  FUNCTION TCmdLineParameters.setHelpManagerFlag(aNewValue : boolean) : boolean;
    145103  begin
    146104       helpManagerFlag := aNewValue;
    147105       result := helpManagerFlag;
    148   end;
    149 
    150 
    151   FUNCTION TCmdLineParameters.getHelpManagerWindow : integer;
    152   begin
    153        result := helpManagerWindow;
    154   end;
    155 
    156 
    157   FUNCTION TCmdLineParameters.getWindowPositionFlag : boolean;
    158   begin
    159        result := windowPositionFlag;
    160   end;
    161 
    162 
    163   FUNCTION TCmdLineParameters.getWindowPosition : TWindowPosition;
    164   begin
    165        result := windowPosition;
    166   end;
    167 
    168 
    169   FUNCTION TCmdLineParameters.getOwnerWindow : integer;
    170   begin
    171        result := ownerWindow;
    172   end;
    173 
    174 
    175   FUNCTION TCmdLineParameters.getWindowTitle : string;
    176   begin
    177        result := windowTitle;
    178   end;
    179 
    180 
    181   FUNCTION TCmdLineParameters.getFileNames : string;
    182   begin
    183        result := fileNames;
    184   end;
    185 
    186 
    187   FUNCTION TCmdLineParameters.getTopics : string;
    188   begin
    189        result := topics;
    190106  end;
    191107

  • trunk/NewView/FileDialogForm.pas

    r18 r32  
    1212
    1313Uses
    14   Classes, Forms, StdCtrls, FileCtrl, Buttons, Messages,
    15   CustomFileControls, SplitBar, MultiColumnListBox,
     14  Classes,
     15  Forms,
     16  StdCtrls,
     17  Buttons,
     18  Messages,
     19  CustomFileControls,
     20  SplitBar,
     21  MultiColumnListBox,
    1622  ACLLanguageUnit;
    1723
    … …  
    113119
    114120uses
    115   BseDos, OS2Def, PmWin,
    116   SysUtils, Dialogs,
    117   ACLStringUtility, ACLFileUtility, ACLFileIOUtility, ACLDialogs, ACLUtility,
    118   ACLString, AStringUtilityUnit, ControlsUtility,
     121  BseDos,
     122  OS2Def,
     123  PmWin,
     124  SysUtils,
     125  ACLStringUtility,
     126  ACLFileUtility,
     127  ACLDialogs,
     128  ACLString,
     129  AStringUtilityUnit,
     130  ControlsUtility,
    119131  SettingsUnit,
    120132  HelpFile;

  • trunk/NewView/GlobalFilelistUnit.pas

    r18 r32  
    1212uses
    1313  OS2Def,
    14   SharedMemoryUnit, Semaphores;
     14  SharedMemoryUnit,
     15  Semaphores;
    1516
    1617const

  • trunk/NewView/GlobalSearchForm.pas

    r18 r32  
    1212Uses
    1313  PmWin,
    14   Classes, Forms, Graphics, Buttons, StdCtrls, ComCtrls,
    15   MultiColumnListBox, Outline2, GenericThread, ACLLanguageUnit,
    16   TextSearchQuery, HelpFile, TabCtrls, ExtCtrls, LED;
     14  Classes,
     15  Forms,
     16  Buttons,
     17  StdCtrls,
     18  ComCtrls,
     19  Outline2,
     20  GenericThread,
     21  ACLLanguageUnit,
     22  TextSearchQuery,
     23  HelpFile,
     24  ExtCtrls,
     25  LED;
    1726
    1827const
    … …  
    132141
    133142uses
    134   PMWin,
    135   SysUtils, BseDos,
    136   Dialogs,
    137   ACLFileUtility, ACLProfile, ACLDialogs, ControlsUtility, DriveInfoUnit, ACLStringUtility,
    138   IPFFileFormatUnit, HelpTopic, SearchUnit, SearchDirectoriesFormUnit,
    139   SettingsUnit, InformationFormUnit;
     143  SysUtils,
     144  ACLFileUtility,
     145  ACLProfile,
     146  ACLDialogs,
     147  ControlsUtility,
     148  DriveInfoUnit,
     149  ACLStringUtility,
     150  IPFFileFormatUnit,
     151  HelpTopic,
     152  SearchUnit,
     153  SearchDirectoriesFormUnit,
     154  SettingsUnit,
     155  InformationFormUnit;
    140156
    141157type

  • trunk/NewView/HelpBitmap.pas

    r18 r32  
    1111
    1212uses
    13   BseDos, OS2Def, PMBitmap,
    14   Classes, Graphics, SysUtils,
     13  BseDos,
     14  OS2Def,
     15  PMBitmap,
     16  Classes,
     17  Graphics,
     18  SysUtils,
    1519  IPFFileFormatUnit;
    1620
    … …  
    109113
    110114  Block: TBitmapBlock;
    111   p: pointer;
    112115  Blocks: TList;
    113116  BlockIndex: longint;

  • trunk/NewView/HelpFile.pas

    r18 r32  
    1010
    1111uses
    12   classes, BseDos, os2def, SysUtils, Graphics,
    13   IPFFileFormatUnit, HelpTopic, HelpBitmap, ACLUtility,
    14   TextSearchQuery, SearchTable;
     12  Classes,
     13  BseDos,
     14  Os2Def,
     15  SysUtils,
     16  Graphics,
     17  IPFFileFormatUnit,
     18  HelpTopic,
     19  HelpBitmap,
     20  ACLUtility,
     21  SearchTable;
    1522
    1623type
    … …  
    4653    _pSlotOffsets: Uint32ArrayPointer;
    4754    _pDictionaryData: pointer;
    48 //    _pIndexData: pointer;
    4955    _pFontTableData: pointer;
    5056    _pTopicNameData: pointer;
    … …  
    149155
    150156uses
    151   Dialogs, Forms,
    152157  BseErr,
    153   ACLFileUtility, ACLStringUtility, ACLFileIOUtility, ACLProfile,
    154   ACLDialogs, ACLLanguageUnit,
    155   HelpWindowDimensions;
     158  ACLStringUtility,
     159  ACLFileIOUtility,
     160  ACLProfile,
     161  ACLLanguageUnit;
    156162
    157163// Load "missing" bitmap
    … …  
    856862
    857863function THelpFile.GetImage( ImageOffset: longint ): THelpBitmap;
    858 var
    859   ListIndex: longint;
    860864begin
    861865  try

  • trunk/NewView/HelpTopic.pas

    r31 r32  
    1414
    1515uses
    16   BseDos, OS2Def,
    17   Classes, Graphics,
     16  BseDos,
     17  OS2Def,
     18  Classes,
     19  Graphics,
    1820  ACLString,
    19 //  RichTextDocumentUnit,
    20   HelpWindowDimensions, IPFFileFormatUnit;
     21  HelpWindowDimensions,
     22  IPFFileFormatUnit;
    2123
    2224const
    … …  
    18701872  pSlotEnd: pUInt8;
    18711873
    1872   b: uint8;
    18731874  pHold: pUint8;
    18741875  pSearch: pUint8;

  • trunk/NewView/MainForm.pas

    r25 r32  
    1111// the above line is here so you can use right-mouse open file on "system"
    1212  OS2Def,
    13   SysUtils, Classes, Forms, Graphics, Messages,
    14   Buttons, ComCtrls, StdCtrls, ExtCtrls, TabCtrls,
     13  SysUtils,
     14  Classes,
     15  Forms,
     16  Graphics,
     17  Messages,
     18  Buttons,
     19  ComCtrls,
     20  StdCtrls,
     21  ExtCtrls,
     22  TabCtrls,
    1523  Dialogs,
     24
    1625// library
    17   ACLString, SharedMemoryUnit, ACLLanguageUnit, GenericThread,
     26  ACLString,
     27  SharedMemoryUnit,
     28  ACLLanguageUnit,
     29  GenericThread,
    1830  CmdLineParameterUnit,
    1931
    2032// custom components
    21   SplitBar, Outline2, RichTextView, Coolbar2,
     33  SplitBar,
     34  Outline2,
     35  RichTextView,
     36  Coolbar2,
    2237  CustomListBox,
     38
    2339// local
    24   HelpFile, HelpTopic, HelpWindowUnit, HelpWindowDimensions,
    25   NavigatePointUnit, MiscUnit, HelpManagerUnit,
    26   TextSearchQuery, IPFFileFormatUnit, Tabset2Unit;
     40  HelpFile,
     41  HelpTopic,
     42  HelpWindowUnit,
     43  HelpWindowDimensions,
     44  NavigatePointUnit,
     45  MiscUnit,
     46  HelpManagerUnit,
     47  TextSearchQuery,
     48  IPFFileFormatUnit,
     49  Tabset2Unit;
    2750
    2851const
    … …  
    794817
    795818uses
    796   BseDos, BseErr, PMWin, PmShl,
     819  BseDos,
     820  BseErr,
     821  PMWin,
     822  PmShl,
    797823  Dos,
    798824  Printers,
     825
    799826  // Library
    800   ACLStringUtility, AStringUtilityUnit,
    801   ACLFileUtility, ACLFileIOUtility, ACLUtility,
    802   ACLProfile, ACLDialogs, ACLString,
     827  ACLStringUtility,
     828  AStringUtilityUnit,
     829  ACLFileUtility,
     830  ACLFileIOUtility,
     831  ACLUtility,
     832  ACLProfile,
     833  ACLDialogs,
     834  ACLString,
     835
    803836  // Components
    804   RichTextPrintUnit, RichTextStyleUnit, RichTextDocumentUnit,
    805   // RBRi ComponentsVersionUnit,
     837  RichTextPrintUnit,
     838  RichTextStyleUnit,
     839  RichTextDocumentUnit,
    806840  ControlsUtility,
     841
    807842  // local: forms
    808   InformationFormUnit, OptionsForm, ProductInformationFormUnit, NoteForm,
    809   GlobalSearchForm, FileDialogForm, BookmarksFormUnit,
     843  InformationFormUnit,
     844  OptionsForm,
     845  ProductInformationFormUnit,
     846  NoteForm,
     847  GlobalSearchForm,
     848  FileDialogForm,
     849  BookmarksFormUnit,
    810850  PrintDialogUnit,
     851
    811852  // local: others
    812   SettingsUnit, VersionUnit,
     853  SettingsUnit,
     854  VersionUnit,
    813855  SearchUnit,
    814   StartupUnit, GlobalFilelistUnit,
    815   WebBrowserUnit, HelpBitmap;
     856  StartupUnit,
     857  GlobalFilelistUnit,
     858  WebBrowserUnit,
     859  HelpBitmap;
    816860
    817861{$R Images}

  • trunk/NewView/NewView.spr

    r29 r32  
    8484File65=HELPTOPIC
    8585File66=HELPBITMAP
    86 File67=TEXTSEARCHQUERY
    87 File68=SEARCHTABLE
    88 File69=HELPFILE
    89 File70=HELPWINDOWUNIT
    90 File71=NAVIGATEPOINTUNIT
    91 File72=MISCUNIT
    92 File73=HELPMANAGERUNIT
     86File67=SEARCHTABLE
     87File68=HELPFILE
     88File69=HELPWINDOWUNIT
     89File70=NAVIGATEPOINTUNIT
     90File71=MISCUNIT
     91File72=HELPMANAGERUNIT
     92File73=TEXTSEARCHQUERY
    9393File74=TABSET2UNIT
    9494File75=RICHTEXTPRINTUNIT
    … …  
    139139[Debugger Options]
    140140
    141 DebugInfo=LineNumbers,LocalSymbols
     141DebugInfo=LocalSymbols
    142142EvalHints=True
    143143Dbg_Options=0
    … …  
    147147[Directories]
    148148
    149 LastDir=P:\NEWVIEW_DEV\BUILD\COMPONENTS
    150 OutDir=P:\newview_dev\build
     149LastDir=P:\NEWVIEW_DEV\NewView
     150OutDir=P:\newview_dev\build\newview
    151151LibDir=P:\newview_dev\build\sibyl\lib;P:\newview_dev\build\components;P:\newview_dev\build\library
    152152LibSrcDir=P:\newview_dev\sibyl\spcc;P:\newview_dev\sibyl\rtl;P:\newview_dev\library;P:\newview_dev\components
    … …  
    165165[Find History]
    166166
    167 Find0=todo
    168 Find1=CmdLineParameters
    169 Find2=height
    170 Find3=getSearchTextFlag
    171 Find4=parame
    172 Find5=cmdline
    173 Find6=matchflag
    174 Find7=Match
    175 Find8=StringToList
    176 Find9=Classes
    177 Find10=ExtractNextValue
    178 Find11=getHelpManagerFlag
    179 Find12=splitted
    180 Find13=CmdLineParameterUnit
    181 Find14=parsec
    182 Find15=ParseCommandLineParameters
     167Find0=SettingsUnit
     168Find1=begin
     169Find2=todo
     170Find3=CmdLineParameters
     171Find4=height
     172Find5=getSearchTextFlag
     173Find6=parame
     174Find7=cmdline
     175Find8=matchflag
     176Find9=Match
     177Find10=StringToList
     178Find11=Classes
     179Find12=ExtractNextValue
     180Find13=getHelpManagerFlag
     181Find14=splitted
     182Find15=CmdLineParameterUnit
    183183
    184184[General]
    … …  
    196196[Last Closed Files]
    197197
    198 File0=D:\PROGS\SIBYL\BIN\CompLib.scl
    199 File1=..\.\Library\ACLStringUtility.pas
    200 File2=..\.\components\ACLLanguageUnit.pas
    201 File3=.\VersionUnit.pas
    202 File4=.\NewView.pas
    203 File5=.\ViewStub.pas
     198File0=.\GlobalSearchForm.pas
     199File1=.\GlobalFilelistUnit.pas
     200File2=.\FileDialogForm.pas
     201File3=.\BookmarksFormUnit.pas
     202File4=.\HelpBitmap.pas
     203File5=.\HelpFile.pas
    204204
    205205[Last Open Files]
    … …  
    209209File0.Bottom=-5
    210210File0.Width=1243
    211 File0.Height=500
     211File0.Height=540
    212212File0.Column=18
    213213File0.Line=348
    … …  
    216216File1.Bottom=-5
    217217File1.Width=1243
    218 File1.Height=500
    219 File1.Column=1
    220 File1.Line=33
     218File1.Height=540
     219File1.Column=17
     220File1.Line=21
    221221File2=.\MainForm.pas
    222222File2.Left=-4
    223223File2.Bottom=-5
    224224File2.Width=1243
    225 File2.Height=500
    226 File2.Column=46
    227 File2.Line=4190
     225File2.Height=540
     226File2.Column=10
     227File2.Line=853
     228File3=.\SettingsUnit.pas
     229File3.Left=-4
     230File3.Bottom=-5
     231File3.Width=1243
     232File3.Height=540
     233File3.Column=1
     234File3.Line=128
    228235
    229236[Linker Options]
    … …  
    344351MainFile0.Dependency65=.\HELPTOPIC.PAS
    345352MainFile0.Dependency66=.\HELPBITMAP.PAS
    346 MainFile0.Dependency67=.\TEXTSEARCHQUERY.PAS
    347 MainFile0.Dependency68=.\SEARCHTABLE.PAS
    348 MainFile0.Dependency69=.\HELPFILE.PAS
    349 MainFile0.Dependency70=.\HELPWINDOWUNIT.PAS
    350 MainFile0.Dependency71=.\NAVIGATEPOINTUNIT.PAS
    351 MainFile0.Dependency72=.\MISCUNIT.PAS
    352 MainFile0.Dependency73=.\HELPMANAGERUNIT.PAS
     353MainFile0.Dependency67=.\SEARCHTABLE.PAS
     354MainFile0.Dependency68=.\HELPFILE.PAS
     355MainFile0.Dependency69=.\HELPWINDOWUNIT.PAS
     356MainFile0.Dependency70=.\NAVIGATEPOINTUNIT.PAS
     357MainFile0.Dependency71=.\MISCUNIT.PAS
     358MainFile0.Dependency72=.\HELPMANAGERUNIT.PAS
     359MainFile0.Dependency73=.\TEXTSEARCHQUERY.PAS
    353360MainFile0.Dependency74=..\.\components\TABSET2UNIT.PAS
    354361MainFile0.Dependency75=..\.\components\RICHTEXTPRINTUNIT.PAS

  • trunk/NewView/SettingsUnit.pas

    r18 r32  
    1111
    1212Uses
    13   Graphics, Forms, Classes;
     13  Graphics,
     14  Forms,
     15  Classes;
    1416
    1517Const

  • trunk/NewView/VersionUnit.pas

    r28 r32  
    1414
    1515const
    16   Version =        'V2.19.beta1'; // $SS_REQUIRE_NEW_VERSION$
    17   BldLevelVersion = '2.19.beta1'; // Embedded for IBM BLDLEVEL tool
     16  Version =        'V2.19.beta2'; // $SS_REQUIRE_NEW_VERSION$
     17  BldLevelVersion = '2.19.beta2'; // Embedded for IBM BLDLEVEL tool
    1818
    1919// RELEASE PROCESS
Note: See TracChangeset for help on using the changeset viewer.