Changeset 82 for oup


Ignore:
Timestamp:
Jan 14, 2007, 1:48:40 AM (18 years ago)
Author:
alloc
Message:
 
Location:
oup/current
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • oup/current/Main.dfm

    r54 r82  
    371371  end
    372372  object MenuImages: TImageList
    373     Left = 168
    374     Top = 112
     373    Left = 16
     374    Top = 136
    375375    Bitmap = {
    376376      494C01010D000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
    … …  
    909909      000000000000}
    910910  end
     911  object Images_Close: TImageList
     912    Left = 16
     913    Top = 176
     914    Bitmap = {
     915      494C010102000400040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
     916      0000000000003600000028000000400000001000000001002000000000000010
     917      0000000000000000000000000000000000000000000000000000000000000000
     918      0000000000000000000000000000000000000000000000000000000000000000
     919      0000000000000000000000000000000000000000000000000000000000000000
     920      0000000000000000000000000000000000000000000000000000000000000000
     921      0000000000000000000000000000000000000000000000000000000000000000
     922      0000000000000000000000000000000000000000000000000000000000000000
     923      0000000000000000000000000000000000000000000000000000000000000000
     924      0000000000000000000000000000000000000000000000000000000000000000
     925      00000000000000000000000000000000000000000000000000005459BB00343B
     926      B2000F19A7000F19A7000F19A7000F19A7000F19A7000F19A7000F19A7000F19
     927      A700343BB2005459BB0000000000000000000000000000000000767676005E5E
     928      5E00434343004343430043434300434343004343430043434300434343004343
     929      43005E5E5E007676760000000000000000000000000000000000000000000000
     930      0000000000000000000000000000000000000000000000000000000000000000
     931      0000000000000000000000000000000000000000000000000000000000000000
     932      0000000000000000000000000000000000000000000000000000000000000000
     933      000000000000000000000000000000000000000000005358BA005B69E1006877
     934      EE006575EE006273ED005F71ED005C6EEC00596CEC00566AEB005268EB004F66
     935      EA004C63EA003F54DD005358BA000000000000000000757575008B8B8B009999
     936      990098989800969696009494940092929200909090008F8F8F008D8D8D008B8B
     937      8B00898989007B7B7B0075757500000000000000000000000000000000000000
     938      0000000000000000000000000000000000000000000000000000000000000000
     939      0000000000000000000000000000000000000000000000000000000000000000
     940      0000000000000000000000000000000000000000000000000000000000000000
     941      00000000000000000000000000000000000000000000333AB1006D7BEE005766
     942      E5003E4FDA003445D5003345D4003343D3003142D2003141D1003040CF003647
     943      D3004357DF004C63EA003D46BB0000000000000000005D5D5D009C9C9C008A8A
     944      8A00777777006E6E6E006E6E6E006C6C6C006B6B6B006A6A6A00696969006F6F
     945      6F007E7E7E008989890068686800000000000000000000000000000000000000
     946      0000000000000000000000000000000000000000000000000000000000000000
     947      0000000000000000000000000000000000000000000000000000000000000000
     948      0000000000000000000000000000000000000000000000000000000000000000
     949      000000000000000000000000000000000000000000000F19A700707DEF004354
     950      DD004354DA00C5CAF300606DDD003446D5003345D4005F6BDB00C4C8F000404E
     951      D2003445D1004F66EA00202DB8000000000000000000434343009E9E9E007B7B
     952      7B007A7A7A00D6D6D6008D8D8D006F6F6F006E6E6E008B8B8B00D4D4D4007474
     953      74006D6D6D008B8B8B0055555500000000000000000000000000000000000000
     954      0000000000000000000000000000000000000000000000000000000000000000
     955      0000000000000000000000000000000000000000000000000000000000000000
     956      0000000000000000000000000000000000000000000000000000000000000000
     957      000000000000000000000000000000000000000000000F19A700737FEF004657
     958      DF00C5CAF300FFFFFF00F3F4FD00606EDE00606DDD00F3F4FC00FFFFFF00C4C8
     959      F0003040CF005268EB00202EB8000000000000000000434343009F9F9F007E7E
     960      7E00D6D6D600FFFFFF00F7F7F7008E8E8E008D8D8D00F6F6F600FFFFFF00D4D4
     961      D400696969008D8D8D0056565600000000000000000000000000000000000000
     962      0000000000000000000000000000000000000000000000000000000000000000
     963      0000000000000000000000000000000000000000000000000000000000000000
     964      0000000000000000000000000000000000000000000000000000000000000000
     965      000000000000000000000000000000000000000000000F19A7007681EF004859
     966      E1006270E300F3F4FD00FFFFFF00F3F4FD00F3F4FD00FFFFFF00F3F4FC005F6B
     967      DB003141D000566AEB00222FB800000000000000000043434300A1A1A1008080
     968      800091919100F7F7F700FFFFFF00F7F7F700F7F7F700FFFFFF00F6F6F6008B8B
     969      8B006A6A6A008F8F8F0057575700000000000000000000000000000000000000
     970      0000000000000000000000000000000000000000000000000000000000000000
     971      0000000000000000000000000000000000000000000000000000000000000000
     972      0000000000000000000000000000000000000000000000000000000000000000
     973      000000000000000000000000000000000000000000000F19A7007A87F000495B
     974      E300384CDE006371E400F3F4FD00FFFFFF00FFFFFF00F3F4FD00606DDD003343
     975      D3003142D1005C71EC002735B900000000000000000043434300A5A5A5008282
     976      82007676760092929200F7F7F700FFFFFF00FFFFFF00F7F7F7008D8D8D006C6C
     977      6C006B6B6B00949494005B5B5B00000000000000000000000000000000000000
     978      0000000000000000000000000000000000000000000000000000000000000000
     979      0000000000000000000000000000000000000000000000000000000000000000
     980      0000000000000000000000000000000000000000000000000000000000000000
     981      000000000000000000000000000000000000000000000F19A7008697F3005066
     982      E7004059E3006778E700F3F4FD00FFFFFF00FFFFFF00F3F4FD006373DF003B50
     983      D700394FD5006983EF002A39BA00000000000000000043434300B1B1B1008A8A
     984      8A008080800097979700F7F7F700FFFFFF00FFFFFF00F7F7F700929292007676
     985      760075757500A1A1A1005E5E5E00000000000000000000000000000000000000
     986      0000000000000000000000000000000000000000000000000000000000000000
     987      0000000000000000000000000000000000000000000000000000000000000000
     988      0000000000000000000000000000000000000000000000000000000000000000
     989      000000000000000000000000000000000000000000000F19A7008EA3F4006484
     990      ED007994EE00F5F7FD00FFFFFF00F5F7FD00F5F7FD00FFFFFF00F5F7FD00758E
     991      E6004F71DE007491F2002B3BBA00000000000000000043434300B9B9B900A0A0
     992      A000ACACAC00F9F9F900FFFFFF00F9F9F900F9F9F900FFFFFF00F9F9F900A6A6
     993      A6008E8E8E00ABABAB005F5F5F00000000000000000000000000000000000000
     994      0000000000000000000000000000000000000000000000000000000000000000
     995      0000000000000000000000000000000000000000000000000000000000000000
     996      0000000000000000000000000000000000000000000000000000000000000000
     997      000000000000000000000000000000000000000000000F19A70091A4F4006685
     998      EE00CED7F900FFFFFF00F5F7FD007792EC007791EA00F5F7FD00FFFFFF00CCD5
     999      F5004F71DE007693F2002B3BBA00000000000000000043434300BABABA00A1A1
     1000      A100E0E0E000FFFFFF00F9F9F900A9A9A900A9A9A900F9F9F900FFFFFF00DEDE
     1001      DE008E8E8E00ACACAC005F5F5F00000000000000000000000000000000000000
     1002      0000000000000000000000000000000000000000000000000000000000000000
     1003      0000000000000000000000000000000000000000000000000000000000000000
     1004      0000000000000000000000000000000000000000000000000000000000000000
     1005      000000000000000000000000000000000000000000000F19A70092A4F5006686
     1006      EF006283EE00CDD7F8007892EE005277E8005175E600758FE900CBD5F6005C7A
     1007      E3005475E1007894F2002D3CBA00000000000000000043434300BABABA00A2A2
     1008      A2009F9F9F00E0E0E000ABABAB009595950093939300A7A7A700DEDEDE009696
     1009      960092929200ADADAD0060606000000000000000000000000000000000000000
     1010      0000000000000000000000000000000000000000000000000000000000000000
     1011      0000000000000000000000000000000000000000000000000000000000000000
     1012      0000000000000000000000000000000000000000000000000000000000000000
     1013      000000000000000000000000000000000000000000002C34AD008FA0F500778D
     1014      F2005D7BEE005C7AED005B79EC005977EA005876E8005674E7005473E6005371
     1015      E400647FEA00748DF2003F49BA00000000000000000057575700B8B8B800A9A9
     1016      A9009A9A9A009999990098989800969696009595950093939300929292009090
     1017      90009C9C9C00A9A9A9006A6A6A00000000000000000000000000000000000000
     1018      0000000000000000000000000000000000000000000000000000000000000000
     1019      0000000000000000000000000000000000000000000000000000000000000000
     1020      0000000000000000000000000000000000000000000000000000000000000000
     1021      000000000000000000000000000000000000000000004449B3007783E7008998
     1022      F4008795F4008493F4008191F3007E90F3007B8EF300798DF300768AF3007389
     1023      F3007187F2005F73E3004449B200000000000000000068686800A0A0A000B2B2
     1024      B200B0B0B000AEAEAE00ADADAD00ACACAC00A9A9A900A9A9A900A7A7A700A6A6
     1025      A600A5A5A5009292920068686800000000000000000000000000000000000000
     1026      0000000000000000000000000000000000000000000000000000000000000000
     1027      0000000000000000000000000000000000000000000000000000000000000000
     1028      0000000000000000000000000000000000000000000000000000000000000000
     1029      00000000000000000000000000000000000000000000000000004449B3002C33
     1030      AD000F19A7000F19A7000F19A7000F19A7000F19A7000F19A7000F19A7000F19
     1031      A7002C33AC004449B20000000000000000000000000000000000686868005757
     1032      5700434343004343430043434300434343004343430043434300434343004343
     1033      4300575757006868680000000000000000000000000000000000000000000000
     1034      0000000000000000000000000000000000000000000000000000000000000000
     1035      0000000000000000000000000000000000000000000000000000000000000000
     1036      0000000000000000000000000000000000000000000000000000000000000000
     1037      0000000000000000000000000000000000000000000000000000000000000000
     1038      0000000000000000000000000000000000000000000000000000000000000000
     1039      0000000000000000000000000000000000000000000000000000000000000000
     1040      0000000000000000000000000000000000000000000000000000000000000000
     1041      0000000000000000000000000000000000000000000000000000000000000000
     1042      0000000000000000000000000000000000000000000000000000000000000000
     1043      0000000000000000000000000000000000000000000000000000000000000000
     1044      0000000000000000000000000000000000000000000000000000000000000000
     1045      000000000000000000000000000000000000424D3E000000000000003E000000
     1046      2800000040000000100000000100010000000000800000000000000000000000
     1047      000000000000000000000000FFFFFF00FFFFFFFF00000000C003C00300000000
     1048      8001800100000000800180010000000080018001000000008001800100000000
     1049      8001800100000000800180010000000080018001000000008001800100000000
     1050      8001800100000000800180010000000080018001000000008001800100000000
     1051      C003C00300000000FFFFFFFF00000000}
     1052  end
    9111053end

  • oup/current/Main.pas

    r54 r82  
    7474    menu_loaddb: TTBItem;
    7575    tb_opendb: TTBItem;
     76    Images_Close: TImageList;
    7677    procedure LoadFile(typedb: Boolean);
    7778    function TryCloseAll: Boolean;
    … …  
    205206    x := Rect.Left + 4;
    206207  Control.Canvas.TextOut(x, y + 2, caption);
     208  if active then
     209    Images_Close.Draw(Control.Canvas, Rect.Right - 18, y, 0)
     210  else
     211    Images_Close.Draw(Control.Canvas, Rect.Right - 18, y, 1);
    207212end;
    208213
    … …  
    216221var
    217222  pt: TPoint;
    218   index: Integer;
     223  tabIndex: Integer;
     224  tabRect: TRect;
     225  tabX, tabY, tabWidth: Integer;
    219226begin
    220227  pt.X := X;
    221228  pt.Y := Y;
    222   index := MDITab.GetTabAtPos(pt);
    223   if (Button = mbRight) and (index >= 0) then
    224     MDITab.MDIChildren[index].Close;
     229  tabIndex := MDITab.GetTabAtPos(pt);
     230  if (Button = mbRight) and (tabIndex >= 0) then
     231    MDITab.MDIChildren[tabIndex].Close;
     232
     233  if (Button = mbLeft) and (tabIndex >= 0) then
     234  begin
     235    tabrect := MDITab.TabRect(tabIndex);
     236    tabX := X - tabrect.Left;
     237    tabY := Y - tabrect.Top;
     238    tabwidth := tabrect.Right - tabrect.Left;
     239    if (tabY >= 4) and (tabY <= 17) then
     240      if (tabX >= tabwidth - 19) and (tabX <= tabwidth - 7) then
     241        MDITab.MDIChildren[tabIndex].Close;
     242  end;
    225243end;
    226244
    … …  
    581599function TForm_Main.open_child(window_context: String; fileid: Integer): TForm_ToolTemplate;
    582600var
    583   toolform: TForm_ToolTemplate;
    584   i:       Integer;
    585   tag:     Integer;
    586   iconindex: Integer;
     601  toolform:    TForm_ToolTemplate;
     602  i:           Integer;
     603  tag:         Integer;
     604  caption_end: String;
     605  iconindex:   Integer;
    587606begin
    588607  Result := nil;
    … …  
    595614
    596615  iconindex := -1;
     616  caption_end := IntToStr(tag) + '       ';
    597617
    598618  if window_context = 'binedit' then
    599619  begin
    600620    toolform         := TForm_BinEdit.Create(Self);
    601     toolform.Caption := 'Binary .dat-Editor ' + IntToStr(tag);
     621    toolform.Caption := 'Binary .dat-Editor ' + caption_end;
    602622    iconindex        := 5;
    603623  end;
    … …  
    605625  begin
    606626    toolform         := TForm_Extractor.Create(Self);
    607     toolform.Caption := 'Extractor ' + IntToStr(tag);
     627    toolform.Caption := 'Extractor ' + caption_end;
    608628    iconindex        := 8;
    609629  end;
    … …  
    611631  begin
    612632    toolform         := TForm_Preview.Create(Self);
    613     toolform.Caption := 'Preview-Window ' + IntToStr(tag);
     633    toolform.Caption := 'Preview-Window ' + caption_end;
    614634    iconindex        := 4;
    615635  end;
    … …  
    617637  begin
    618638    toolform         := TForm_RawEdit.Create(Self);
    619     toolform.Caption := 'Binary .raw-Editor ' + IntToStr(tag);
     639    toolform.Caption := 'Binary .raw-Editor ' + caption_end;
    620640    iconindex        := 6;
    621641  end;
    … …  
    623643  begin
    624644    toolform         := TForm_TxmpReplace.Create(Application);
    625     toolform.Caption := 'TXMP Replacer ' + IntToStr(tag);
     645    toolform.Caption := 'TXMP Replacer ' + caption_end;
    626646    iconindex        := 7;
    627647  end;
    … …  
    632652    toolform.Tag     := tag;
    633653    MDITab.AddTab(TForm(toolform), iconindex);
     654    toolform.Caption := AnsiReplaceStr(toolform.Caption, '       ', '');
    634655    if fileid > -1 then
    635656      toolform.SelectFileID(fileid);
Note: See TracChangeset for help on using the changeset viewer.