ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Main.pas

Comparing oup/current/Main.pas (file contents):
Revision 224 by alloc, Mon Jun 18 14:49:24 2007 UTC vs.
Revision 241 by alloc, Tue Jul 17 22:27:16 2007 UTC

#	Line 44 | Line 44 | type
44		menu_windows_previous: TTBItem;
45		menu_sep2:  TTBSeparatorItem;
46		menu_About: TTBItem;
47	<	Toolbar:    TTBToolbar;
47	>	Toolbar_main: TTBToolbar;
48		tbOpen:     TTBItem;
49		DockLeft:   TTBDock;
50		DockRight:  TTBDock;
#	Line 57 | Line 57 | type
57		menu_view_statusbar: TTBItem;
58		menu_view_toolbar: TTBItem;
59		tb_separator1: TTBSeparatorItem;
60	–	tb_preview: TTBItem;
61	–	tb_structure: TTBItem;
62	–	tb_compare: TTBItem;
63	–	tb_extractor: TTBItem;
64	–	tb_txmpreplacer: TTBItem;
65	–	tb_rawedit: TTBItem;
66	–	tb_datedit: TTBItem;
60		menu_windows_tilevert: TTBItem;
68	–	tb_meta: TTBItem;
61		menu_meta: TTBItem;
62		TBSeparatorItem1: TTBSeparatorItem;
63		tb_db2dat: TTBItem;
#	Line 75 | Line 67 | type
67		Images_Close: TImageList;
68		menu_conns: TTBSubmenuItem;
69		menu_windows: TTBSubmenuItem;
70	+	menu_filemanager: TTBItem;
71	+	Toolbar_tools: TTBToolbar;
72	+	tb_preview: TTBItem;
73	+	tb_datedit: TTBItem;
74	+	tb_rawedit: TTBItem;
75	+	tb_txmpreplacer: TTBItem;
76	+	tb_extractor: TTBItem;
77	+	tb_meta: TTBItem;
78	+	tb_filemanager: TTBItem;
79	+	tb_compare: TTBItem;
80	+	tb_structure: TTBItem;
81	+	menu_view_toolbar_tools: TTBItem;
82		procedure FormClose(Sender: TObject; var Action: TCloseAction);
83		procedure FormResize(Sender: TObject);
84		procedure FormCreate(Sender: TObject);
#	Line 89 | Line 93 | type
93		Shift: TShiftState; X, Y: Integer);
94		procedure MDITabMouseMove(Sender: TObject; Shift: TShiftState; X,
95		Y: Integer);
96	<	procedure ToolbarDockChanged(Sender: TObject);
96	>	procedure Toolbar_mainDockChanged(Sender: TObject);
97		procedure CreateConnection(filename: String);
98		function CheckConnectionCloseable(index: Integer): Boolean;
99
#	Line 124 | Line 128 | type
128		procedure menu_AboutClick(Sender: TObject);
129
130		procedure WMCopyData(var Msg: TWMCopyData); message WM_COPYDATA;
131	+	procedure menu_filemanagerClick(Sender: TObject);
132	+	procedure menu_view_toolbar_toolsClick(Sender: TObject);
133		private
134		public
135		function open_child(window_context: String; Connection, FileID: Integer): TForm_BaseTemplate; overload;
#	Line 138 | Line 144 | var
144		implementation
145
146		uses
147	<	LevelDB, MetaEditor;
147	>	LevelDB, MetaEditor, FileManager;
148
149		{$R *.dfm}
150
#	Line 247 | 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 447 | Line 456 | end;
456
457
458
459	<	procedure TForm_Main.ToolbarDockChanged(Sender: TObject);
459	>	procedure TForm_Main.Toolbar_mainDockChanged(Sender: TObject);
460		var
461		toolbar: TTBToolbar;
462		position: TTBDockPosition;
#	Line 617 | Line 626 | begin
626		end;
627
628
629	<	{#################################}
629	>	procedure TForm_Main.menu_filemanagerClick(Sender: TObject);
630	>	begin
631	>	open_child('filemanager');
632	>	end;
633	>
634	>	{#################################}
635		{#####   View-Menu-Handlers  #####}
636		{#################################}
637		procedure TForm_Main.menu_windows_cascadeClick(Sender: TObject);
#	Line 702 | Line 716 | end;
716		procedure TForm_Main.menu_view_toolbarClick(Sender: TObject);
717		begin
718		menu_view_toolbar.Checked := not menu_view_toolbar.Checked;
719	<	Toolbar.Visible := menu_view_toolbar.Checked;
719	>	Toolbar_main.Visible := menu_view_toolbar.Checked;
720	>	end;
721	>
722	>	procedure TForm_Main.menu_view_toolbar_toolsClick(Sender: TObject);
723	>	begin
724	>	menu_view_toolbar_tools.Checked := not menu_view_toolbar_tools.Checked;
725	>	Toolbar_tools.Visible := menu_view_toolbar_tools.Checked;
726		end;
727
728		procedure TForm_Main.menu_view_statusbarClick(Sender: TObject);
#	Line 738 | Line 758 | type
758		classt: TTemplate;
759		end;
760		const
761	<	Tools: array[0..5] of TTool = (
761	>	Tools: array[0..6] of TTool = (
762		(name: 'binedit';     icon: 5; caption: 'Binary .dat-Editor'; classt: TForm_BinEdit),
763		(name: 'extractor';   icon: 8; caption: 'Extractor';          classt: TForm_Extractor),
764		(name: 'preview';     icon: 4; caption: 'Preview-Window';     classt: TForm_Preview),
765		(name: 'rawedit';     icon: 6; caption: 'Binary .raw-Editor'; classt: TForm_RawEdit),
766		(name: 'txmpreplace'; icon: 7; caption: 'TXMP Replacer';      classt: TForm_TxmpReplace),
767	+	(name: 'filemanager'; icon:-1; caption: 'FileManager';        classt: TForm_FileManager),
768		(name: 'meta'; icon: 11; caption: 'MetaEditor'; classt: TForm_Meta)
769		);
770		var
#	Line 794 | Line 815 | end;
815
816		function TForm_Main.open_child(window_context: String; Connection: Integer): TForm_BaseTemplate;
817		begin
818	<	open_child(window_context, Connection, -1);
818	>	Result := open_child(window_context, Connection, -1);
819		end;
820
821		function TForm_Main.open_child(window_context: String): TForm_BaseTemplate;
822		begin
823	<	open_child(window_context, -1, -1);
823	>	Result := open_child(window_context, -1, -1);
824		end;
825
826		end.

Diff Legend

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