pencil2d · chchwy · Jun 8, 2020 · May 19, 2020 · May 19, 2020 · May 19, 2020
diff --git a/app/src/importexportdialog.cpp b/app/src/importexportdialog.cpp
@@ -27,6 +27,7 @@ ImportExportDialog::ImportExportDialog(QWidget* parent, Mode eMode, FileType eFi
 
     ui = new Ui::ImportExportDialog;
     ui->setupUi(this);
+    hidePreviewGroupBox(true);
     m_fileDialog = new FileDialog(this);
     connect(ui->browseButton, &QPushButton::clicked, this, &ImportExportDialog::browse);
 

diff --git a/app/src/importimageseqdialog.cpp b/app/src/importimageseqdialog.cpp
@@ -53,7 +53,6 @@ void ImportImageSeqDialog::setupLayout()
 {
 
     hideInstructionsLabel(true);
-    hidePreviewGroupBox(true);
 
     if (mFileType == FileType::GIF) {
         setWindowTitle(tr("Import Animated GIF"));
@@ -70,6 +69,7 @@ void ImportImageSeqDialog::setupPredefinedLayout()
     setInstructionsLabel(tr("Select an image that matches the criteria: MyFile000.png, eg. Joe001.png \n"
                          "The importer will search and find images matching the same criteria. You can see the result in the preview box below."));
     hideOptionsGroupBox(true);
+    hidePreviewGroupBox(false);
 
     connect(this, &ImportImageSeqDialog::filePathsChanged, this, &ImportImageSeqDialog::updatePreviewList);
 }

diff --git a/app/src/mainwindow2.cpp b/app/src/mainwindow2.cpp
@@ -43,6 +43,7 @@ GNU General Public License for more details.
 #include "layermanager.h"
 #include "toolmanager.h"
 #include "playbackmanager.h"
+#include "selectionmanager.h"
 #include "soundmanager.h"
 #include "viewmanager.h"
 
@@ -121,6 +122,7 @@ MainWindow2::MainWindow2(QWidget* parent) :
     readSettings();
 
     updateZoomLabel();
+    selectionChanged();
 
     connect(mEditor, &Editor::needSave, this, &MainWindow2::autoSave);
     connect(mToolBox, &ToolBoxWidget::clearButtonClicked, mEditor, &Editor::clearCurrentFrame);
@@ -131,7 +133,7 @@ MainWindow2::MainWindow2(QWidget* parent) :
 
     setWindowTitle(PENCIL_WINDOW_TITLE);
 
-    showPresetDialog();
+    tryLoadPreset();
 }
 
 MainWindow2::~MainWindow2()
@@ -271,6 +273,7 @@ void MainWindow2::createMenus()
     connect(ui->actionCopy, &QAction::triggered, mEditor, &Editor::copy);
     connect(ui->actionPaste, &QAction::triggered, mEditor, &Editor::paste);
     connect(ui->actionClearFrame, &QAction::triggered, mEditor, &Editor::clearCurrentFrame);
+    connect(mEditor->select(), &SelectionManager::selectionChanged, this, &MainWindow2::selectionChanged);
     connect(ui->actionFlip_X, &QAction::triggered, mCommands, &ActionCommands::flipSelectionX);
     connect(ui->actionFlip_Y, &QAction::triggered, mCommands, &ActionCommands::flipSelectionY);
     connect(ui->actionPegbarAlignment, &QAction::triggered, this, &MainWindow2::openPegAlignDialog);
@@ -316,7 +319,6 @@ void MainWindow2::createMenus()
 
     bindActionWithSetting(ui->actionOnionPrev, SETTING::PREV_ONION);
     bindActionWithSetting(ui->actionOnionNext, SETTING::NEXT_ONION);
-    bindActionWithSetting(ui->actionMultiLayerOnionSkin, SETTING::MULTILAYER_ONION);
 
     //--- Animation Menu ---
     PlaybackManager* pPlaybackManager = mEditor->playback();
@@ -434,6 +436,7 @@ void MainWindow2::clearRecentFilesList()
     if (!recentFilesList.isEmpty())
     {
         mRecentFileMenu->clear();
+        mRecentFileMenu->saveToDisk();
         QMessageBox::information(this, nullptr,
                                  tr("\n\n You have successfully cleared the list"),
                                  QMessageBox::Ok);
@@ -479,6 +482,12 @@ void MainWindow2::currentLayerChanged()
     }
 }
 
