Merge pull request #51 from Nighty3098/InDev

Merge

.gitmodules

@@ -1,7 +1,3 @@
 [submodule "src/CodeKeeper/3rdParty/qmarkdowntextedit"]
 	path = src/CodeKeeper/3rdParty/qmarkdowntextedit
 	url = https://github.com/pbek/qmarkdowntextedit
-
-[submodule "src/CodeKeeper/3rdParty/md4c"]
-    path = src/CodeKeeper/3rdParty/md4c
-    url = https://github.com/mity/md4c

.vscode/settings.json

@@ -98,6 +98,14 @@
         "__bit_reference": "cpp",
         "bitset": "cpp",
         "__memory": "cpp",
-        "limits": "cpp"
+        "limits": "cpp",
+        "regex": "cpp",
+        "quat": "cpp",
+        "vec2d": "cpp",
+        "vec2f": "cpp",
+        "vec3d": "cpp",
+        "vec3f": "cpp",
+        "vec4d": "cpp",
+        "vec4f": "cpp"
     },
 }

README.md

@@ -1,6 +1,7 @@
-# Notes manager for developers
+<h1 align="center">CodeKeeper</h1>
+<h3 align="center">Notes and projects manager for developers</h3>
 
-![header](imgs/markdown.jpg)
+<img src="imgs/markdown.png" align="center" />
 
 <div align="center">
 <a href="./LICENSE.md"><img src="https://img.shields.io/github/license/Nighty3098/CodeKeeper?style=for-the-badge&color=85e185&logoColor=85e185&labelColor=0d1117" /></a>
@@ -20,36 +21,42 @@
 <a href="mailto:night3098game@gmail.com" target="blank"><img src="https://img.shields.io/badge/Gmail-D14836?style=for-the-badge&logo=gmail&logoColor=white"/></a>
 </div>
 
-## Tasks:
+<hr>
+
+<h2 align="center">Tasks:</h2>
 
   - [ ] - UI
+    - [X] - Custom window decorations
+    - [X] - Update project editor window
     - [ ] - Context menu for notes
     - [ ] - Context menu for tasks
     - [ ] - Context menu for projects
     - [ ] - Light theme
     - [ ] - Theme swither
-    - [X] - Custom window decorations
-    - [X] - Update project editor window
+    - [X] - Update view mode for markdown
 ******
-  - [ ] - Saving data:
+  - [X] - Saving data:
     - [X] - Saving notes to MD files
     - [X] - Saving a list of tasks in the DB
     - [X] - Saving a projects list  in the DB
 ******
   - [ ] - Crossplatform app:
-    - [X] - Linux
-    - [ ] - Windows
+    - [X] - Linux (AppImage)
+    - [ ] - Windows (exe)
     - [ ] - Mac
  ******
   - [X] - Task movement functionality
   - [X] - Project creation functionality
   - [X] - Note-taking functionality
   - [X] - Task creation functionality
   - [X] - Update markdown render ( migrate to QWebEngineView )
-  - [ ] - Functionality of moving notes
-  - [ ] - Multilang
+  - [X] - Using marked js
   - [X] - Fix visual bugs
   - [X] - Fix notes path bug
+  - [ ] - Markdown to HTML converter
+  - [ ] - Markdown to PDF converter
+  - [ ] - Functionality of moving notes
+  - [ ] - Multilang
   - [ ] - Migrate to CMake
 
 ## Installing:
