Adding HTML styling, CSSs, license and credits which resolved dvorka#226

.
wmhorne · Mar 19, 2018 · 54eb5cf · 54eb5cf
1 parent 49883b4
commit 54eb5cf
Show file tree

Hide file tree

Showing 18 changed files with 391 additions and 40 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -12,10 +12,13 @@ Big thanks to 3rd party content authors:
 * David Parsons (Discount - MD rendering - library)
 * Google (Google C++ unit testing framework)
 * Raimund Hocke (SikuliX - GUI automation testing)
-* Jamie McGowan (Remarkable - inspiration)
+* Knut Sveidqvist (Mermaid.js - diagrams and flowcharts rendering in HTML)
+* AMS and SIAM (MathJax.js - math rendering in HTML)
+* Ivan Sagalaev (Highlight.js - source code syntax highlighting)
+* Jamie McGowan (Remarkable - inspiration and code)
 * Apiary (API blueprints - test data)
 * Mark Summerfield (Advanced Qt Programming book examples - code snippets)
-* Andres Mejia (Aho-Corasick algoritm implementation - code snippets)
+* Andres Mejia (Aho-Corasick algorithm implementation - code snippets)
 
 See [licenses](./licenses) folder for 3rd party content licensing details.
 

diff --git a/app/mf-resources.qrc b/app/mf-resources.qrc
@@ -6,4 +6,20 @@
         <file>resources/qt/translations/mindforger_cs.qm</file>
         <file>resources/qt/translations/mindforger_en.qm</file>
     </qresource>
+    <qresource prefix="/html-css">
+        <file alias="byword-dark.css">resources/qt/css/byword-dark.css</file>
+        <file alias="clearness-dark.css">resources/qt/css/clearness-dark.css</file>
+        <file alias="clearness">resources/qt/css/clearness.css</file>
+        <file alias="github.css">resources/qt/css/github.css</file>
+        <file alias="markdown.css">resources/qt/css/markdown.css</file>
+        <file alias="solarized-dark.css">resources/qt/css/solarized-dark.css</file>
+        <file alias="solarized-light.css">resources/qt/css/solarized-light.css</file>
+        <file alias="foghorn.css">resources/qt/css/foghorn.css</file>
+        <file alias="handwriting.css">resources/qt/css/handwriting.css</file>
+        <file alias="metro-vibes-dark.css">resources/qt/css/metro-vibes-dark.css</file>
+        <file alias="metro-vibes.css">resources/qt/css/metro-vibes.css</file>
+        <file alias="modern.css">resources/qt/css/modern.css</file>
+        <file alias="remarkable-dark.css">resources/qt/css/remarkable-dark.css</file>
+        <file alias="screen.css">resources/qt/css/screen.css</file>
+    </qresource>
 </RCC>
diff --git a/app/resources/qt/css/foghorn.css b/app/resources/qt/css/foghorn.css
diff --git a/app/resources/qt/css/handwriting.css b/app/resources/qt/css/handwriting.css
diff --git a/app/resources/qt/css/metro-vibes-dark.css b/app/resources/qt/css/metro-vibes-dark.css
diff --git a/app/resources/qt/css/metro-vibes.css b/app/resources/qt/css/metro-vibes.css
diff --git a/app/resources/qt/css/modern.css b/app/resources/qt/css/modern.css
diff --git a/app/resources/qt/css/remarkable-dark.css b/app/resources/qt/css/remarkable-dark.css
diff --git a/app/resources/qt/css/screen.css b/app/resources/qt/css/screen.css
diff --git a/app/src/qt/look_n_feel.cpp b/app/src/qt/look_n_feel.cpp
@@ -101,6 +101,8 @@ void LookAndFeels::setDarkTheme()
     mindforgerApplication->setStyleSheet("QToolTip { color: #ffffff; background-color: #008c00; border: 1px solid white; }");
     //palette.setColor(QPalette::ToolTipBase, Qt::blue);
     //palette.setColor(QPalette::ToolTipText, Qt::red);
+
+    Configuration::getInstance().setUiHtmlThemeName(UI_HTML_THEME_BYWORD_DARK);
 }
 
 /*
@@ -148,6 +150,8 @@ void LookAndFeels::setLightTheme()
     mindforgerApplication->setStyleSheet("QToolTip { color: #ffffff; background-color: #ED764D; border: 1px solid white; }");
 
     mindforgerApplication->setPalette(palette);
+
+    Configuration::getInstance().setUiHtmlThemeName(UI_HTML_THEME_HANDWRITING);
 }
 
 void LookAndFeels::setBlackTheme()
@@ -208,6 +212,8 @@ void LookAndFeels::setBlackTheme()
 
     // IMPROVE tooltips are set in two ways
     mindforgerApplication->setStyleSheet("QToolTip { color: #ffffff; background-color: #000000; border: 1px solid white; }");
-}
 
+    Configuration::getInstance().setUiHtmlThemeName(UI_HTML_THEME_BYWORD_DARK);
 }
+
+} // m8r namespace
diff --git a/app/src/qt/mindforger.cpp b/app/src/qt/mindforger.cpp
@@ -181,13 +181,7 @@ int main(int argc, char *argv[])
     }
 
     // setup application
-    QFile iconFile(":/icons/mindforger-icon.png");
-    if(!iconFile.open(QFile::ReadOnly)) {
-        cerr << "Unable to find MindForger icon!" << endl;
-    } else {
-        mindforgerApplication.setWindowIcon(QIcon(":/icons/mindforger-icon.png"));
-    }
-
+    mindforgerApplication.setWindowIcon(QIcon(":/icons/mindforger-icon.png"));
     m8r::l8n(mindforgerApplication);
 
     // choose L&F

diff --git a/lib/src/config/configuration.cpp b/lib/src/config/configuration.cpp
@@ -71,7 +71,7 @@ void Configuration::reset()
     writeMetadata = true;
     saveReadsMetadata = DEFAULT_SAVE_READS_METADATA;
     timeScopeAsString.assign(DEFAULT_TIME_SCOPE);
-    md2HtmlOptions = 0;
+    md2HtmlOptions = 0
     // change default options by enabling flags below
     //        | Configuration::MdToHtmlOption::AutolinkOption
     //        | Configuration::MdToHtmlOption::NoStrikethroughOption
@@ -80,13 +80,17 @@ void Configuration::reset()
     //        | Configuration::MdToHtmlOption::NoSmartypantsOption
     //        | Configuration::MdToHtmlOption::ExtraFootnoteOption
     //        | Configuration::MdToHtmlOption::NoSuperscriptOption;
-    // IMPROVE add math support
+            | Configuration::MdToHtmlOption::MathSupport
+            | Configuration::MdToHtmlOption::MathInlineSupport
+            | Configuration::MdToHtmlOption::CodeHighlighting
+            | Configuration::MdToHtmlOption::DiagramSupport;
 
     // GUI
     uiViewerShowMetadata = true;
     uiEditorEnableSyntaxHighlighting = true;
     uiEditorShowLineNumbers = true;
     uiThemeName.assign(UI_DEFAULT_THEME);
+    uiHtmlThemeName.assign(UI_DEFAULT_HTML_THEME);
     uiFontPointSize = UI_DEFAULT_FONT_POINT_SIZE;
     uiShowNotebookEditButton = DEFAULT_SHOW_NOTEBOOK_EDIT_BUTTON;
 }