+void MainWindow2::selectionChanged()
+{
+    bool somethingSelected = mEditor->select()->somethingSelected();
+    ui->menuSelection->setEnabled(somethingSelected);
+}
+
 void MainWindow2::closeEvent(QCloseEvent* event)
 {
     if (m2ndCloseEvent)
@@ -516,18 +525,7 @@ void MainWindow2::newDocument(bool force)
     }
     else if (maybeSave())
     {
-        if (mEditor->preference()->isOn(SETTING::ASK_FOR_PRESET))
-        {
-            showPresetDialog();
-        }
-        else
-        {
-            int defaultPreset = mEditor->preference()->getInt(SETTING::DEFAULT_PRESET);
-            newObjectFromPresets(defaultPreset);
-
-            setWindowTitle(PENCIL_WINDOW_TITLE);
-            updateSaveState();
-        }
+        tryLoadPreset();
     }
 }
 
@@ -660,8 +658,12 @@ bool MainWindow2::openObject(QString strFilePath)
     QSettings settings(PENCIL2D, PENCIL2D);
     settings.setValue(LAST_PCLX_PATH, object->filePath());
 
-    mRecentFileMenu->addRecentFile(object->filePath());
-    mRecentFileMenu->saveToDisk();
+    // Add to recent file list, but only if we are
+    if (!object->filePath().isEmpty())
+    {
+        mRecentFileMenu->addRecentFile(object->filePath());
+        mRecentFileMenu->saveToDisk();
+    }
 
     setWindowTitle(object->filePath().prepend("[*]"));
     setWindowModified(false);
@@ -1065,10 +1067,14 @@ bool MainWindow2::newObjectFromPresets(int presetIndex)
     }
     mEditor->setObject(object);
     object->setFilePath(QString());
+
+    setWindowTitle(PENCIL_WINDOW_TITLE);
+    updateSaveState();
+
     return true;
 }
 
-void  MainWindow2::showPresetDialog()
+void  MainWindow2::tryLoadPreset()
 {
     if (mEditor->preference()->isOn(SETTING::ASK_FOR_PRESET))
     {
@@ -1089,6 +1095,11 @@ void  MainWindow2::showPresetDialog()
         });
         presetDialog->open();
     }
+    else
+    {
+        int defaultPreset = mEditor->preference()->getInt(SETTING::DEFAULT_PRESET);
+        newObjectFromPresets(defaultPreset);
+    }
 }
 
 void MainWindow2::readSettings()

diff --git a/app/src/mainwindow2.h b/app/src/mainwindow2.h
@@ -70,6 +70,7 @@ public slots:
     void openPegAlignDialog();
     void closePegAlignDialog();
     void currentLayerChanged();
+    void selectionChanged();
 
 public:
     void newDocument(bool force = false);
@@ -126,7 +127,7 @@ private slots:
     void setupKeyboardShortcuts();
     void clearKeyboardShortcuts();
     void updateZoomLabel();
-    void showPresetDialog();
+    void tryLoadPreset();
 
     void openPalette();
     void importPalette();

diff --git a/app/ui/mainwindow2.ui b/app/ui/mainwindow2.ui
@@ -49,7 +49,7 @@
      <x>0</x>
      <y>0</y>
      <width>831</width>
-     <height>41</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -135,7 +135,6 @@
      </property>
      <addaction name="actionOnionPrev"/>
      <addaction name="actionOnionNext"/>
-     <addaction name="actionMultiLayerOnionSkin"/>
     </widget>
     <widget class="QMenu" name="menuZoom">
      <property name="title">
@@ -825,7 +824,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>MultiLayer Onion Skin</string>
+    <string>Multilayer Onion Skin</string>
    </property>
   </action>
   <action name="actionLoopControl">

diff --git a/core_lib/src/canvaspainter.cpp b/core_lib/src/canvaspainter.cpp
@@ -586,9 +586,11 @@ void CanvasPainter::paintOverlayCenter(QPainter &painter)
     painter.setBrush(Qt::NoBrush);
     painter.setRenderHint(QPainter::Antialiasing, false);
 