@@ -61,9 +68,15 @@ qmake CodeKeeper.pro
 make
 ```
 
-## Screenshots:
+<h2 align="center">Screenshots:</h2>
 
-![Main](imgs/1.png)
-![Editor](imgs/2.png)
-![Tasks](imgs/3.png)
-![Projects](imgs/4.png)
+<img src="imgs/1.png" align="center"/>
+<br />
+<br />
+<img src="imgs/2.png" align="center" />
+<br />
+<br />
+<img src="imgs/3.png" align="center" />
+<br />
+<br />
+<img src="imgs/4.png" align="center" />

src/CodeKeeper/CodeKeeper.pro

@@ -8,8 +8,9 @@ INCLUDEPATH += "3rdParty/qmarkdowntextedit"
 LIBS += -L3rdParty/qmarkdowntextedit -L$$OUT_PWD
 win32: LIBS +=  -L$$OUT_PWD/release -L$$OUT_PWD/debug
 
+LIBS += -lmd4c-html
+
 SOURCES += \
-    keeperFunc/md2html.cpp \
     main.cpp \
     mainwindow.cpp \
     settingswindow.cpp \
@@ -20,7 +21,7 @@ SOURCES += \
     keeperFunc/projectsFunc.cpp \
     keeperFunc/notesFunc.cpp \
     sql_db/projectsDB.cpp \
-    sql_db/tasksDB.cpp
+    sql_db/tasksDB.cpp \
 
 HEADERS += \
     mainwindow.h \

src/CodeKeeper/keeperFunc/functional.cpp

@@ -83,7 +83,6 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
     noteName->setStyleSheet("font-size: " + font_size + "pt; color: #8ebecf;");
 
     mdPreview->setFont(*selectedFont);
-    mdPreview->setStyleSheet("font-size: " + font_size + "pt;");
 
     noteEdit->setFont(*selectedFont);
     noteEdit->setStyleSheet("font-size: " + font_size + "pt;");
@@ -95,33 +94,33 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
     taskText->setStyleSheet("font-size: " + font_size + "pt;");
 
     incompleteTasks->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
             "color: #FFFFFF;"
             "}"
             "QListWidget::Item {"
             "margin: 0px;"
-            "background-color: rgb(255, 117, 127); color: #000000; "
+            "background-color: rgb(211, 102, 107); color: #000000; "
             "padding: 2px;"
-            "border-width: 0px; border-color: rgba(255, 117, 127); "
+            "border-width: 0px; border-color: rgba(211, 102, 107); "
             "border-radius: 5px;"
             "font-size: "
             + font_size
             + "pt;"
               "}");
 
     inprocessTasks->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
             "color: #FFFFFF;"
             "}"
             "QListWidget::Item {"
             "margin: 0px;"
-            "background-color: rgb(255, 199, 119); "
+            "background-color: rgb(192, 163, 110); "
             "color: #000000; text-decoration: underline; "
             "border-width: 0px; "
             "padding: 2px;"
@@ -132,15 +131,15 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
               "}");
 
     completeTasks->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
             "color: #FFFFFF;"
             "}"
             "QListWidget::Item {"
             "margin: 0px;"
-            "background-color: rgb(195, 232, 141); "
+            "background-color: rgb(118, 148, 106); "
             "color: #000000;"
             "padding: 2px;"
             "border-radius: 5px;"
@@ -151,7 +150,7 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
               "}");
 
     notStartedProjects->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
@@ -160,7 +159,7 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
             "QListWidget::Item {"
             "margin: 0px;"
             "padding: 2px;"
-            "background-color: rgb(255, 117, 127);"
+            "background-color: rgb(211, 102, 107);"
             "color: #000000; border-width: 0px; "
             "border-radius: 5px;"
             "border-color: #ff757f; "
@@ -170,15 +169,15 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
               "}");
 
     startedProjects->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
             "color: #FFFFFF;"
             "}"
             "QListWidget::Item {"
             "margin: 0px;"
-            "background-color: rgb(255, 199, 119); color: #000000; "
+            "background-color: rgb(192, 163, 110); color: #000000; "
             "border-radius: 5px;"
             "padding: 2px;"
             "border-width: 0px; border-color: #ffc777; "
@@ -188,15 +187,15 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
               "}");
 
     finishlineProjects->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
             "color: #FFFFFF;"
             "}"
             "QListWidget::Item {"
             "margin: 0px;"
-            "background-color: rgb(130, 170, 255 "
+            "background-color: rgb(126, 156, 216 "
             "); color: #000000; border-width: 0px; "
             "border-radius: 5px;"
             "padding: 2px;"
@@ -207,15 +206,15 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
               "}");
 
     finishedProjects->setStyleSheet(
-            "QListWidget {background-color: rgba(255, 117, 127, 0);  border-width: "
+            "QListWidget {background-color: rgba(211, 102, 107, 0);  border-width: "
             "0px; "
             "border-color: #838383;}"
             "QListWidget::item:selected {"
             "color: #FFFFFF;"
             "}"
             "QListWidget::Item {"
             "margin: 0px;"
-            "background-color: rgb(195, 232, 141); color: #000000; "
+            "background-color: rgb(118, 148, 106); color: #000000; "
             "border-radius: 5px;"
             "padding: 2px;"
             "border-width: 0px; border-color: #c3e88d; "
@@ -261,7 +260,7 @@ void MainWindow::setFontPr1(QFont *selectedFont, int *font_size_int)
 
     tasksProgress->setFont(*selectedFont);
     tasksProgress->setStyleSheet(
-            "background-color: rgb(255, 117, 127); selection-background-color: "
-            "rgb(195, 232, 141); color: #222436; font-size: "
+            "background-color: rgb(211, 102, 107); selection-background-color: "
+            "rgb(118, 148, 106); color: #222436; font-size: "
             + font_size + "pt;");
 }