From d581ad1c2098df2a5628f80ef4cefc6d34bd7c77 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 8 Mar 2015 00:40:36 +0100 Subject: [PATCH] removed static explorer widget --- src/ce_main.lfm | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ src/ce_main.pas | 31 ++++++++++----------- 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/src/ce_main.lfm b/src/ce_main.lfm index 1d1d3ec6..eef47708 100644 --- a/src/ce_main.lfm +++ b/src/ce_main.lfm @@ -496,6 +496,42 @@ object CEMainForm: TCEMainForm end object MenuItem65: TMenuItem Action = actFileCompileAndRunOut + Bitmap.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000330000003300000000000000000000000000000000000000070000 + 0033000000330000003300000033000000330000003300000033000000330000 + 00337C7C81FF7E7D7DFF0000000E00000033000000338886840060440E44B881 + 14FFB67E0FFFB57D0DFFB57D0CFFB67E0CFFBC7F06FF7F8188FF86878AFFA87F + 2DFFA8A8ABFFAAA8A8FF52504F698A8886FF868482FF88868400AC7A14CADCC1 + 89FFF5F0E0FFF4EDDBFFF4EDDBFFF6EFDBFFFDF4DCFF878789FFCECDCEFF9696 + 98FFC6C5C6FFC7C5C5FF989695FFD1CFCEFF8B8988FF0000000AB78012FFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE3E3DFFFC2C1BBFF959493FFB5B3 + B4FF8D8C8CFF8D8C8BFFB6B4B3FF999796FF646260894847465BB98419FFB67E + 0EFFB67F0FFFC0902EFFC08E29FFC59128FF747578FFAAA8A9FFCAC8C7FF8F8D + 8EFFFFF2D2FFFFFFF5FF8F8D8DFFCBC9C9FFB0AEADFF8E8C8AFFBB871E00B984 + 1900B8831BEFFFFFFFFFF2E9D3FFF7EDD4FF747577FFABA9AAFFCCCACAFF9290 + 8FFFDCD2B9FFE9E7E2FF918F8EFFCECCCBFFB1AFAEFF8F8D8BFFBB871F00BA85 + 1C00B0790BD2FFFFFFFFF1E9D2FFF4EBD2FFFCF2D7FFB4AFA2FF9B9997FFBCBA + BAFF939191FF929191FFBCBABAFF9E9C9AFF6C6B699B908E8C00BB871F00BA85 + 1C00AA760C9BF0E4CCFFF6EFE0FFF4ECD7FFFAF2DCFF8B8A8AFFD7D6D6FF9A99 + 97FFD0CECEFFD0CFCFFF9C9A9AFFDBDADBFF918F8EFF94929000BB871F00BA86 + 1D00AD790E73EADBBBFFFAF7EEFFF6EFDEFFFCF4E2FF7B797AFF8B8A89FFD2CC + BFFFB1AFAEFFB1B1B1FFC3B28EFF939499FF8C8B8EFF8E8E8E00BB871F00BB86 + 1D00B07B1134DBBF88FFFFFFFFFFF7F2E5FFFAF4E6FFFEF7E9FFFFF9EAFFFFFC + EDFF767574FF777778FFF8E9CAFFAA7200A8888D99008B8E9700BB871F00BB86 + 1E00B882150CCCA556FFFFFFFFFFF9F6EBFFF9F5EAFFFAF6ECFFFBF7EDFFFDF9 + EEFFFFFCF1FFFFFFFCFFFFFFFFFFAB7405CE0000003300000033BB871F00BB87 + 1E00B9831800C89E49FFFFFFFFFFFCF9F3FFFBF8F1FFFBF8F1FFFBF8F1FFFBF8 + F1FFFCF9F3FFFDFBF6FFFFFFFFFFB27701FFBA851BFFBC8921FFBB871F00BB87 + 1F00B9851B00B27A09E5FFFFFFFFFFFFFFFFFEFEFBFFFEFEFBFFFEFEFCFFFEFE + FCFFFEFEFCFFFFFFFEFFFFFFFFFFC69941FFECDFC2FFC19234FFBB871F00BB87 + 1F00BA861D00B7801283E4CFA7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFE9DABAFFEEE2C9FFB67F14BFBB871F00BB87 + 1F00BB871E00B9841A00B67E0FEAC4973BFFC79D49FFC39538FFB37904FFB47A + 07FFB47A07FFB47A08FFB57C0AFFB67F0FFFB88114FFBA851B23 + } end object MenuItem63: TMenuItem Action = actFileUnittest @@ -1706,6 +1742,42 @@ object CEMainForm: TCEMainForm end object MenuItem66: TMenuItem Action = actFileCompileAndRunOut + Bitmap.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000330000003300000000000000000000000000000000000000070000 + 0033000000330000003300000033000000330000003300000033000000330000 + 00337C7C81FF7E7D7DFF0000000E00000033000000338886840060440E44B881 + 14FFB67E0FFFB57D0DFFB57D0CFFB67E0CFFBC7F06FF7F8188FF86878AFFA87F + 2DFFA8A8ABFFAAA8A8FF52504F698A8886FF868482FF88868400AC7A14CADCC1 + 89FFF5F0E0FFF4EDDBFFF4EDDBFFF6EFDBFFFDF4DCFF878789FFCECDCEFF9696 + 98FFC6C5C6FFC7C5C5FF989695FFD1CFCEFF8B8988FF0000000AB78012FFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE3E3DFFFC2C1BBFF959493FFB5B3 + B4FF8D8C8CFF8D8C8BFFB6B4B3FF999796FF646260894847465BB98419FFB67E + 0EFFB67F0FFFC0902EFFC08E29FFC59128FF747578FFAAA8A9FFCAC8C7FF8F8D + 8EFFFFF2D2FFFFFFF5FF8F8D8DFFCBC9C9FFB0AEADFF8E8C8AFFBB871E00B984 + 1900B8831BEFFFFFFFFFF2E9D3FFF7EDD4FF747577FFABA9AAFFCCCACAFF9290 + 8FFFDCD2B9FFE9E7E2FF918F8EFFCECCCBFFB1AFAEFF8F8D8BFFBB871F00BA85 + 1C00B0790BD2FFFFFFFFF1E9D2FFF4EBD2FFFCF2D7FFB4AFA2FF9B9997FFBCBA + BAFF939191FF929191FFBCBABAFF9E9C9AFF6C6B699B908E8C00BB871F00BA85 + 1C00AA760C9BF0E4CCFFF6EFE0FFF4ECD7FFFAF2DCFF8B8A8AFFD7D6D6FF9A99 + 97FFD0CECEFFD0CFCFFF9C9A9AFFDBDADBFF918F8EFF94929000BB871F00BA86 + 1D00AD790E73EADBBBFFFAF7EEFFF6EFDEFFFCF4E2FF7B797AFF8B8A89FFD2CC + BFFFB1AFAEFFB1B1B1FFC3B28EFF939499FF8C8B8EFF8E8E8E00BB871F00BB86 + 1D00B07B1134DBBF88FFFFFFFFFFF7F2E5FFFAF4E6FFFEF7E9FFFFF9EAFFFFFC + EDFF767574FF777778FFF8E9CAFFAA7200A8888D99008B8E9700BB871F00BB86 + 1E00B882150CCCA556FFFFFFFFFFF9F6EBFFF9F5EAFFFAF6ECFFFBF7EDFFFDF9 + EEFFFFFCF1FFFFFFFCFFFFFFFFFFAB7405CE0000003300000033BB871F00BB87 + 1E00B9831800C89E49FFFFFFFFFFFCF9F3FFFBF8F1FFFBF8F1FFFBF8F1FFFBF8 + F1FFFCF9F3FFFDFBF6FFFFFFFFFFB27701FFBA851BFFBC8921FFBB871F00BB87 + 1F00B9851B00B27A09E5FFFFFFFFFFFFFFFFFEFEFBFFFEFEFBFFFEFEFCFFFEFE + FCFFFEFEFCFFFFFFFEFFFFFFFFFFC69941FFECDFC2FFC19234FFBB871F00BB87 + 1F00BA861D00B7801283E4CFA7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF + FFFFFFFFFFFFFFFFFFFFFFFFFFFFE9DABAFFEEE2C9FFB67F14BFBB871F00BB87 + 1F00BB871E00B9841A00B67E0FEAC4973BFFC79D49FFC39538FFB37904FFB47A + 07FFB47A07FFB47A08FFB57C0AFFB67F0FFFB88114FFBA851B23 + } end object MenuItem64: TMenuItem Action = actFileUnittest diff --git a/src/ce_main.pas b/src/ce_main.pas index a5bf1e09..a3918f85 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -8,11 +8,11 @@ uses Classes, SysUtils, FileUtil, SynEditKeyCmds, SynHighlighterLFM, Forms, AnchorDocking, AnchorDockStorage, AnchorDockOptionsDlg, Controls, Graphics, Dialogs, Menus, ActnList, ExtCtrls, process, XMLPropStorage, SynExportHTML, - ce_common, ce_dmdwrap, ce_project, ce_dcd, ce_synmemo, ce_widget, - ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf, ce_search, - ce_staticexplorer, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist, - ce_observer, ce_writableComponent, ce_toolseditor, ce_procinput, ce_optionseditor, - ce_cdbcmd, ce_symlist; + ce_common, ce_dmdwrap, ce_project, ce_dcd, ce_synmemo, ce_writableComponent, + ce_widget, ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf, + ce_search, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist, ce_observer, + ce_toolseditor, ce_procinput, ce_optionseditor,{$IFDEF WIN32} ce_cdbcmd,{$ENDIF} + ce_symlist; type @@ -194,7 +194,6 @@ type fEditWidg: TCEEditorWidget; fProjWidg: TCEProjectInspectWidget; fPrjCfWidg: TCEProjectConfigurationWidget; - fStExpWidg: TCEStaticExplorerWidget; fFindWidg: TCESearchWidget; fExplWidg: TCEMiniExplorerWidget; fLibMWidg: TCELibManEditorWidget; @@ -203,7 +202,6 @@ type fTodolWidg: TCETodoListWidget; fOptEdWidg: TCEOptionEditorWidget; fSymlWidg: TCESymbolListWidget; - //fResWidg: TCEResmanWidget; {$IFDEF WIN32} fCdbWidg: TCECdbWidget; {$ENDIF} @@ -419,7 +417,6 @@ begin fEditWidg := TCEEditorWidget.create(self); fProjWidg := TCEProjectInspectWidget.create(self); fPrjCfWidg:= TCEProjectConfigurationWidget.create(self); - fStExpWidg:= TCEStaticExplorerWidget.create(self); fFindWidg := TCESearchWidget.create(self); fExplWidg := TCEMiniExplorerWidget.create(self); fLibMWidg := TCELibManEditorWidget.create(self); @@ -428,7 +425,6 @@ begin fTodolWidg:= TCETodoListWidget.create(self); fOptEdWidg:= TCEOptionEditorWidget.create(self); fSymlWidg := TCESymbolListWidget.create(self); - //fResWidg := TCEResmanWidget.create(self); getMessageDisplay(fMsgs); @@ -440,7 +436,6 @@ begin fWidgList.addWidget(@fEditWidg); fWidgList.addWidget(@fProjWidg); fWidgList.addWidget(@fPrjCfWidg); - fWidgList.addWidget(@fStExpWidg); fWidgList.addWidget(@fFindWidg); fWidgList.addWidget(@fExplWidg); fWidgList.addWidget(@fLibMWidg); @@ -449,7 +444,6 @@ begin fWidgList.addWidget(@fTodolWidg); fWidgList.addWidget(@fOptEdWidg); fWidgList.addWidget(@fSymlWidg); - //fWidgList.addWidget(@fResWidg); {$IFDEF WIN32} fWidgList.addWidget(@fCdbWidg); @@ -480,11 +474,13 @@ begin DockMaster.OnShowOptions := @ShowAnchorDockOptions; DockMaster.HeaderStyle := adhsPoints; DockMaster.HideHeaderCaptionFloatingControl := true; + // this is a fix copied from Laz, seems to force the space between the menu and the UI stay 0. if DockManager is TAnchorDockManager then begin aManager:=TAnchorDockManager(DockManager); aManager.PreferredSiteSizeAsSiteMinimum:=false; end; + // makes widget dockable for i := 0 to fWidgList.Count-1 do begin @@ -493,22 +489,23 @@ begin DockMaster.MakeDockable(widg, true); DockMaster.GetAnchorSite(widg).Header.HeaderPosition := adlhpTop; end; + // load existing or default docking if FileExists(getCoeditDocPath + 'docking.xml') then LoadDocking else begin Height := 0; - fStExpWidg.width := 120; - fFindWidg.Width := 120; - fProjWidg.Width := 120; - fPrjCfWidg.Width := 120; // center DockMaster.ManualDock(DockMaster.GetAnchorSite(fEditWidg), DockMaster.GetSite(Self), alBottom); DockMaster.ManualDock(DockMaster.GetAnchorSite(fMesgWidg), DockMaster.GetSite(fEditWidg), alBottom); DockMaster.ManualDock(DockMaster.GetAnchorSite(fPrInpWidg), DockMaster.GetSite(fMesgWidg), alBottom); // left - DockMaster.ManualDock(DockMaster.GetAnchorSite(fStExpWidg), DockMaster.GetSite(fEditWidg), alLeft); - DockMaster.ManualDock(DockMaster.GetAnchorSite(fFindWidg), DockMaster.GetAnchorSite(fStExpWidg), alBottom, fStExpWidg); + DockMaster.GetAnchorSite(fSymlWidg).Width := 200; + DockMaster.GetAnchorSite(fFindWidg).Width := 200; + DockMaster.ManualDock(DockMaster.GetAnchorSite(fSymlWidg), DockMaster.GetSite(fEditWidg), alLeft); + DockMaster.ManualDock(DockMaster.GetAnchorSite(fFindWidg), DockMaster.GetAnchorSite(fSymlWidg), alBottom, fSymlWidg); // right + DockMaster.GetAnchorSite(fProjWidg).Width := 250; + DockMaster.GetAnchorSite(fPrjCfWidg).Width := 250; DockMaster.ManualDock(DockMaster.GetAnchorSite(fProjWidg), DockMaster.GetSite(fEditWidg), alRight); DockMaster.ManualDock(DockMaster.GetAnchorSite(fPrjCfWidg), DockMaster.GetAnchorSite(fProjWidg), alBottom, fProjWidg); // close remaining and header to top