-    int offset = OVERLAY_SAFE_CENTER_CROSS_SIZE;
-    painter.drawLine(rect.center().x()-offset, rect.center().y(), rect.center().x()+offset, rect.center().y());
-    painter.drawLine(rect.center().x(), rect.center().y()-offset, rect.center().x(), rect.center().y()+offset);
+    QPoint offsetX(OVERLAY_SAFE_CENTER_CROSS_SIZE, 0), offsetY(0, OVERLAY_SAFE_CENTER_CROSS_SIZE);
+    painter.drawLine(rect.center(), rect.center() - offsetX);
+    painter.drawLine(rect.center(), rect.center() + offsetX);
+    painter.drawLine(rect.center(), rect.center() - offsetY);
+    painter.drawLine(rect.center(), rect.center() + offsetY);
 
     painter.restore();
 }

diff --git a/core_lib/src/interface/editor.cpp b/core_lib/src/interface/editor.cpp
@@ -371,7 +371,7 @@ void BackupBitmapElement::restore(Editor* editor)
 {
     Layer* layer = editor->object()->getLayer(this->layer);
     auto selectMan = editor->select();
-    selectMan->setSelection(mySelection);
+    selectMan->setSelection(mySelection, true);
     selectMan->setTransformedSelectionRect(myTransformedSelection);
     selectMan->setTempTransformedSelectionRect(myTempTransformedSelection);
     selectMan->setRotation(rotationAngle);
@@ -401,7 +401,7 @@ void BackupVectorElement::restore(Editor* editor)
 {
     Layer* layer = editor->object()->getLayer(this->layer);
     auto selectMan = editor->select();
-    selectMan->setSelection(mySelection);
+    selectMan->setSelection(mySelection, false);
     selectMan->setTransformedSelectionRect(myTransformedSelection);
     selectMan->setTempTransformedSelectionRect(myTempTransformedSelection);
     selectMan->setRotation(rotationAngle);
@@ -477,7 +477,7 @@ void Editor::undo()
         if (layer->type() == Layer::VECTOR) {
             VectorImage *vectorImage = static_cast<LayerVector*>(layer)->getVectorImageAtFrame(mFrame);
             vectorImage->calculateSelectionRect();
-            select()->setSelection(vectorImage->getSelectionRect());
+            select()->setSelection(vectorImage->getSelectionRect(), false);
         }
         emit updateBackup();
     }
@@ -584,15 +584,17 @@ void Editor::paste()
                 }
             }
             auto pLayerBitmap = static_cast<LayerBitmap*>(layer);
+            mScribbleArea->handleDrawingOnEmptyFrame();
             pLayerBitmap->getLastBitmapImageAtFrame(currentFrame(), 0)->paste(&tobePasted); // paste the clipboard
         }
         else if (layer->type() == Layer::VECTOR && clipboardVectorOk)
         {
             backup(tr("Paste"));
             deselectAll();
+            mScribbleArea->handleDrawingOnEmptyFrame();
             VectorImage* vectorImage = (static_cast<LayerVector*>(layer))->getLastVectorImageAtFrame(currentFrame(), 0);
             vectorImage->paste(g_clipboardVectorImage);  // paste the clipboard
-            select()->setSelection(vectorImage->getSelectionRect());
+            select()->setSelection(vectorImage->getSelectionRect(), false);
         }
     }
     mScribbleArea->updateCurrentFrame();
@@ -966,8 +968,7 @@ void Editor::selectAll()
         vectorImage->selectAll();
         rect = vectorImage->getSelectionRect();
     }
-    select()->setSelection(rect);
-    emit updateCurrentFrame();
+    select()->setSelection(rect, false);
 }
 
 void Editor::deselectAll()

diff --git a/core_lib/src/interface/recentfilemenu.cpp b/core_lib/src/interface/recentfilemenu.cpp
@@ -51,16 +51,16 @@ void RecentFileMenu::clear()
     mRecentFiles.clear();
     mRecentActions.clear();
     addAction(mEmptyAction);
-    saveToDisk();
 }
 
 void RecentFileMenu::setRecentFiles(const QStringList& filenames)
 {
     clear();
 
+    // Iterate in reverse because items are prepended to the list when first added
     for (auto filename = filenames.crbegin(); filename != filenames.crend(); filename++)
     {
-        if (*filename != "")
+        if (!filename->isEmpty())
         {
             addRecentFile(*filename);
         }
@@ -114,7 +114,10 @@ void RecentFileMenu::addRecentFile(QString filename)
         addAction(action);
         addAction(mClearSeparator);
         addAction(mClearAction);
-        QObject::connect(mClearAction, &QAction::triggered, this, &RecentFileMenu::clear);
+        QObject::connect(mClearAction, &QAction::triggered, [this] {
+            clear();
+            saveToDisk();
+        });
     }
     else
     {