From fa9b5751038c0e047a36b2b03aec93d30d37a3a6 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Tue, 1 Sep 2015 16:48:11 +0200 Subject: [PATCH] di-3 - todo list widget ready --- src/ce_dubproject.pas | 12 +++++++++++- src/ce_interfaces.pas | 2 ++ src/ce_nativeproject.pas | 4 ++-- src/ce_todolist.pas | 20 +++++++------------- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/ce_dubproject.pas b/src/ce_dubproject.pas index fd9c3b76..9f9b8f4d 100644 --- a/src/ce_dubproject.pas +++ b/src/ce_dubproject.pas @@ -31,6 +31,7 @@ type procedure saveToFile(const aFilename: string); function getIfModified: boolean; // + function getIfIsSource(const aFilename: string): boolean; function getOutputFilename: string; // function getConfigurationCount: integer; @@ -138,23 +139,32 @@ begin exit(fModified); end; +function TCEDubProject.getIfIsSource(const aFilename: string): boolean; +begin + //TODO-cDUB: implement + exit(false); +end; + function TCEDubProject.getOutputFilename: string; begin + //TODO-cDUB: implement exit(''); end; function TCEDubProject.getConfigurationCount: integer; begin + //TODO-cDUB: implement exit(0); end; procedure TCEDubProject.setActiveConfiguration(index: integer); begin - + //TODO-cDUB: implement end; function TCEDubProject.getConfigurationName(index: integer): string; begin + //TODO-cDUB: implement exit(''); end; diff --git a/src/ce_interfaces.pas b/src/ce_interfaces.pas index 9dffae2b..db9edc26 100644 --- a/src/ce_interfaces.pas +++ b/src/ce_interfaces.pas @@ -51,6 +51,8 @@ type //function moduleImportCount: integer; //function moduleImport(index: integer): string; + // returns true if aFilename is a project source + function getIfIsSource(const aFilename: string): boolean; // returns the name of the file produced when a project is compiled function getOutputFilename: string; diff --git a/src/ce_nativeproject.pas b/src/ce_nativeproject.pas index b290d179..f1c40147 100644 --- a/src/ce_nativeproject.pas +++ b/src/ce_nativeproject.pas @@ -74,7 +74,7 @@ type procedure endUpdate; procedure reset; procedure addDefaults; - function isProjectSource(const aFilename: string): boolean; + function getIfIsSource(const aFilename: string): boolean; function getAbsoluteSourceName(aIndex: integer): string; function getAbsoluteFilename(const aFilename: string): string; procedure addSource(const aFilename: string); @@ -395,7 +395,7 @@ begin end; end; -function TCENativeProject.isProjectSource(const aFilename: string): boolean; +function TCENativeProject.getIfIsSource(const aFilename: string): boolean; var i: Integer; begin diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas index 106bdb63..69d02cbb 100644 --- a/src/ce_todolist.pas +++ b/src/ce_todolist.pas @@ -81,7 +81,7 @@ type private fAutoRefresh: Boolean; fSingleClick: Boolean; - fProj: TCENativeProject; + fProj: ICECommonProject; fDoc: TCESynMemo; fToolProc: TCEProcess; fTodos: TTodoItems; @@ -336,15 +336,12 @@ end; {$REGION ICEProjectObserver ----------------------------------------------------} procedure TCETodoListWidget.projNew(aProject: ICECommonProject); begin - fProj := nil; - if aProject.getFormat <> pfNative then - exit; - fProj := TCENativeProject(aProject.getProject); + fProj := aProject; end; procedure TCETodoListWidget.projChanged(aProject: ICECommonProject); begin - if fProj <> aProject.getProject then + if fProj <> aProject then exit; if Visible and fAutoRefresh then callToolProcess; @@ -352,7 +349,7 @@ end; procedure TCETodoListWidget.projClosing(aProject: ICECommonProject); begin - if fProj <> aProject.getProject then + if fProj <> aProject then exit; fProj := nil; if Visible and fAutoRefresh then @@ -361,12 +358,9 @@ end; procedure TCETodoListWidget.projFocused(aProject: ICECommonProject); begin - if aProject.getProject = fProj then + if aProject = fProj then exit; - fProj := nil; - if aProject.getFormat <> pfNative then - exit; - fProj := TCENativeProject(aProject.getProject); + fProj := aProject; if Visible and fAutoRefresh then callToolProcess; end; @@ -386,7 +380,7 @@ begin if ((fProj <> nil) and (fDoc = nil)) then exit(tcProject); // - if fProj.isProjectSource(fDoc.fileName) then + if fProj.getIfIsSource(fDoc.fileName) then exit(tcProject) else exit(tcFile);