Merge pull request #127 from friction2d/dev

0.9.6 beta(-ish)
friction2d · Mar 16, 2024 · bbdfeb6 · bbdfeb6
2 parents 40c10a3 + cd602ba
commit bbdfeb6
Show file tree

Hide file tree

Showing 859 changed files with 1,331 additions and 4,755 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,6 +57,7 @@ if(UNIX)
     add_subdirectory(src/gperftools)
 endif()
 add_subdirectory(src/core)
+add_subdirectory(src/ui)
 add_subdirectory(src/app)
 
 add_dependencies(frictioncore Engine)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -40,11 +40,6 @@ if(${WIN_DEPLOY})
     add_definitions(-DWIN_DEPLOY)
 endif()
 
-option(USE_ROBOTO "Use Roboto font" OFF)
-if(${USE_ROBOTO})
-    add_definitions(-DFRICTION_BUNDLE_ROBOTO)
-endif()
-
 option(USE_SKIA_SYSTEM_LIBS "Use skia (third-party) system libraries on Linux" ON)
 if(${USE_SKIA_SYSTEM_LIBS} AND UNIX)
     pkg_check_modules(EXPAT REQUIRED expat)
@@ -111,15 +106,12 @@ if(WIN32)
     )
 endif()
 
-if(UNIX AND NOT APPLE)
-    pkg_check_modules(UNWIND REQUIRED libunwind)
-endif()
-
 include_directories(
     #${QUAZIP_INCLUDE_DIRS}
     ${QSCINTILLA_INCLUDE_DIRS}
     ${FFMPEG_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/../core
+    ${CMAKE_CURRENT_SOURCE_DIR}/../ui
     ${CMAKE_CURRENT_SOURCE_DIR}/../engine/skia
 )
 
@@ -136,8 +128,8 @@ if(${USE_SKIA_SYSTEM_LIBS} AND UNIX)
     )
 endif()
 
