Skip to content

Commit

Permalink
Credits, new milestone and range fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
dvorka committed Mar 3, 2018
1 parent 4d3ac33 commit 7b4194b
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 46 deletions.
9 changes: 3 additions & 6 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

Written by [Martin Dvorak](http://me.mindforger.com).

Special thanks:

* ...

Big thanks to 3rd party content authors:

* Bjarne Stroustrup (C++ - for inspiring visions and being the authority behind C++ language)
Expand All @@ -23,6 +19,7 @@ Big thanks to 3rd party content authors:

See [licenses](./licenses) folder for 3rd party content licensing details.

Acknowledgements to reviewers and testers:
Acknowledgements to reviewers, and testers:

* Floex
* Floex (reviews)
* Honza Odstrcil (consultations)
Original file line number Diff line number Diff line change
Expand Up @@ -122,50 +122,56 @@ Outline* MarkdownOutlineRepresentation::outline(vector<MarkdownAstNodeSection*>*
}
delete body;
}
astNode = ast->at(++off);
if(ast->size()>1) {
astNode = ast->at(++off);
} else {
astNode = nullptr;
}
}

// O's section
if(astNode->isPostDeclaredSection()) outline->setPostDeclaredSection();
if(astNode->getText()!=nullptr) {
// IMPROVE pull pointer > do NOT copy
outline->setName(*(astNode->getText()));
}
const string* s = astNode->getMetadata().getType();
if(s) {
const OutlineType* outlineType;
// IMPROVE consider string normalization to make parsing more robust
//std::transform(s.begin(), s.end(), s.begin(), ::tolower);
//s[0] = toupper(s[0])
if((outlineType=ontology.getOutlineTypes().get(*s))==nullptr) {
outlineType = ontology.getDefaultOutlineType();
if(astNode) {
// O's section
if(astNode->isPostDeclaredSection()) outline->setPostDeclaredSection();
if(astNode->getText()!=nullptr) {
// IMPROVE pull pointer > do NOT copy
outline->setName(*(astNode->getText()));
}
outline->setType(outlineType);
}
outline->setCreated(astNode->getMetadata().getCreated());
outline->setModified(astNode->getMetadata().getModified());
outline->setRevision(astNode->getMetadata().getRevision());
outline->setRead(astNode->getMetadata().getRead());
outline->setReads(astNode->getMetadata().getReads());
outline->setImportance(astNode->getMetadata().getImportance());
outline->setUrgency(astNode->getMetadata().getUrgency());
outline->setProgress(astNode->getMetadata().getProgress());

if(astNode->getMetadata().getTags().size()) {
const Tag* t;
for(string* s:astNode->getMetadata().getTags()) {
t = ontology.findOrCreateTag(*s);
outline->addTag(t);
const string* s = astNode->getMetadata().getType();
if(s) {
const OutlineType* outlineType;
// IMPROVE consider string normalization to make parsing more robust
//std::transform(s.begin(), s.end(), s.begin(), ::tolower);
//s[0] = toupper(s[0])
if((outlineType=ontology.getOutlineTypes().get(*s))==nullptr) {
outlineType = ontology.getDefaultOutlineType();
}
outline->setType(outlineType);
}
outline->setCreated(astNode->getMetadata().getCreated());
outline->setModified(astNode->getMetadata().getModified());
outline->setRevision(astNode->getMetadata().getRevision());
outline->setRead(astNode->getMetadata().getRead());
outline->setReads(astNode->getMetadata().getReads());
outline->setImportance(astNode->getMetadata().getImportance());
outline->setUrgency(astNode->getMetadata().getUrgency());
outline->setProgress(astNode->getMetadata().getProgress());

if(astNode->getMetadata().getTags().size()) {
const Tag* t;
for(string* s:astNode->getMetadata().getTags()) {
t = ontology.findOrCreateTag(*s);
outline->addTag(t);
}
}
}

vector<string*>* body = ast->at(off)->moveBody();
if(body!=nullptr) {
// IMPROVE use body as is
for(string*& bodyItem:*body) {
outline->addDescriptionLine(bodyItem);
vector<string*>* body = ast->at(off)->moveBody();
if(body!=nullptr) {
// IMPROVE use body as is
for(string*& bodyItem:*body) {
outline->addDescriptionLine(bodyItem);
}
delete body;
}
delete body;
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace m8r {
#define MINDFORGER_VERSION_MINOR 1
#define MINDFORGER_VERSION_REVISION 0

#define MINDFORGER_VERSION "0.3.0"
#define MINDFORGER_VERSION "0.4.0"

}
#endif // M8R_VERSION_H
2 changes: 1 addition & 1 deletion mindforger.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.0.1, 2018-03-02T21:22:49. -->
<!-- Written by QtCreator 3.0.1, 2018-03-03T08:10:58. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
Expand Down

0 comments on commit 7b4194b

Please sign in to comment.