Move misc to ui

src/app/CMakeLists.txt

@@ -186,16 +186,12 @@ set(
     GUI/Settings/pluginssettingswidget.cpp
     GUI/Settings/presetsettingswidget.cpp
     GUI/aboutwidget.cpp
-    GUI/bookmarkedwidget.cpp
-    GUI/buttonslist.cpp
     GUI/canvasbasewrappernode.cpp
     GUI/canvaswindowevents.cpp
     GUI/canvaswrappernode.cpp
-    GUI/changewidthwidget.cpp
     #GUI/closesignalingdockwidget.cpp
     GUI/ekeyfilter.cpp
     GUI/ewidgetsimpl.cpp
-    GUI/fakemenubar.cpp
     GUI/layouthandler.cpp
     GUI/scenechooser.cpp
     GUI/timelinebasewrappernode.cpp
@@ -295,15 +291,11 @@ set(
     GUI/Settings/pluginssettingswidget.h
     GUI/Settings/presetsettingswidget.h
     GUI/aboutwidget.h
-    GUI/bookmarkedwidget.h
-    GUI/buttonslist.h
     GUI/canvasbasewrappernode.h
     GUI/canvaswrappernode.h
-    GUI/changewidthwidget.h
     #GUI/closesignalingdockwidget.h
     GUI/ekeyfilter.h
     GUI/ewidgetsimpl.h
-    GUI/fakemenubar.h
     GUI/layouthandler.h
     GUI/scenechooser.h
     GUI/timelinebasewrappernode.h

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"

src/app/GUI/ColorWidgets/bookmarkedcolors.h

@@ -1,8 +1,35 @@
+/*
+#
+# 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
+
 #ifndef BOOKMARKEDCOLORS_H
 #define BOOKMARKEDCOLORS_H
-#include "../bookmarkedwidget.h"
 
-class BookmarkedColors : public BookmarkedWidget {
+#include "widgets/bookmarkedwidget.h"
+
+class BookmarkedColors : public BookmarkedWidget
+{
     Q_OBJECT
 public:
     BookmarkedColors(const bool vertical,

src/app/GUI/Dialogs/dialogsinterfaceimpl.cpp

@@ -31,7 +31,7 @@
 #include <QLabel>
 #include <QStatusBar>
 
-#include "../buttonslist.h"
+#include "widgets/buttonslist.h"
 #include "GUI/global.h"
 #include "GUI/mainwindow.h"
 #include "GUI/Expressions/expressiondialog.h"

src/app/GUI/timelinewidget.cpp

@@ -41,7 +41,7 @@
 #include "GUI/global.h"
 #include "canvas.h"
 #include "scenechooser.h"
-#include "changewidthwidget.h"
+#include "widgets/changewidthwidget.h"
 #include "timelinehighlightwidget.h"
 
 TimelineWidget::TimelineWidget(Document &document,

src/app/GUI/timelinewidget.h

@@ -35,7 +35,7 @@
 #include "smartPointers/stdselfref.h"
 #include "framerange.h"
 #include "ReadWrite/basicreadwrite.h"
-#include "fakemenubar.h"
+#include "widgets/fakemenubar.h"
 #include "XML/runtimewriteid.h"
 
 class SWT_Abstraction;

src/app/GUI/widgetwrappernode.h

@@ -29,7 +29,7 @@
 #include <QMenuBar>
 #include "Private/esettings.h"
 #include "wrappernode.h"
-#include "fakemenubar.h"
+#include "widgets/fakemenubar.h"
 
 class StackWrapperMenu : public FakeMenuBar {
     friend class StackWidgetWrapper;

src/ui/CMakeLists.txt

@@ -39,10 +39,14 @@ set(
     widgets/actionbutton.cpp
     widgets/alignwidget.cpp
     widgets/assetswidget.cpp
+    widgets/bookmarkedwidget.cpp
+    widgets/buttonbase.cpp
+    widgets/buttonslist.cpp
+    widgets/changewidthwidget.cpp
     widgets/ecombobox.cpp
     widgets/editablecombobox.cpp
+    widgets/fakemenubar.cpp
     widgets/flowlayout.cpp
-    widgets/buttonbase.cpp
     widgets/twocolumnlayout.cpp
     widgets/uilayout.cpp
 )
@@ -53,9 +57,13 @@ set(
     widgets/actionbutton.h
     widgets/alignwidget.h
     widgets/assetswidget.h
+    widgets/bookmarkedwidget.h
     widgets/buttonbase.h
+    widgets/buttonslist.h
+    widgets/changewidthwidget.h
     widgets/ecombobox.h
     widgets/editablecombobox.h
+    widgets/fakemenubar.h
     widgets/flowlayout.h
     widgets/toolbutton.h
     widgets/twocolumnlayout.h

src/app/GUI/bookmarkedwidget.cpp → src/ui/widgets/bookmarkedwidget.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 "bookmarkedwidget.h"
 #include "Private/esettings.h"
 #include "GUI/global.h"

src/ui/widgets/bookmarkedwidget.h

@@ -0,0 +1,63 @@
+/*
+#
+# 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
+
+#ifndef BOOKMARKEDWIDGET_H
+#define BOOKMARKEDWIDGET_H
+
+#include "ui_global.h"
+
+#include <QWidget>
+#include <QPushButton>
+
+class UI_EXPORT BookmarkedWidget : public QWidget
+{
+public:
+    explicit BookmarkedWidget(const bool vertical,
+                              const int dimension,
+                              QWidget *parent = nullptr);
+
+    void addWidget(QWidget* const wid);
+    void removeWidget(QWidget* const wid);
+    QWidget* getWidget(const int id) const;
+    int count() const
+    { return mWidgets.count(); }
+    void updateSize();
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+
+private:
+    void updateLayout();
+
+    const bool mVertical;
+    const int mDimension;
+    QPushButton* mUpArrow;
+    QPushButton* mDownArrow;
+    QList<QWidget*> mWidgets;
+    int mFirstViewed = 0;
+    int mLastViewed = 0;
+};
+
+#endif // BOOKMARKEDWIDGET_H

src/app/GUI/buttonslist.h → src/ui/widgets/buttonslist.h

@@ -22,10 +22,13 @@
 #ifndef BUTTONSLIST_H
 #define BUTTONSLIST_H
 
+#include "ui_global.h"
+
 #include <QWidget>
 #include <functional>
 
-class ButtonsList : public QWidget {
+class UI_EXPORT ButtonsList : public QWidget
+{
 public:
     using Trigger = std::function<void()>;
     using TextTrigger = std::pair<QString, Trigger>;

src/app/GUI/changewidthwidget.h → src/ui/widgets/changewidthwidget.h

@@ -25,10 +25,15 @@
 
 #ifndef CHANGEWIDTHWIDGET_H
 #define CHANGEWIDTHWIDGET_H
+
+#include "ui_global.h"
+
 #include <QWidget>
 
-class ChangeWidthWidget : public QWidget {
+class UI_EXPORT ChangeWidthWidget : public QWidget
+{
     Q_OBJECT
+
 public:
     ChangeWidthWidget(QWidget *parent = nullptr);
 
@@ -49,6 +54,7 @@ class ChangeWidthWidget : public QWidget {
 
 signals:
     void widthSet(int);
+
 private:
     bool mHover = false;
     bool mPressed = false;

src/app/GUI/fakemenubar.h → src/ui/widgets/fakemenubar.h

@@ -26,10 +26,13 @@
 #ifndef FAKEMENUBAR_H
 #define FAKEMENUBAR_H
 
+#include "ui_global.h"
+
 #include <QHBoxLayout>
 #include <QMenu>
 
-class FakeMenuBar : public QWidget {
+class UI_EXPORT FakeMenuBar : public QWidget
+{
 public:
     explicit FakeMenuBar(QWidget* const parent = nullptr);