Add a working toolbar to the editor (#22)

* Use Google material design icons instead * Add a bunch of text formatting icons * Add a toolbar to the document editor * Replace full SVG data with only path data * Add signals and slots for the editor toolbar * Update the copyright year to 2022 * Connect the formatting buttons to the editor
vkbo · Jan 23, 2022 · 12a7b56 · 12a7b56
1 parent e3b5977
commit 12a7b56
Show file tree

Hide file tree

Showing 40 changed files with 626 additions and 140 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,6 +87,8 @@ list(APPEND SRC_FILES
     src/core/storage
     src/core/svgiconengine
     src/editor/doceditor
+    src/editor/edittoolbar
+    src/editor/textedit
     src/gui/maintoolbar
     src/gui/statusbar
     src/gui/storytree

diff --git a/i18n/collett_en_US.ts b/i18n/collett_en_US.ts
@@ -1,6 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
+<context>
+    <name>Collett::GuiEditToolBar</name>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="41"/>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="42"/>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="43"/>
+        <source>Underline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="44"/>
+        <source>Strikethrough</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="53"/>
+        <source>Align Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="54"/>
+        <source>Align Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="55"/>
+        <source>Align Centre</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="56"/>
+        <source>Align Justify</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="65"/>
+        <source>Indent Paragraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="66"/>
+        <source>Outdent Paragraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Collett::GuiMain</name>
     <message>
@@ -133,7 +186,7 @@
 <context>
     <name>Collett::Project</name>
     <message>
-        <location filename="../src/project/project.cpp" line="155"/>
+        <location filename="../src/project/project.cpp" line="156"/>
         <source>Unnamed Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -170,40 +223,40 @@
 <context>
     <name>Collett::StoryItem</name>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="136"/>
+        <location filename="../src/project/storyitem.cpp" line="137"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="314"/>
+        <location filename="../src/project/storyitem.cpp" line="315"/>
         <source>Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="315"/>
+        <location filename="../src/project/storyitem.cpp" line="316"/>
         <source>Partition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="316"/>
+        <location filename="../src/project/storyitem.cpp" line="317"/>
         <source>Chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="317"/>
+        <location filename="../src/project/storyitem.cpp" line="318"/>
         <source>Scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="318"/>
+        <location filename="../src/project/storyitem.cpp" line="319"/>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Collett::StoryModel</name>
     <message>
-        <location filename="../src/project/storymodel.cpp" line="154"/>
+        <location filename="../src/project/storymodel.cpp" line="155"/>
         <source>New %1</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/i18n/collett_nb_NO.ts b/i18n/collett_nb_NO.ts
@@ -1,6 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="nb_NO">
+<context>
+    <name>Collett::GuiEditToolBar</name>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="41"/>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="42"/>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="43"/>
+        <source>Underline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="44"/>
+        <source>Strikethrough</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="53"/>
+        <source>Align Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="54"/>
+        <source>Align Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="55"/>
+        <source>Align Centre</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="56"/>
+        <source>Align Justify</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="65"/>
+        <source>Indent Paragraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/editor/edittoolbar.cpp" line="66"/>
+        <source>Outdent Paragraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Collett::GuiMain</name>
     <message>
@@ -133,7 +186,7 @@
 <context>
     <name>Collett::Project</name>
     <message>
-        <location filename="../src/project/project.cpp" line="155"/>
+        <location filename="../src/project/project.cpp" line="156"/>
         <source>Unnamed Project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -170,40 +223,40 @@
 <context>
     <name>Collett::StoryItem</name>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="136"/>
+        <location filename="../src/project/storyitem.cpp" line="137"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="314"/>
+        <location filename="../src/project/storyitem.cpp" line="315"/>
         <source>Book</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="315"/>
+        <location filename="../src/project/storyitem.cpp" line="316"/>
         <source>Partition</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="316"/>
+        <location filename="../src/project/storyitem.cpp" line="317"/>
         <source>Chapter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="317"/>
+        <location filename="../src/project/storyitem.cpp" line="318"/>
         <source>Scene</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/project/storyitem.cpp" line="318"/>
+        <location filename="../src/project/storyitem.cpp" line="319"/>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Collett::StoryModel</name>
     <message>
-        <location filename="../src/project/storymodel.cpp" line="154"/>
+        <location filename="../src/project/storymodel.cpp" line="155"/>
         <source>New %1</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/sample/project/project.json b/sample/project/project.json
@@ -1,7 +1,7 @@
 {
     "c:meta": {
         "m:created": "2021-12-14T22:24:25",
-        "m:updated": "2022-01-23T17:54:31"
+        "m:updated": "2022-01-23T18:46:08"
     },
     "c:project": {
         "u:project-name": "Sample Project"

diff --git a/src/collett.h b/src/collett.h
@@ -3,7 +3,7 @@
 ** =============================
 **
 ** This file is a part of Collett
-** Copyright 2020–2021, Veronica Berglyd Olsen
+** Copyright 2020–2022, Veronica Berglyd Olsen
 **
 ** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -26,4 +26,21 @@
 #define COL_VERSION_NUM  0x000001a0
 #define COL_VERSION_DATE "2021-11-14"
 
+namespace Collett {
+
+enum DocAction {
+    FormatBold,
+    FormatItalic,
+    FormatUnderline,
+    FormatStrikethrough,
+    TextAlignLeft,
+    TextAlignCentre,
+    TextAlignRight,
+    TextAlignJustify,
+    TextIndent,
+    TextOutdent,
+};
+
+} // namespace Collett
+
 #endif // COLLETT_H
diff --git a/src/core/data.cpp b/src/core/data.cpp
@@ -3,7 +3,7 @@
 ** =========================
 **
 ** This file is a part of Collett
-** Copyright 2020–2021, Veronica Berglyd Olsen
+** Copyright 2020–2022, Veronica Berglyd Olsen
 **
 ** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by

diff --git a/src/core/data.h b/src/core/data.h
@@ -3,7 +3,7 @@
 ** =========================
 **
 ** This file is a part of Collett
-** Copyright 2020–2021, Veronica Berglyd Olsen
+** Copyright 2020–2022, Veronica Berglyd Olsen
 **
 ** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by