From 139426241c1ff96724a977f5fce89f0acc7e753b Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Wed, 4 Nov 2015 11:38:05 +0100 Subject: [PATCH] fix, open d source from mini explorere broken by prev commit --- src/ce_messages.lfm | 2 +- src/ce_messages.pas | 3 +++ src/ce_miniexplorer.pas | 7 ++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ce_messages.lfm b/src/ce_messages.lfm index 00332771..f5dbdac4 100644 --- a/src/ce_messages.lfm +++ b/src/ce_messages.lfm @@ -24,7 +24,7 @@ inherited CEMessagesWidget: TCEMessagesWidget Width = 759 Align = alClient BorderSpacing.Around = 2 - DefaultItemHeight = 18 + DefaultItemHeight = 16 Font.Height = -12 Font.Name = 'Courier New' Font.Quality = fqProof diff --git a/src/ce_messages.pas b/src/ce_messages.pas index a54c61d9..392e4910 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -12,6 +12,9 @@ uses type + //TODO-cbugfix: the filter does not respect the categories + // e.g filter, reset filter, all the messages are displayed regardless of the selected category. + (** * the struct linked to a log message. allow to be filtered. *) diff --git a/src/ce_miniexplorer.pas b/src/ce_miniexplorer.pas index 4ea2aa73..f9504cfa 100644 --- a/src/ce_miniexplorer.pas +++ b/src/ce_miniexplorer.pas @@ -4,6 +4,8 @@ unit ce_miniexplorer; interface +//TODO-cbugfix: alphabetic sorting is broken after filter reset. + uses Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls, Graphics, ExtCtrls, Menus, ComCtrls, Buttons, lcltype, strutils, ce_widget, ce_sharedres, @@ -340,6 +342,7 @@ end; procedure TCEMiniExplorerWidget.btnEditClick(Sender: TObject); var fname: string; + proj: boolean = false; begin if lstFiles.Selected = nil then exit; if lstFiles.Selected.Data = nil then exit; @@ -352,13 +355,15 @@ begin begin if assigned(fProj) then fProj.getProject.Free; TCENativeProject.create(nil); + proj := true; end else if isValidDubProject(fname) then begin if assigned(fProj) then fProj.getProject.Free; TCEDubProject.create(nil); + proj := true; end; - if assigned(fProj) then + if assigned(fProj) and proj then fProj.loadFromFile(fname) else getMultiDocHandler.openDocument(fname);