Index: oup/current/Main.dfm =================================================================== --- oup/current/Main.dfm (revision 52) +++ oup/current/Main.dfm (revision 53) @@ -67,4 +67,10 @@ OnClick = menu_loadfileClick end + object menu_loaddb: TTBItem + Caption = 'Open level-&db ...' + ImageIndex = 1 + ShortCut = 16452 + OnClick = menu_loaddbClick + end object menu_sep1: TTBSeparatorItem end @@ -129,4 +135,5 @@ Caption = '&Meta editor' Enabled = False + ImageIndex = 11 ShortCut = 16461 OnClick = menu_metaClick @@ -142,4 +149,5 @@ Caption = 'Levelfile structure editor ...' Enabled = False + ImageIndex = 12 ShortCut = 16460 end @@ -210,8 +218,14 @@ OnDockChanged = ToolbarDockChanged object tbOpen: TTBItem - Caption = 'Open file' + Caption = 'Open .dat' DisplayMode = nbdmImageAndText ImageIndex = 0 OnClick = menu_loadfileClick + end + object tb_opendb: TTBItem + Caption = 'Open DB' + DisplayMode = nbdmImageAndText + ImageIndex = 1 + OnClick = menu_loaddbClick end object tb_separator1: TTBSeparatorItem @@ -270,4 +284,5 @@ DisplayMode = nbdmImageAndText Enabled = False + ImageIndex = 11 OnClick = menu_metaClick end @@ -283,4 +298,5 @@ DisplayMode = nbdmImageAndText Enabled = False + ImageIndex = 12 end end @@ -358,5 +374,5 @@ Top = 112 Bitmap = { - 494C01010B000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600 + 494C01010D000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600 0000000000003600000028000000400000004000000001002000000000000040 0000000000000000000000000000000000000000000000000000000000000000 @@ -368,253 +384,253 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000FFFFFF0000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF000000FF000000FF + 000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF + 000000FF000000FF000000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF000000000000000000000000000000000000000000000000000000 + 0000FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF00000000000000000000000000000000000000000000000000FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF000000000000000000000000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF0000000000000000000000000000000000FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF000000 + FF00FFFFFF00000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF0000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF0000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FF000000FF000000FF + 000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF + 000000FF000000FF000000FF0000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000FF000000FF000000FF000000 + FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000 + FF000000FF000000FF000000FF000000FF00000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 FF000000FF000000000000000000000000000000000000000000000000000000 - 00000000000000000000FFFFFF0000000000000000000000FF000000FF000000 - FF000000FF000000000000000000FFFFFF000000000000000000000000000000 0000000000000000FF000000FF00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000FF000000FF000000 - FF000000FF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000FF000000FF000000 - FF000000FF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000FF000000FF00000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000FF0000FFFF000000FF0000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF + FF0000FFFF000000FF000000FF000000FF00000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 FF000000FF000000000000000000000000000000000000000000000000000000 - 00000000000000000000FFFFFF0000000000000000000000FF000000FF000000 - FF000000FF000000000000000000FFFFFF000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF00000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF + FF0000FFFF00000000000000FF0000000000000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 FF000000FF000000000000000000000000000000000000000000000000000000 - 000000000000FFFFFF000000000000000000000000000000FF000000FF000000 - FF000000FF00000000000000000000000000FFFFFF0000000000000000000000 - 0000FF000000FF00000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000FFFF - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000FFFFFF000000 - 0000FF000000FF00000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF00000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000FF0000000000000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF + FF0000000000000000000000FF00000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF + FF0000000000000000000000FF000000000000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 0000FF0000000000000000000000000000000000000000000000000000000000 - 0000FFFFFF0000000000000000000000000000000000FF000000FF000000FF00 - 0000FF00000000000000000000000000000000000000FFFFFF00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000FF000000FF000000FF00 - 0000FF00000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00000000000000000000000000FF000000FF000000FF00 - 0000FF000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF00000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000FF000000000000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 0000FF0000000000000000000000000000000000000000000000000000000000 - 0000FFFFFF0000000000000000000000000000000000FF000000FF000000FF00 - 0000FF00000000000000000000000000000000000000FFFFFF00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 + 000000000000000000000000FF000000000000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 - 0000FF000000000000000000000000000000000000000000000000000000FFFF - FF000000000000000000000000000000000000000000FF000000FF000000FF00 - 0000FF0000000000000000000000000000000000000000000000FFFFFF000000 - 00000000FF000000FF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 0000000000000000FF000000FF00000000000000000000000000000000000000 - 000000000000000000000000000000000000FFFFFF0000000000000000000000 - 00000000FF000000FF0000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000FF0000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 + 000000000000000000000000FF000000000000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF000000FF0000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF000000FF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF00000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000FF00000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF000000FF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF000000FF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF00000000000000 + 000000000000000000000000FF00000000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF000000FF000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000FF000000FF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF00000000000000 + 000000000000000000000000FF00000000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF000000000000000000000000000000000000000000FFFFFF000000 - 0000000000000000FF000000FF00000000000000000000FFFF0000FFFF0000FF - FF0000FFFF000000000000000000FFFFFF000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF000000000000000000000000000000000000000000FFFFFF000000 - 000000000000FF000000FF000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF000000000000000000FFFFFF000000000000000000000000000000 - 000000000000FF000000FF000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF0000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FF000000FF000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF00000000000000000000000000FFFFFF000000000000FFFF0000FF - FF0000000000FF000000FF000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000FFFF0000FF - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000008080800080808000808 + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF00000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000FF00000000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000FF0000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000FF0000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000FFFF000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000000000000000000000 + 000000000000000000000000FF00000000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000FF0000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000FF0000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000FF0000FFFF000000FF0000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000FF000000FF000000 + FF000000FF000000FF000000FF000000FF000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000FF0000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000FF000000FF000000FF0000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000FF000000FF000000FF000000 + FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000 + FF000000FF000000FF000000FF000000FF000000000008080800080808000808 0800080808001018180010101000080808001010100008080800080810001010 1000101010000808080008080800000000000000000000000000000000000000 @@ -878,9 +894,9 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000FFFBFF7F00FF000087FD86F900FF0000 - 8400840900FF000087FD86FF1F07000087FB87731F070000FFEFFFD31F070000 - 87F787BF1F070000840387031F07000087F787BF1F07000087EF87D31F070000 - FFB9FF731F07000087D986FF1F070000840F840F1F07000087D986F900FF0000 - 87B9874900FF0000FFFFFFCF00FF00008001FFFFFFFF00008001A007A0070000 + 0000000000000000000000000000000003FB03BF00FF000003FD037900FF0000 + 0200020100FF000003FD037F1F07000003FB03B91F07000003EF03E91F070000 + 03F703DF1F070000020303831F07000003F703DF1F07000003E803E81F070000 + 03B803B81F07000003D803781F070000020F02071F07000003D8037800FF0000 + 03B803B800FF000003F803F800FF00008001FFFFFFFF00008001A007A0070000 8001000200020000800100020002000080010002000200000000000200020000 0000000200020000800100020002000080010002000200008001000200020000 Index: oup/current/Main.pas =================================================================== --- oup/current/Main.pas (revision 52) +++ oup/current/Main.pas (revision 53) @@ -72,4 +72,7 @@ tb_db2dat: TTBItem; tb_dat2db: TTBItem; + menu_loaddb: TTBItem; + tb_opendb: TTBItem; + procedure LoadFile(typedb: Boolean); function TryCloseAll: Boolean; procedure menu_AboutClick(Sender: TObject); @@ -106,4 +109,5 @@ procedure menu_metaClick(Sender: TObject); procedure ToolbarDockChanged(Sender: TObject); + procedure menu_loaddbClick(Sender: TObject); private public @@ -320,8 +324,6 @@ - {#################################} - {##### Main-Menu-Handlers #####} - {#################################} -procedure TForm_Main.menu_loadfileClick(Sender: TObject); + +procedure TForm_Main.LoadFile(typedb: Boolean); var ext: String; @@ -332,4 +334,8 @@ opend.InitialDir := AppSettings.DatPath; opend.Filter := 'Compatible level files|*.dat;*.oldb|Oni level (*.dat)|*.dat|OUP level database (*.oldb)|*.oldb|Any (*.*)|*'; + if typedb then + opend.FilterIndex := 3 + else + opend.FilterIndex := 2; if opend.Execute then begin @@ -351,4 +357,18 @@ end; UpdateStatBar; +end; + + + {#################################} + {##### Main-Menu-Handlers #####} + {#################################} +procedure TForm_Main.menu_loaddbClick(Sender: TObject); +begin + LoadFile(True); +end; + +procedure TForm_Main.menu_loadfileClick(Sender: TObject); +begin + LoadFile(False); end; Index: oup/current/Settings.dfm =================================================================== --- oup/current/Settings.dfm (revision 52) +++ oup/current/Settings.dfm (revision 53) @@ -4,5 +4,5 @@ BorderStyle = bsToolWindow Caption = 'Settings' - ClientHeight = 357 + ClientHeight = 235 ClientWidth = 321 Color = clBtnFace @@ -37,5 +37,5 @@ object btn_ok: TButton Left = 8 - Top = 319 + Top = 199 Width = 57 Height = 23 @@ -46,6 +46,6 @@ end object btn_cancel: TButton - Left = 120 - Top = 319 + Left = 112 + Top = 199 Width = 57 Height = 23 @@ -54,31 +54,4 @@ TabOrder = 2 OnClick = btn_cancelClick - end - object btn_register_oldb: TButton - Left = 8 - Top = 184 - Width = 169 - Height = 25 - Caption = 'Register .oldb files with OUP' - TabOrder = 3 - OnClick = btn_register_oldbClick - end - object btn_register_opf: TButton - Left = 8 - Top = 215 - Width = 169 - Height = 25 - Caption = 'Register .opf files with OUP' - TabOrder = 4 - OnClick = btn_register_opfClick - end - object btn_register_dat: TButton - Left = 8 - Top = 153 - Width = 169 - Height = 25 - Caption = 'Register .dat files with OUP' - TabOrder = 5 - OnClick = btn_register_datClick end object combo_charset: TComboBox @@ -90,5 +63,5 @@ ItemHeight = 13 ItemIndex = 0 - TabOrder = 6 + TabOrder = 3 Text = 'default - 1' Items.Strings = ( @@ -109,4 +82,28 @@ Height = 17 Caption = 'Hide "Unused" data in StructureViewer' + TabOrder = 4 + end + object check_reg_dat: TCheckBox + Left = 8 + Top = 118 + Width = 180 + Height = 17 + Caption = 'Register .dat files with OUP' + TabOrder = 5 + end + object check_reg_oldb: TCheckBox + Left = 8 + Top = 141 + Width = 180 + Height = 17 + Caption = 'Register .oldb files with OUP' + TabOrder = 6 + end + object check_reg_opf: TCheckBox + Left = 8 + Top = 164 + Width = 180 + Height = 17 + Caption = 'Register .opf files with OUP' TabOrder = 7 end Index: oup/current/Settings.pas =================================================================== --- oup/current/Settings.pas (revision 52) +++ oup/current/Settings.pas (revision 53) @@ -12,18 +12,15 @@ btn_ok: TButton; btn_cancel: TButton; - btn_register_oldb: TButton; - btn_register_opf: TButton; - btn_register_dat: TButton; label_charset: TLabel; combo_charset: TComboBox; check_hideunused: TCheckBox; - procedure btn_register_opfClick(Sender: TObject); - procedure btn_register_oldbClick(Sender: TObject); - procedure btn_register_datClick(Sender: TObject); + check_reg_dat: TCheckBox; + check_reg_oldb: TCheckBox; + check_reg_opf: TCheckBox; procedure btn_cancelClick(Sender: TObject); procedure btn_okClick(Sender: TObject); procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure FormShow(Sender: TObject); - function RegisterExtension(ext: String): Integer; + function RegisterExtension(ext: String; reg: Boolean): Integer; private public @@ -65,5 +62,5 @@ -function TForm_Settings.RegisterExtension(ext: String): Integer; +function TForm_Settings.RegisterExtension(ext: String; reg: Boolean): Integer; var ftr: TFileTypeRegistration; @@ -72,44 +69,22 @@ begin Result := -1; - if ExtensionRegistered(ext, temps) then - begin - if temps <> 'ONI' + ext then - begin - warnmsg := ext + '-files are not registered to OUP but as "' + - temps + '"-files.' + #13 + #10 + 'Do you really want to unregister' + - ext + '-files?'; - if MessageBox(Self.Handle, PChar(warnmsg), PChar('Warning'), MB_YESNO) = ID_NO then - Exit; + ftr := TFileTypeRegistration.Create; + if reg then + begin + if ExtensionRegistered(ext, temps) then + if not ftr.UnregisterExtension(ext) then + ShowMessage('Could not unregister ' + ext + '-files'); + if ftr.RegisterType(ext, 'ONI' + ext, 'ONI ' + ext + '-file', Application.EXEname + ',1') then + begin + ftr.AddHandler('open', '"' + Application.EXEname + '" ' + MidStr( + ext, 2, Length(ext) - 1) + ' "%1"'); + ftr.SetDefaultHandler; end; - ftr := TFileTypeRegistration.Create; - if ftr <> nil then - try - if not ftr.UnregisterExtension(ext) then - ShowMessage('Could not unregister ' + ext + '-files') - else - Result := 2; - finally - ftr.Free; - end; - end - else - begin - ftr := TFileTypeRegistration.Create; - if ftr <> nil then - begin - try - if ftr.RegisterType(ext, 'ONI' + ext, 'ONI ' + ext + '-file', - Application.EXEname + ',1') then - begin - ftr.AddHandler('open', '"' + Application.EXEname + '" ' + MidStr( - ext, 2, Length(ext) - 1) + ' "%1"'); - ftr.SetDefaultHandler; - Result := 1; - end; - finally - ftr.Free; - end; - end; + end else begin + if ExtensionRegistered(ext, temps) then + if not ftr.UnregisterExtension(ext) then + ShowMessage('Could not unregister ' + ext + '-files'); end; + ftr.Free; end; @@ -126,4 +101,6 @@ procedure TForm_Settings.btn_okClick(Sender: TObject); +var + temps: String; begin AppSettings.FilenumbersAsHex := check_filesashex.Checked; @@ -135,44 +112,47 @@ AppSettings.HideUnusedData := check_hideunused.Checked; + if check_reg_dat.Checked then + begin + if ExtensionRegistered('.dat', temps) then + begin + if temps <> 'ONI.dat' then + if MessageBox(Self.Handle, PChar('.dat-files already registered to "' + + temps+'". Reregister?'), PChar('Reregister?'), + MB_YESNO + MB_ICONQUESTION) = ID_YES then + RegisterExtension('.dat', True); + end else + RegisterExtension('.dat', True); + end else + RegisterExtension('.dat', False); + + if check_reg_oldb.Checked then + begin + if ExtensionRegistered('.oldb', temps) then + begin + if temps <> 'ONI.oldb' then + if MessageBox(Self.Handle, PChar('.oldb-files already registered to "' + + temps+'". Reregister?'), PChar('Reregister?'), + MB_YESNO + MB_ICONQUESTION) = ID_YES then + RegisterExtension('.oldb', True); + end else + RegisterExtension('.oldb', True); + end else + RegisterExtension('.oldb', False); + + if check_reg_opf.Checked then + begin + if ExtensionRegistered('.opf', temps) then + begin + if temps <> 'ONI.opf' then + if MessageBox(Self.Handle, PChar('.opf-files already registered to "' + + temps+'". Reregister?'), PChar('Reregister?'), + MB_YESNO + MB_ICONQUESTION) = ID_YES then + RegisterExtension('.opf', True); + end else + RegisterExtension('.opf', True); + end else + RegisterExtension('.opf', False); + Self.Close; -end; - - - - -procedure TForm_Settings.btn_register_datClick(Sender: TObject); -begin - case RegisterExtension('.dat') of - 2: - btn_register_dat.Caption := 'Register .dat files with OUP'; - 1: - btn_register_dat.Caption := 'Unregister .dat files'; - end; -end; - - - - -procedure TForm_Settings.btn_register_oldbClick(Sender: TObject); -begin - case RegisterExtension('.oldb') of - 2: - btn_register_oldb.Caption := 'Register .oldb files with OUP'; - 1: - btn_register_oldb.Caption := 'Unregister .oldb files'; - end; -end; - - - - -procedure TForm_Settings.btn_register_opfClick(Sender: TObject); -begin - case RegisterExtension('.opf') of - 2: - btn_register_opf.Caption := 'Register .opf files with OUP'; - 1: - btn_register_opf.Caption := 'Unregister .opf files'; - end; end; @@ -197,15 +177,18 @@ begin if ExtensionRegistered('.dat', temps) then - btn_register_dat.Caption := 'Unregister .dat files' + check_reg_dat.Checked := temps = 'ONI.dat' else - btn_register_dat.Caption := 'Register .dat files with OUP'; + check_reg_dat.Checked := False; + if ExtensionRegistered('.oldb', temps) then - btn_register_oldb.Caption := 'Unregister .oldb files' + check_reg_oldb.Checked := temps = 'ONI.oldb' else - btn_register_oldb.Caption := 'Register .oldb files with OUP'; + check_reg_oldb.Checked := False; + if ExtensionRegistered('.opf', temps) then - btn_register_opf.Caption := 'Unregister .opf files' + check_reg_opf.Checked := temps = 'ONI.opf' else - btn_register_opf.Caption := 'Register .opf files with OUP'; + check_reg_opf.Checked := False; + check_filesashex.Checked := AppSettings.FilenumbersAsHex; check_hideunused.Checked := AppSettings.HideUnusedData; Index: oup/current/Tools/Template.pas =================================================================== --- oup/current/Tools/Template.pas (revision 52) +++ oup/current/Tools/Template.pas (revision 53) @@ -84,9 +84,5 @@ i: LongWord; exts: TStringArray; -f, c1,c2: Int64; -time1,time2,time3: Double; -begin -QueryPerformanceFrequency(f); -QueryPerformanceCounter(c1); +begin combo_extension.Items.Clear; combo_extension.Items.Add('_All files_ (' + @@ -102,11 +98,6 @@ end else combo_extension.Items.Add(exts[i]); -QueryPerformanceCounter(c2); -time1 := (c2 - c1) / f; combo_extension.ItemIndex := 0; combo_extensionClick(Self); -QueryPerformanceCounter(c1); -time2 := (c1 - c2) / f; -ShowMessage(FloatToStr(time1) +#13+#10+ FloatToStr(time2)); end;