Xsheet feature

app/app.pro

@@ -58,7 +58,8 @@ HEADERS += \
     src/importimageseqdialog.h \
     src/spinslider.h \
     src/doubleprogressdialog.h \
-    src/colorslider.h
+    src/colorslider.h \
+    src/xsheet.h
 
 SOURCES += \
     src/main.cpp \
@@ -86,7 +87,8 @@ SOURCES += \
     src/importimageseqdialog.cpp \
     src/spinslider.cpp \
     src/doubleprogressdialog.cpp \
-    src/colorslider.cpp
+    src/colorslider.cpp \
+    src/xsheet.cpp
 
 FORMS += \
     ui/mainwindow2.ui \
@@ -108,7 +110,8 @@ FORMS += \
     ui/timelinepage.ui \
     ui/filespage.ui \
     ui/toolspage.ui \
-    ui/toolboxwidget.ui
+    ui/toolboxwidget.ui \
+    ui/xsheet.ui
 
 
 

app/data/app.qrc

@@ -56,6 +56,9 @@
         <file>icons/new/arrow-horizontal.png</file>
         <file>icons/new/arrow-selectmove.png</file>
         <file>icons/new/arrow-vertical.png</file>
+        <file>icons/papagayo.png</file>
+        <file>icons/papagayoNo.png</file>
+        <file>icons/savecsv.png</file>
     </qresource>
     <qresource prefix="/app">
         <file>icons/onion-blue.png</file>

app/src/actioncommands.cpp

@@ -48,7 +48,6 @@ GNU General Public License for more details.
 #include "aboutdialog.h"
 #include "doubleprogressdialog.h"
 
-
 ActionCommands::ActionCommands(QWidget* parent) : QObject(parent)
 {
     mParent = parent;

app/src/mainwindow2.cpp

@@ -162,6 +162,9 @@ void MainWindow2::createDockWidgets()
     mToolBox = new ToolBoxWidget(this);
     mToolBox->setObjectName("ToolBox");
 
+    mXsheet = new Xsheet(mEditor, this);
+    mXsheet->setObjectName("Xsheet");
+
     /*
     mTimeline2 = new Timeline2;
     mTimeline2->setObjectName( "Timeline2" );
@@ -175,7 +178,8 @@ void MainWindow2::createDockWidgets()
         << mColorPalette
         << mDisplayOptionWidget
         << mToolOptions
-        << mToolBox;
+        << mToolBox
+        << mXsheet;
 
 //    mColorInspector->setFloating(true);
     mStartIcon = QIcon(":icons/controls/play.png");
@@ -196,6 +200,7 @@ void MainWindow2::createDockWidgets()
     addDockWidget(Qt::RightDockWidgetArea, mColorBox);
     addDockWidget(Qt::RightDockWidgetArea, mColorInspector);
     addDockWidget(Qt::RightDockWidgetArea, mColorPalette);
+    addDockWidget(Qt::RightDockWidgetArea, mXsheet);
     addDockWidget(Qt::LeftDockWidgetArea, mToolBox);
     addDockWidget(Qt::LeftDockWidgetArea, mToolOptions);
     addDockWidget(Qt::LeftDockWidgetArea, mDisplayOptionWidget);
@@ -329,6 +334,15 @@ void MainWindow2::createMenus()
     connect(ui->actionEraser, &QAction::triggered, mToolBox, &ToolBoxWidget::eraserOn);
     connect(ui->actionResetToolsDefault, &QAction::triggered, mEditor->tools(), &ToolManager::resetAllTools);
 
+    /// --- Xsheet update ---
+    connect(mEditor, &Editor::updateTimeLine, this, &MainWindow2::updateXsheet);
+    connect(mEditor->layers(), &LayerManager::layerCountChanged, mXsheet, &Xsheet::updateXsheet);
+    connect(mEditor, &Editor::currentFrameChanged, mXsheet, &Xsheet::updateScrub);
+    connect(ui->actionNew, &QAction::triggered, mXsheet, &Xsheet::newOpenScene);
+    connect(ui->actionOpen, &QAction::triggered, mXsheet, &Xsheet::newOpenScene);
+    connect(mEditor->layers(), &LayerManager::animationLengthChanged, mXsheet, &Xsheet::lengthChanged);
+
+
     /// --- Window Menu ---
     QMenu* winMenu = ui->menuWindows;
     winMenu->clear();
@@ -340,7 +354,8 @@ void MainWindow2::createMenus()
         mColorPalette->toggleViewAction(),
         mTimeLine->toggleViewAction(),
         mDisplayOptionWidget->toggleViewAction(),
-        mColorInspector->toggleViewAction()
+        mColorInspector->toggleViewAction(),
+        mXsheet->toggleViewAction()
     };
 
     for (QAction* action : actions)
@@ -400,7 +415,7 @@ void MainWindow2::clearRecentFilesList()
     if (!recentFilesList.isEmpty())
     {
         mRecentFileMenu->clear();
-        QMessageBox::information(this, 0,
+        QMessageBox::information(this, nullptr,
                                  tr("\n\n You have successfully cleared the list"),
                                  QMessageBox::Ok);
     }
@@ -918,6 +933,7 @@ void MainWindow2::lockWidgets(bool shouldLock)
     mToolOptions->setFeatures(feat);
     mToolBox->setFeatures(feat);
     mTimeLine->setFeatures(feat);
+    mXsheet->setFeatures(feat);
 }
 
 void MainWindow2::preferences()
@@ -954,6 +970,11 @@ void MainWindow2::resetAndDockAllSubWidgets()
     }
 }
 
+void MainWindow2::updateXsheet()
+{
+    mXsheet->updateUi(mEditor);
+}
+
 void MainWindow2::readSettings()
 {
     QSettings settings(PENCIL2D, PENCIL2D);
@@ -1084,6 +1105,7 @@ void MainWindow2::setupKeyboardShortcuts()
     mTimeLine->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_TIMELINE));
     mDisplayOptionWidget->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_DISPLAY_OPTIONS));
     mColorInspector->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_COLOR_INSPECTOR));
+    mXsheet->toggleViewAction()->setShortcut(cmdKeySeq(CMD_TOGGLE_XSHEET));
 
     ui->actionHelp->setShortcut(cmdKeySeq(CMD_HELP));
     ui->actionExit->setShortcut(cmdKeySeq(CMD_EXIT));

app/src/mainwindow2.h

@@ -20,6 +20,7 @@ GNU General Public License for more details.
 
 #include <QMainWindow>
 #include "preferencemanager.h"
+#include "xsheet.h"
 
 
 template<typename T> class QList;
@@ -42,6 +43,7 @@ class Timeline2;
 class ActionCommands;
 class ImportImageSeqDialog;
 class BackupElement;
+class Xsheet;
 
 
 
@@ -98,6 +100,7 @@ class MainWindow2 : public QMainWindow
 
 private slots:
     void resetAndDockAllSubWidgets();
+    void updateXsheet();
 
 private:
     bool openObject(QString strFilename, bool checkForChanges);
@@ -141,6 +144,7 @@ private slots:
     //PreviewWidget*      mPreview = nullptr;
     TimeLine*             mTimeLine = nullptr; // be public temporary
     ColorInspector*       mColorInspector = nullptr;
+    Xsheet*               mXsheet = nullptr;
 
     // backup
     BackupElement* mBackupAtSave = nullptr;