Timeline improvements (#531)

* Fix timeline length display * Fix timeline length behavior * Add timeline sidescroll with shift * Refactor QSettings init * Added timeline middle mouse drag * Update timeline on fps change * Remove some unnecessary debug messages * Fix non-native vertical scrolling behavior for the timeline Don't forget to KISS! * Fix timeline tracks not updating when layer dropped in place * Scrubbing stops playback, other timeline ops function during playback * Timeline start and end buttons use range when applicable * Update loop check state when triggered in PlaybackManager * Fix range option in Animation menu * Change play button/menu item to stop while playing * Highlight range in timeline
pencil2d · Sep 10, 2016 · 5953dec · 5953dec
1 parent 50c5ddb
commit 5953dec
Show file tree

Hide file tree

Showing 33 changed files with 377 additions and 214 deletions.
diff --git a/app/mainwindow2.cpp b/app/mainwindow2.cpp
@@ -169,6 +169,9 @@ void MainWindow2::createDockWidgets()
         << mToolOptions
         << mToolBox;
 
+    mStartIcon = QIcon(":icons/controls/play.png");
+    mStopIcon = QIcon(":icons/controls/stop.png");
+
     /*
     mTimeline2 = new Timeline2;
     mTimeline2->setObjectName( "Timeline2" );
@@ -290,7 +293,11 @@ void MainWindow2::createMenus()
     connect( ui->actionLoop, &QAction::triggered, pPlaybackManager, &PlaybackManager::setLooping );
     connect( ui->actionLoopControl, &QAction::triggered, pPlaybackManager, &PlaybackManager::enableRangedPlayback );
     connect( pPlaybackManager, &PlaybackManager::loopStateChanged, ui->actionLoop, &QAction::setChecked );
+    connect( pPlaybackManager, &PlaybackManager::loopStateChanged, mTimeLine, &TimeLine::setLoop );
     connect( pPlaybackManager, &PlaybackManager::rangedPlaybackStateChanged, ui->actionLoopControl, &QAction::setChecked );
+    connect( pPlaybackManager, &PlaybackManager::rangedPlaybackStateChanged, mTimeLine, &TimeLine::setRangeState );
+    connect( pPlaybackManager, &PlaybackManager::playStateChanged, mTimeLine, &TimeLine::setPlaying );
+    connect( pPlaybackManager, &PlaybackManager::playStateChanged, this, &MainWindow2::changePlayState );
 
     connect(ui->actionAdd_Frame, &QAction::triggered, mEditor, &Editor::addNewKey );
     connect(ui->actionRemove_Frame, &QAction::triggered, mEditor, &Editor::removeKey );
@@ -382,7 +389,6 @@ void MainWindow2::markTitleSaved()
 
 void MainWindow2::updateTitleSaveState()
 {
-    qDebug() << "updateTitleSaveState";
     if( mEditor->currentBackup() == mBackupAtSave )
     {
         markTitleSaved();
@@ -617,7 +623,7 @@ bool MainWindow2::maybeSave()
 
 void MainWindow2::importImage()
 {
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
     QString initPath = settings.value( "lastImportPath", QDir::homePath() ).toString();
 
     QString strFilePath = QFileDialog::getOpenFileName( this,
@@ -682,7 +688,7 @@ void MainWindow2::importImageSequence()
 
 void MainWindow2::importMovie()
 {
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
 
     QString initialPath = settings.value( "lastExportPath", QDir::homePath() ).toString();
     QString filePath = QFileDialog::getOpenFileName( this,
@@ -1046,7 +1052,7 @@ void MainWindow2::undoActSetEnabled( void )
 
 void MainWindow2::exportPalette()
 {
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
     QString initialPath = settings.value( "lastPalettePath", QVariant( QDir::homePath() ) ).toString();
     if ( initialPath.isEmpty() )
     {
@@ -1062,7 +1068,7 @@ void MainWindow2::exportPalette()
 
 void MainWindow2::importPalette()
 {
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
     QString initialPath = settings.value( "lastPalettePath", QVariant( QDir::homePath() ) ).toString();
     if ( initialPath.isEmpty() )
     {
@@ -1205,3 +1211,15 @@ void MainWindow2::updateZoomLabel()
     float zoom = mEditor->view()->scaling() * 100.f;
     statusBar()->showMessage( QString( "Zoom: %0%1" ).arg( zoom, 0, 'f', 1 ).arg("%") );
 }
+
+void MainWindow2::changePlayState( bool isPlaying )
+{
+    if( isPlaying ) {
+        ui->actionPlay->setText(tr("Stop"));
+        ui->actionPlay->setIcon(mStopIcon);
+    }
+    else {
+        ui->actionPlay->setText(tr("Play"));
+        ui->actionPlay->setIcon(mStartIcon);
+    }
+}
diff --git a/app/mainwindow2.h b/app/mainwindow2.h
@@ -108,6 +108,8 @@ public slots:
     void readSettings();
     void writeSettings();
 
+    void changePlayState( bool isPlaying );
+
     void makeConnections( Editor* );
     void makeConnections( Editor*, ColorBox* );
     void makeConnections( Editor*, ScribbleArea* );
@@ -145,6 +147,8 @@ public slots:
     Ui::MainWindow2* ui                   = nullptr;
     QList< BaseDockWidget* > mDockWidgets;
     BackgroundWidget* mBackground;
+
+    QIcon mStartIcon, mStopIcon;
 };
 
 #endif // MAINWINDOW2_H
diff --git a/app/preferencesdialog.cpp b/app/preferencesdialog.cpp
@@ -439,28 +439,27 @@ void GridPage::gridSizeChange(int value)
 
 TimelinePage::TimelinePage(QWidget* parent) : QWidget(parent)
 {
-    QSettings settings("Pencil","Pencil");
+    QSettings settings( PENCIL2D, PENCIL2D );
 
     QVBoxLayout* lay = new QVBoxLayout();
 
     QGroupBox* timeLineBox = new QGroupBox(tr("Timeline"));
     mDrawLabel = new QCheckBox(tr("Draw timeline labels"));
     mFontSize = new QSpinBox();
-    QLabel* frameSizeLabel = new QLabel(tr("Frame size in Pixels"));
-    mFrameSize = new QSpinBox(this);
+    QLabel* frameSizeLabel = new QLabel(tr("Frame size"));
+    mFrameSize = new QSlider(Qt::Horizontal, this);
     QLabel* lengthSizeLabel = new QLabel(tr("Timeline size in Frames"));
     mLengthSize = new QLineEdit(this);
-    mLengthSize->setInputMask("0009");
+    QIntValidator* lengthSizeValidator = new QIntValidator(this);
+    lengthSizeValidator->setBottom(2);
+    mLengthSize->setValidator( lengthSizeValidator );
 
     mScrubBox = new QCheckBox(tr("Short scrub"));
 
-    mFontSize->setMinimum(4);
-    mFontSize->setMaximum(20);
-    mFrameSize->setMinimum(4);
-    mFrameSize->setMaximum(20);
+    mFontSize->setRange(4, 20);
+    mFrameSize->setRange(4, 20);
 
     mFontSize->setFixedWidth(50);
-    mFrameSize->setFixedWidth(50);
     mLengthSize->setFixedWidth(50);
 
 
@@ -569,7 +568,7 @@ void FilesPage::autosaveNumberChange(int number)
 
 ToolsPage::ToolsPage(QWidget* parent) : QWidget(parent)
 {
-    QSettings settings("Pencil","Pencil");
+    QSettings settings( PENCIL2D, PENCIL2D );
 
     QVBoxLayout* lay = new QVBoxLayout();
 

diff --git a/app/preferencesdialog.h b/app/preferencesdialog.h
@@ -149,7 +149,7 @@ public slots:
     PreferenceManager* mManager = nullptr;
     QCheckBox* mDrawLabel;
     QSpinBox* mFontSize;
-    QSpinBox* mFrameSize;
+    QSlider* mFrameSize;
     QLineEdit* mLengthSize;
     QCheckBox* mScrubBox;
 };

diff --git a/app/shortcutspage.cpp b/app/shortcutspage.cpp
@@ -70,7 +70,7 @@ void ShortcutsPage::keyCapLineEditTextChanged(QKeySequence keySeqence)
     QString strCmdName = QString("Cmd%1").arg( actionItem->text() );
     QString strKeySeq  = keySeqence.toString( QKeySequence::PortableText );
 
-    QSettings setting("Pencil", "Pencil");
+    QSettings setting( PENCIL2D, PENCIL2D );
     setting.beginGroup("shortcuts");
 
     if (isKeySequenceExist(setting, strCmdName, keySeqence))
@@ -147,7 +147,7 @@ void ShortcutsPage::removeDuplicateKeySequence(QSettings* settings, QKeySequence
 void ShortcutsPage::treeModelLoadShortcutsSetting()
 {
     // Load shortcuts from settings
-    QSettings settings("Pencil", "Pencil");
+    QSettings settings( PENCIL2D, PENCIL2D );
     settings.beginGroup("shortcuts");
 
     m_treeModel->clear(); // release all existing items.
@@ -194,7 +194,7 @@ void ShortcutsPage::clearButtonClicked()
 
     QString strCmdName = QString("shortcuts/Cmd%1").arg( actionItem->text() );
 
-    QSettings setting("Pencil", "Pencil");
+    QSettings setting( PENCIL2D, PENCIL2D );
     setting.setValue( strCmdName, "" );
     setting.sync();
 

diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui
@@ -30,7 +30,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>24</height>
+     <height>22</height>
     </rect>
    </property>
    <property name="font">
@@ -820,10 +820,10 @@ background: #B6DBEA;
     <bool>true</bool>
    </property>
    <property name="enabled">
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="text">
-    <string>loopcontrol</string>
+    <string>Range</string>
    </property>
   </action>
   <action name="actionToolsWidget">
@@ -898,6 +898,7 @@ background: #B6DBEA;
  <resources>
   <include location="../../pencil.qrc"/>
   <include location="../resource/app.qrc"/>
+  <include location="../../pencil.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/core_lib/external/linux/linux.cpp b/core_lib/external/linux/linux.cpp
@@ -25,6 +25,7 @@ GNU General Public License for more details.
 #include "object.h"
 #include "editor.h"
 #include "layersound.h"
+#include "pencildef.h"
 
 #define MIN(a,b) ((a)>(b)?(b):(a))
 
@@ -269,7 +270,7 @@ void Editor::importMovie (QString filePath, int fps)
 {
 
     int i;
-    QSettings settings("Pencil","Pencil");
+    QSettings settings( PENCIL2D, PENCIL2D );
 
     qDebug() << "-------IMPORT VIDEO------" << filePath;
 

diff --git a/core_lib/external/macosx/macosx.cpp b/core_lib/external/macosx/macosx.cpp
@@ -21,6 +21,7 @@ GNU General Public License for more details.
 #include <QSysInfo>
 #include "object.h"
 #include "editor.h"
+#include "pencildef.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h>
@@ -122,7 +123,7 @@ void Editor::importMovie (QString filePath, int fps)
 {
 
     int i;
-    QSettings settings("Pencil","Pencil");
+    QSettings settings( PENCIL2D , PENCIL2D );
 
     qDebug() << "-------IMPORT VIDEO------" << filePath;
 

diff --git a/core_lib/external/win32/win32.cpp b/core_lib/external/win32/win32.cpp
@@ -300,7 +300,7 @@ bool Object::exportMovie( ExportMovieParameters exportParams )
 void Editor::importMovie( QString filePath, int fps )
 {
     int i;
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
 
     qDebug() << "-------IMPORT VIDEO------" << filePath;
 

diff --git a/core_lib/interface/editor.cpp b/core_lib/interface/editor.cpp
@@ -177,7 +177,6 @@ void Editor::settingUpdated(SETTING setting)
 
 BackupElement* Editor::currentBackup()
 {
-    qDebug() << mBackupIndex << mBackupList.length();
     if ( mBackupIndex >= 0 )
     {
         return mBackupList[ mBackupIndex ];
@@ -622,7 +621,7 @@ QString Editor::workingDir() const
 /*
 bool Editor::exportMov()
 {
-QSettings settings( "Pencil", "Pencil" );
+QSettings settings( PENCIL2D, PENCIL2D );
 QString initialPath = settings.value( "lastExportPath", QVariant( QDir::homePath() ) ).toString();
 if ( initialPath.isEmpty() ) initialPath = QDir::homePath() + "/untitled.avi";
 //  QString filePath = QFileDialog::getSaveFileName(this, tr("Export As"),initialPath);

diff --git a/core_lib/interface/recentfilemenu.cpp b/core_lib/interface/recentfilemenu.cpp
@@ -32,7 +32,7 @@ void RecentFileMenu::setRecentFiles( QStringList filenames )
 
 bool RecentFileMenu::loadFromDisk()
 {
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
     QVariant _recent = settings.value( "RecentFiles" );
     if ( _recent.isNull() )
     {
@@ -45,7 +45,7 @@ bool RecentFileMenu::loadFromDisk()
 
 bool RecentFileMenu::saveToDisk()
 {
-    QSettings settings( "Pencil", "Pencil" );
+    QSettings settings( PENCIL2D, PENCIL2D );
     settings.setValue( "RecentFiles", QVariant( mRecentFiles ) );
     return true;
 }
@@ -103,4 +103,4 @@ void RecentFileMenu::onRecentFileTriggered()
     {
         emit loadRecentFile( filePath );
     }
-}
+}
diff --git a/core_lib/interface/recentfilemenu.h b/core_lib/interface/recentfilemenu.h
@@ -4,6 +4,7 @@
 #include <QMenu>
 #include <QMap>
 #include <QStringList>
+#include "pencildef.h"
 
 class QAction;
 class ListItemModel;