Merge pull request #72 from Prayag2/dev/svg

Fixes conflicts from #70

Author: Prayag2

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+
+[*.nix]
+indent_style = space
+indent_size = 2
+
+[*.cpp,*.hpp,*.h]
+indent_style = space
+indent_size = 4

CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
@@ -27,7 +27,7 @@ set(SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 # Use globbing to recursively collect all source, header, and resource files from src/.
 file(GLOB_RECURSE SRC_FILES
     "${SRC_DIR}/*.cpp"
-    "${SRC_DIR}/*.h"
+    "${SRC_DIR}/*.hpp"
     "${SRC_DIR}/*.qrc"
     "${SRC_DIR}/*.qss"
 )
@@ -39,6 +39,9 @@ qt_add_executable(${PROJECT_NAME}
     MANUAL_FINALIZATION
     ${PROJECT_SOURCES}
 )
+
+add_subdirectory(deps)
+
 qt_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 
 target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::OpenGLWidgets)
@@ -71,5 +74,3 @@ if (UNIX AND NOT APPLE)
   install(FILES assets/logo.svg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps RENAME io.github.prayag2.Drawy.svg)
   install(FILES deploy/linux/io.github.prayag2.Drawy.metainfo.xml.in DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo/ RENAME io.github.prayag2.Drawy.metainfo.xml)
 endif()
-
-qt_finalize_executable(${PROJECT_NAME})

deps/CMakeLists.txt

@@ -0,0 +1,12 @@
+include(FetchContent)
+
+FetchContent_Declare(
+  kanzi
+  URL https://github.com/flanglet/kanzi-cpp/archive/refs/tags/2.4.0.zip
+  URL_MD5 ec451cdab40362e9e4af8e5ca780a07d
+)
+
+add_subdirectory(kanzi)
+
+# find_package(tinyxml2 REQUIRED)
+# target_link_libraries(${PROJECT_NAME} PRIVATE tinyxml2::tinyxml2)

deps/kanzi/CMakeLists.txt

@@ -0,0 +1,11 @@
+message(STATUS "Fetching kanzi...")
+
+FetchContent_GetProperties(kanzi)
+FetchContent_MakeAvailable(kanzi)
+
+message(STATUS "kanzi_SOURCE_DIR=${kanzi_SOURCE_DIR}")
+
+add_subdirectory(${kanzi_SOURCE_DIR}/src ${kanzi_BINARY_DIR})
+
+target_link_libraries(drawy PRIVATE libkanzi)
+target_include_directories(drawy PRIVATE ${kanzi_SOURCE_DIR}/src)

flake.nix

@@ -57,9 +57,13 @@
             src = ./.;
             hooks = {
               nixfmt-rfc-style.enable = true;
-              mirrors-clang-format = {
-                entry = "${pkgs.clang-tools}/bin/clang-format";
+              clang-format = {
                 enable = true;
+                package = pkgs.clang-tools;
+                types_or = pkgs.lib.mkForce [
+                  "c"
+                  "c++"
+                ];
               };
             };
           };

src/canvas/canvas.cpp

@@ -1,22 +1,22 @@
 /*
-* Drawy - A simple brainstorming tool with an infinite canvas
-* Copyright (C) 2025 - Prayag Jain <[email protected]>
-*
-* 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
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "canvas.h"
+ * Drawy - A simple brainstorming tool with an infinite canvas
+ * Copyright (C) 2025 - Prayag Jain <[email protected]>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "canvas.hpp"
 
 #include <QBuffer>
 #include <QResizeEvent>

src/canvas/canvas.h src/canvas/canvas.hppsrc/canvas/canvas.h renamed to src/canvas/canvas.hpp

@@ -1,23 +1,22 @@
 /*
-* Drawy - A simple brainstorming tool with an infinite canvas
-* Copyright (C) 2025 - Prayag Jain <[email protected]>
-*
-* 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
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
+ * Drawy - A simple brainstorming tool with an infinite canvas
+ * Copyright (C) 2025 - Prayag Jain <[email protected]>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#ifndef CANVAS_H
-#define CANVAS_H
+#pragma once
 
 #include <QPainter>
 #include <QWidget>
@@ -88,5 +87,3 @@ public slots:
     static void setImageData(QPixmap *const img, const QByteArray &arr);
     void resize();
 };
-
-#endif  // CANVAS_H

src/command/command.h

@@ -0,0 +1,27 @@
+/*
+ * Drawy - A simple brainstorming tool with an infinite canvas
+ * Copyright (C) 2025 - Prayag Jain <[email protected]>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+class ApplicationContext;
+
+class Command {
+public:
+    virtual void execute(ApplicationContext *context) = 0;
+    virtual void undo(ApplicationContext *context) = 0;
+};

src/command/command.hpp

@@ -1,22 +1,22 @@
 /*
-* Drawy - A simple brainstorming tool with an infinite canvas
-* Copyright (C) 2025 - Prayag Jain <[email protected]>
-*
-* 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
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "commandhistory.h"
+ * Drawy - A simple brainstorming tool with an infinite canvas
+ * Copyright (C) 2025 - Prayag Jain <[email protected]>
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "commandhistory.hpp"
 
 #include <QDebug>