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 227 by alloc, Tue Jun 19 22:06:10 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 447 | Line 453 | end;
453
454
455
456	<	procedure TForm_Main.ToolbarDockChanged(Sender: TObject);
456	>	procedure TForm_Main.Toolbar_mainDockChanged(Sender: TObject);
457		var
458		toolbar: TTBToolbar;
459		position: TTBDockPosition;
#	Line 617 | Line 623 | begin
623		end;
624
625
626	<	{#################################}
626	>	procedure TForm_Main.menu_filemanagerClick(Sender: TObject);
627	>	begin
628	>	open_child('filemanager');
629	>	end;
630	>
631	>	{#################################}
632		{#####   View-Menu-Handlers  #####}
633		{#################################}
634		procedure TForm_Main.menu_windows_cascadeClick(Sender: TObject);
#	Line 702 | Line 713 | end;
713		procedure TForm_Main.menu_view_toolbarClick(Sender: TObject);
714		begin
715		menu_view_toolbar.Checked := not menu_view_toolbar.Checked;
716	<	Toolbar.Visible := menu_view_toolbar.Checked;
716	>	Toolbar_main.Visible := menu_view_toolbar.Checked;
717	>	end;
718	>
719	>	procedure TForm_Main.menu_view_toolbar_toolsClick(Sender: TObject);
720	>	begin
721	>	menu_view_toolbar_tools.Checked := not menu_view_toolbar_tools.Checked;
722	>	Toolbar_tools.Visible := menu_view_toolbar_tools.Checked;
723		end;
724
725		procedure TForm_Main.menu_view_statusbarClick(Sender: TObject);
#	Line 738 | Line 755 | type
755		classt: TTemplate;
756		end;
757		const
758	<	Tools: array[0..5] of TTool = (
758	>	Tools: array[0..6] of TTool = (
759		(name: 'binedit';     icon: 5; caption: 'Binary .dat-Editor'; classt: TForm_BinEdit),
760		(name: 'extractor';   icon: 8; caption: 'Extractor';          classt: TForm_Extractor),
761		(name: 'preview';     icon: 4; caption: 'Preview-Window';     classt: TForm_Preview),
762		(name: 'rawedit';     icon: 6; caption: 'Binary .raw-Editor'; classt: TForm_RawEdit),
763		(name: 'txmpreplace'; icon: 7; caption: 'TXMP Replacer';      classt: TForm_TxmpReplace),
764	+	(name: 'filemanager'; icon:-1; caption: 'FileManager';        classt: TForm_FileManager),
765		(name: 'meta'; icon: 11; caption: 'MetaEditor'; classt: TForm_Meta)
766		);
767		var

Diff Legend

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