ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/oup/current/Main.pas
(Generate patch)

Comparing oup/current/Main.pas (file contents):
Revision 227 by alloc, Tue Jun 19 22:06:10 2007 UTC vs.
Revision 248 by alloc, Mon Nov 26 11:02:28 2007 UTC

# Line 217 | Line 217 | begin
217        begin
218          ShowMessage('Load OPF-File: ' + ParamStr(2));
219        end
220 <      else if (strings.Strings[0] = 'oldb') or (strings.Strings[0] = 'dat') then
220 >      else if (strings.Strings[0] = 'oldb') or (strings.Strings[0] = 'dat') or (strings.Strings[0] = 'oni') then
221        begin
222          CreateConnection(strings.Strings[1]);
223        end;
# Line 253 | Line 253 | begin
253  
254    ConManager.OnCoonnectionListChanged := UpdateConLists;
255  
256 +  Application.HintPause := 250;
257 +  Application.HintHidePause := 5000;
258 +
259    if FileExists(ExtractFilepath(Application.EXEname) + '\oniunpacker.ini') then
260    begin
261      AssignFile(AppSettingsFile, ExtractFilepath(Application.EXEname) +
# Line 277 | Line 280 | begin
280    begin
281      ShowMessage('Load OPF-File: ' + ParamStr(2));
282    end
283 <  else if (MidStr(ParamStr(1), 1, 4) = 'oldb') or (MidStr(ParamStr(1), 1, 3) = 'dat') then
283 >  else if (MidStr(ParamStr(1), 1, 4) = 'oldb') or (MidStr(ParamStr(1), 1, 3) = 'dat') or (MidStr(ParamStr(1), 1, 3) = 'oni') then
284    begin
285      CreateConnection(ParamStr(2));
286    end;
# Line 505 | Line 508 | begin
508        entry.Name := 'menu_conn_' + IntToStr(i);
509        entry.OnClick := menu_conns_itemClick;
510        menu_conns.Add(entry);
508 –      entry := nil;
511      end;
512    end;
513   end;
# Line 516 | Line 518 | var
518    i: Integer;
519   begin
520    opend.InitialDir := AppSettings.DatPath;
521 <  opend.Filter     := 'Compatible level files|*.dat;*.oldb|Oni level (*.dat)|*.dat|OUP level database (*.oldb)|*.oldb|Any (*.*)|*';
521 >  opend.Filter     := 'Compatible level files|*.dat;*.oni;*.oldb|Oni level (*.dat)|*.dat|OniSplit Archive (*.oni)|*.oni|OUP level database (*.oldb)|*.oldb|Any (*.*)|*';
522    if typedb then
523 <    opend.FilterIndex := 3
523 >    opend.FilterIndex := 4
524    else
525      opend.FilterIndex := 2;
526    if opend.Execute then
# Line 812 | Line 814 | end;
814  
815   function TForm_Main.open_child(window_context: String; Connection: Integer): TForm_BaseTemplate;
816   begin
817 <  open_child(window_context, Connection, -1);
817 >  Result := open_child(window_context, Connection, -1);
818   end;
819  
820   function TForm_Main.open_child(window_context: String): TForm_BaseTemplate;
821   begin
822 <  open_child(window_context, -1, -1);
822 >  Result := open_child(window_context, -1, -1);
823   end;
824  
825   end.

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)