-if(UNIX)
-    include_directories(${CMAKE_CURRENT_BINARY_DIR}/../gperftools)
+if(UNIX AND NOT APPLE)
+    include_directories(${GPERF_INCLUDE_DIRS})
     configure_file(
         app.desktop.in
         ${CMAKE_BINARY_DIR}/${PROJECT_FREEDESKTOP}.desktop
@@ -158,18 +150,13 @@ endif()
 set(
     SOURCES
     main.cpp
-    GUI/BoxesList/OptimalScrollArea/scrollvisiblepartbase.cpp
     GUI/BoxesList/boxscroller.cpp
     #GUI/BrushWidgets/bookmarkedbrushes.cpp
     #GUI/BrushWidgets/brushlabel.cpp
     GUI/ColorWidgets/bookmarkedcolors.cpp
     GUI/ColorWidgets/paintcolorwidget.cpp
-    GUI/Dialogs/animationtopaintdialog.cpp
-    GUI/Dialogs/applyexpressiondialog.cpp
+    #GUI/Dialogs/animationtopaintdialog.cpp
     GUI/Dialogs/dialogsinterfaceimpl.cpp
-    GUI/Dialogs/durationrectsettingsdialog.cpp
-    GUI/Dialogs/exportsvgdialog.cpp
-    GUI/Dialogs/scenesettingsdialog.cpp
     GUI/Expressions/expressiondialog.cpp
     GUI/Expressions/expressioneditor.cpp
     GUI/Expressions/expressionhighlighter.cpp
@@ -185,31 +172,18 @@ set(
     GUI/Settings/pluginssettingswidget.cpp
     GUI/Settings/presetsettingswidget.cpp
     GUI/aboutwidget.cpp
-    GUI/alignwidget.cpp
-    GUI/audiohandler.cpp
-    GUI/assetswidget.cpp
-    GUI/bookmarkedwidget.cpp
-    GUI/buttonbase.cpp
-    GUI/buttonslist.cpp
     GUI/canvasbasewrappernode.cpp
     GUI/canvaswindowevents.cpp
     GUI/canvaswrappernode.cpp
-    GUI/changewidthwidget.cpp
     #GUI/closesignalingdockwidget.cpp
-    GUI/ecombobox.cpp
-    GUI/editablecombobox.cpp
     GUI/ekeyfilter.cpp
     GUI/ewidgetsimpl.cpp
-    GUI/fakemenubar.cpp
     GUI/layouthandler.cpp
-    GUI/scenechooser.cpp
     GUI/timelinebasewrappernode.cpp
     GUI/timelinedockwidget.cpp
     GUI/timelinehighlightwidget.cpp
     GUI/timelinewidget.cpp
     GUI/timelinewrappernode.cpp
-    GUI/triggerlabel.cpp
-    GUI/twocolumnlayout.cpp
     GUI/welcomedialog.cpp
     GUI/widgetstack.cpp
     GUI/ColorWidgets/colorlabel.cpp
@@ -229,32 +203,22 @@ set(
     eimporters.cpp
     evfileio.cpp
     iconloader.cpp
-    outputsettings.cpp
     renderhandler.cpp
-    rendersettings.cpp
-    GUI/BoxesList/OptimalScrollArea/scrollarea.cpp
-    GUI/BoxesList/OptimalScrollArea/scrollwidget.cpp
-    GUI/BoxesList/OptimalScrollArea/scrollwidgetvisiblepart.cpp
-    GUI/BoxesList/OptimalScrollArea/singlewidget.cpp
     GUI/BoxesList/boxsinglewidget.cpp
     GUI/BoxesList/boxscrollwidget.cpp
     GUI/BoxesList/boolpropertywidget.cpp
     memorychecker.cpp
     memoryhandler.cpp
     GUI/RenderWidgets/renderwidget.cpp
     GUI/RenderWidgets/renderinstancewidget.cpp
-    renderinstancesettings.cpp
     GUI/GradientWidgets/gradientslistwidget.cpp
     GUI/GradientWidgets/displayedgradientswidget.cpp
     GUI/GradientWidgets/currentgradientwidget.cpp
     GUI/RenderWidgets/closablecontainer.cpp
     GUI/BoxesList/boxtargetwidget.cpp
-    GUI/BoxesList/OptimalScrollArea/minimalscrollwidget.cpp
     GUI/BoxesList/boxscrollarea.cpp
-    videoencoder.cpp
     GUI/RenderWidgets/outputsettingsprofilesdialog.cpp
     GUI/RenderWidgets/outputsettingsdisplaywidget.cpp
-    GUI/actionbutton.cpp
     GUI/animationdockwidget.cpp
     GUI/animationwidgetscrollbar.cpp
     GUI/canvaswindow.cpp
@@ -269,32 +233,22 @@ set(
     GUI/qrealanimatorvalueslider.cpp
     GUI/glwindow.cpp
     GUI/fontswidget.cpp
-    #GUI/filesourcelist.cpp
-    GUI/customfpsdialog.cpp
     GUI/fillstrokesettings.cpp
     #GUI/BrushWidgets/brushselectionwidget.cpp
-    GUI/flowlayout.cpp
     GUI/ColorWidgets/colorwidgetshaders.cpp
-    GUI/namedcontainer.cpp
     #GUI/BrushWidgets/brushwidget.cpp
-    GUI/Settings/labeledslider.cpp
-    GUI/uilayout.cpp
+    GUI/toolbox.cpp
 )
 
 set(
     HEADERS
-    GUI/BoxesList/OptimalScrollArea/scrollvisiblepartbase.h
     GUI/BoxesList/boxscroller.h
     #GUI/BrushWidgets/bookmarkedbrushes.h
     #GUI/BrushWidgets/brushlabel.h
     GUI/ColorWidgets/bookmarkedcolors.h
     GUI/ColorWidgets/paintcolorwidget.h
-    GUI/Dialogs/animationtopaintdialog.h
-    GUI/Dialogs/applyexpressiondialog.h
+    #GUI/Dialogs/animationtopaintdialog.h
     GUI/Dialogs/dialogsinterfaceimpl.h
-    GUI/Dialogs/durationrectsettingsdialog.h
-    GUI/Dialogs/exportsvgdialog.h
-    GUI/Dialogs/scenesettingsdialog.h
     GUI/Expressions/expressiondialog.h
     GUI/Expressions/expressioneditor.h
     GUI/Expressions/expressionhighlighter.h
@@ -310,31 +264,17 @@ set(
     GUI/Settings/pluginssettingswidget.h
     GUI/Settings/presetsettingswidget.h
     GUI/aboutwidget.h
-    GUI/alignwidget.h
-    GUI/audiohandler.h
-    GUI/assetswidget.h
-    GUI/bookmarkedwidget.h
-    GUI/buttonbase.h
-    GUI/buttonslist.h
     GUI/canvasbasewrappernode.h
     GUI/canvaswrappernode.h
-    GUI/changewidthwidget.h
     #GUI/closesignalingdockwidget.h
-    GUI/ecombobox.h
-    GUI/editablecombobox.h
     GUI/ekeyfilter.h
     GUI/ewidgetsimpl.h
-    GUI/fakemenubar.h
     GUI/layouthandler.h
-    GUI/scenechooser.h
     GUI/timelinebasewrappernode.h
     GUI/timelinedockwidget.h
     GUI/timelinehighlightwidget.h
     GUI/timelinewidget.h
     GUI/timelinewrappernode.h
-    GUI/toolbutton.h
-    GUI/triggerlabel.h
-    GUI/twocolumnlayout.h
     GUI/welcomedialog.h
     GUI/widgetstack.h
     GUI/ColorWidgets/colorlabel.h
@@ -352,38 +292,25 @@ set(
     effectsloader.h
     eimporters.h
     iconloader.h
-    outputsettings.h
     renderhandler.h
-    rendersettings.h
-    keypoint.h
-    GUI/BoxesList/OptimalScrollArea/scrollarea.h
-    GUI/BoxesList/OptimalScrollArea/scrollwidget.h
-    GUI/BoxesList/OptimalScrollArea/scrollwidgetvisiblepart.h
-    GUI/BoxesList/OptimalScrollArea/singlewidget.h
     GUI/BoxesList/boxsinglewidget.h
     GUI/BoxesList/boxscrollwidget.h
     GUI/BoxesList/boolpropertywidget.h
     memorychecker.h
     memoryhandler.h
     GUI/RenderWidgets/renderwidget.h
     GUI/RenderWidgets/renderinstancewidget.h
-    renderinstancesettings.h
     GUI/GradientWidgets/gradientslistwidget.h
     GUI/GradientWidgets/displayedgradientswidget.h
     GUI/GradientWidgets/currentgradientwidget.h
     GUI/RenderWidgets/closablecontainer.h
     GUI/BoxesList/boxtargetwidget.h
-    GUI/BoxesList/OptimalScrollArea/minimalscrollwidget.h
     GUI/BoxesList/boxscrollarea.h
-    videoencoder.h
     GUI/RenderWidgets/outputsettingsprofilesdialog.h
     GUI/RenderWidgets/outputsettingsdisplaywidget.h
-    GUI/actionbutton.h
     GUI/animationdockwidget.h
     GUI/animationwidgetscrollbar.h
     GUI/canvaswindow.h
-    GUI/customfpsdialog.h
-    #GUI/filesourcelist.h
     GUI/fillstrokesettings.h
     GUI/fontswidget.h
     GUI/keyfocustarget.h
@@ -397,14 +324,8 @@ set(
     GUI/qrealpointvaluedialog.h
     GUI/renderoutputwidget.h
     #GUI/BrushWidgets/brushselectionwidget.h
-    GUI/flowlayout.h
     GUI/ColorWidgets/colorwidgetshaders.h
-    GUI/namedcontainer.h
     #GUI/BrushWidgets/brushwidget.h
-    boxtypemenu.h
-    GUI/Settings/labeledslider.h
-    GUI/uilayout.h
-    GUI/vlabel.h
 )
 
 set(
@@ -423,10 +344,6 @@ else()
     list(APPEND RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../docs/docs.qrc)
 endif()
 
-if(${USE_ROBOTO})
-    list(APPEND RESOURCES fonts.qrc)
-endif()
-
 add_executable(
     ${PROJECT_NAME}
     ${ICON_FILE}
@@ -472,6 +389,7 @@ target_link_libraries(
     ${PROJECT_NAME}
     PRIVATE
     ${PROJECT_NAME}core
+    ${PROJECT_NAME}ui
     ${QT_LIBRARIES}
     #${QUAZIP_LIBRARIES}
     ${QSCINTILLA_LIBRARIES}
@@ -507,22 +425,12 @@ if(APPLE)
     )
 endif()
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
     target_link_libraries(
         ${PROJECT_NAME}
         PRIVATE
-        tcmalloc_static
+        ${GPERF_LIBRARIES}
     )
-    if(NOT APPLE)
-        target_link_libraries(
-            ${PROJECT_NAME}
-            PRIVATE
-            ${UNWIND_LIBRARIES}
-        )
-    endif()
-endif()
-
-if(UNIX AND NOT APPLE)
     include(GNUInstallDirs)
     install(
         TARGETS

diff --git a/src/app/GUI/BoxesList/boolpropertywidget.cpp b/src/app/GUI/BoxesList/boolpropertywidget.cpp
diff --git a/src/app/GUI/BoxesList/boolpropertywidget.h b/src/app/GUI/BoxesList/boolpropertywidget.h
diff --git a/src/app/GUI/BoxesList/boxscrollarea.cpp b/src/app/GUI/BoxesList/boxscrollarea.cpp
diff --git a/src/app/GUI/BoxesList/boxscrollarea.h b/src/app/GUI/BoxesList/boxscrollarea.h
@@ -25,7 +25,7 @@
 
 #ifndef BOXSCROLLAREA_H
 #define BOXSCROLLAREA_H
-#include "OptimalScrollArea/scrollarea.h"
+#include "optimalscrollarena/scrollarea.h"
 
 class BoxScrollArea : public ScrollArea {
 public:

diff --git a/src/app/GUI/BoxesList/boxscroller.cpp b/src/app/GUI/BoxesList/boxscroller.cpp
diff --git a/src/app/GUI/BoxesList/boxscroller.h b/src/app/GUI/BoxesList/boxscroller.h
@@ -27,7 +27,7 @@
 #define BOXSCROLLWIDGETVISIBLEPART_H
 
 #include <QWidget>
-#include "OptimalScrollArea/scrollwidgetvisiblepart.h"
+#include "optimalscrollarena/scrollwidgetvisiblepart.h"
 #include "singlewidgettarget.h"
 #include "framerange.h"
 

diff --git a/src/app/GUI/BoxesList/boxscrollwidget.cpp b/src/app/GUI/BoxesList/boxscrollwidget.cpp
@@ -24,7 +24,7 @@
 // Fork of enve - Copyright (C) 2016-2020 Maurycy Liebner
 
 #include "boxscrollwidget.h"
-#include "GUI/BoxesList/OptimalScrollArea/scrollarea.h"
+#include "optimalscrollarena/scrollarea.h"
 #include "Boxes/boundingbox.h"
 #include "boxscroller.h"
 #include "GUI/canvaswindow.h"

diff --git a/src/app/GUI/BoxesList/boxscrollwidget.h b/src/app/GUI/BoxesList/boxscrollwidget.h
@@ -26,7 +26,7 @@
 #ifndef BOXSCROLLWIDGET_H
 #define BOXSCROLLWIDGET_H
 
-#include "OptimalScrollArea/scrollwidget.h"
+#include "optimalscrollarena/scrollwidget.h"
 #include "GUI/keyfocustarget.h"
 class BoxScroller;
 class ScrollArea;

diff --git a/src/app/GUI/BoxesList/boxsinglewidget.cpp b/src/app/GUI/BoxesList/boxsinglewidget.cpp
@@ -26,7 +26,7 @@
 #include "boxsinglewidget.h"
 #include "swt_abstraction.h"
 #include "singlewidgettarget.h"
-#include "OptimalScrollArea/scrollwidgetvisiblepart.h"
+#include "optimalscrollarena/scrollwidgetvisiblepart.h"
 #include "GUI/ColorWidgets/colorsettingswidget.h"
 
 #include "Boxes/containerbox.h"
@@ -84,7 +84,7 @@ bool BoxSingleWidget::sStaticPixmapsLoaded = false;
 #include "PathEffects/patheffectcollection.h"
 #include "Sound/esoundobjectbase.h"
 
-#include "GUI/ecombobox.h"
+#include "widgets/ecombobox.h"
 
 #include <QApplication>
 #include <QDrag>

diff --git a/src/app/GUI/BoxesList/boxsinglewidget.h b/src/app/GUI/BoxesList/boxsinglewidget.h
@@ -26,7 +26,7 @@
 #ifndef BOXSINGLEWIDGET_H
 #define BOXSINGLEWIDGET_H
 
-#include "OptimalScrollArea/singlewidget.h"
+#include "optimalscrollarena/singlewidget.h"
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QPushButton>

diff --git a/src/app/GUI/BoxesList/boxtargetwidget.cpp b/src/app/GUI/BoxesList/boxtargetwidget.cpp
diff --git a/src/app/GUI/BoxesList/boxtargetwidget.h b/src/app/GUI/BoxesList/boxtargetwidget.h
diff --git a/src/app/GUI/ColorWidgets/bookmarkedcolors.cpp b/src/app/GUI/ColorWidgets/bookmarkedcolors.cpp
@@ -1,3 +1,28 @@
+/*
+#
+# Friction - https://friction.graphics
+#
+# Copyright (c) Friction contributors
+#
+# 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/>.
+#
+# See 'README.md' for more information.
+#
+*/
+
+// Fork of enve - Copyright (C) 2016-2020 Maurycy Liebner
+
 #include "bookmarkedcolors.h"
 #include "savedcolorbutton.h"
 #include "Private/document.h"