diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri index 222583850..e110dcc4c 100644 --- a/src/app/puzzle/puzzle.pri +++ b/src/app/puzzle/puzzle.pri @@ -6,6 +6,7 @@ SOURCES += \ $$PWD/main.cpp \ $$PWD/vpapplication.cpp \ $$PWD/vpcarrousel.cpp \ + $$PWD/vpcarrouselpiece.cpp \ $$PWD/vpcarrouselpiecelist.cpp \ $$PWD/vpcommands.cpp \ $$PWD/vpiececarrouselpiecepreview.cpp \ @@ -21,8 +22,7 @@ SOURCES += \ $$PWD/vpuzzlesettings.cpp \ $$PWD/xml/vplayoutfilereader.cpp \ $$PWD/xml/vplayoutfilewriter.cpp \ - $$PWD/xml/vplayoutliterals.cpp \ - $$PWD/vpiececarrouselpiece.cpp + $$PWD/xml/vplayoutliterals.cpp *msvc*:SOURCES += @@ -30,6 +30,7 @@ HEADERS += \ $$PWD/dialogs/vpdialogabout.h \ $$PWD/vpapplication.h \ $$PWD/vpcarrousel.h \ + $$PWD/vpcarrouselpiece.h \ $$PWD/vpcarrouselpiecelist.h \ $$PWD/vpcommands.h \ $$PWD/vpiececarrouselpiecepreview.h \ @@ -46,8 +47,7 @@ HEADERS += \ $$PWD/vpuzzlesettings.h \ $$PWD/xml/vplayoutfilereader.h \ $$PWD/xml/vplayoutfilewriter.h \ - $$PWD/xml/vplayoutliterals.h \ - $$PWD/vpiececarrouselpiece.h + $$PWD/xml/vplayoutliterals.h FORMS += \ $$PWD/dialogs/vpdialogabout.ui \ diff --git a/src/app/puzzle/vpiececarrouselpiece.cpp b/src/app/puzzle/vpcarrouselpiece.cpp similarity index 89% rename from src/app/puzzle/vpiececarrouselpiece.cpp rename to src/app/puzzle/vpcarrouselpiece.cpp index 78a8b1999..8d4754c07 100644 --- a/src/app/puzzle/vpiececarrouselpiece.cpp +++ b/src/app/puzzle/vpcarrouselpiece.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpiececarrouselpiece.cpp + ** @file vpcarrouselpiece.cpp ** @author Ronan Le Tiec ** @date 25 4, 2020 ** @@ -26,7 +26,7 @@ ** *************************************************************************/ -#include "vpiececarrouselpiece.h" +#include "vpcarrouselpiece.h" #include #include @@ -47,7 +47,7 @@ Q_LOGGING_CATEGORY(pCarrouselPiece, "p.carrouselPiece") //--------------------------------------------------------------------------------------------------------------------- -VPieceCarrouselPiece::VPieceCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer) : +VPCarrouselPiece::VPCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer) : m_piece(piece), m_carrouselLayer(carrouselLayer), m_dragStart(QPoint()) @@ -57,13 +57,13 @@ VPieceCarrouselPiece::VPieceCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPiece //--------------------------------------------------------------------------------------------------------------------- -VPieceCarrouselPiece::~VPieceCarrouselPiece() +VPCarrouselPiece::~VPCarrouselPiece() { delete m_piecePreview; } //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::Init() +void VPCarrouselPiece::Init() { // Define the structure setFixedSize(124,128); @@ -98,20 +98,20 @@ void VPieceCarrouselPiece::Init() // connect the signals - connect(m_piece, &VPuzzlePiece::SelectionChanged, this, &VPieceCarrouselPiece::on_PieceSelectionChanged); + connect(m_piece, &VPuzzlePiece::SelectionChanged, this, &VPCarrouselPiece::on_PieceSelectionChanged); // then refresh the data Refresh(); } //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::CleanPreview() +void VPCarrouselPiece::CleanPreview() { m_piecePreview->fitInView(m_piecePreview->scene()->sceneRect(), Qt::KeepAspectRatio); } //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::Refresh() +void VPCarrouselPiece::Refresh() { // update the graphic view / the scene @@ -147,13 +147,13 @@ void VPieceCarrouselPiece::Refresh() } //--------------------------------------------------------------------------------------------------------------------- -VPuzzlePiece * VPieceCarrouselPiece::GetPiece() +VPuzzlePiece * VPCarrouselPiece::GetPiece() { return m_piece; } //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::on_PieceSelectionChanged() +void VPCarrouselPiece::on_PieceSelectionChanged() { if(m_piece->GetIsSelected()) { @@ -166,7 +166,7 @@ void VPieceCarrouselPiece::on_PieceSelectionChanged() } //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::mousePressEvent(QMouseEvent *event) +void VPCarrouselPiece::mousePressEvent(QMouseEvent *event) { qCDebug(pCarrouselPiece, "mouse pressed"); @@ -189,7 +189,7 @@ void VPieceCarrouselPiece::mousePressEvent(QMouseEvent *event) //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::mouseMoveEvent(QMouseEvent *event) +void VPCarrouselPiece::mouseMoveEvent(QMouseEvent *event) { if (!(event->buttons() & Qt::LeftButton)) { @@ -235,7 +235,7 @@ void VPieceCarrouselPiece::mouseMoveEvent(QMouseEvent *event) //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::contextMenuEvent(QContextMenuEvent *event) +void VPCarrouselPiece::contextMenuEvent(QContextMenuEvent *event) { QMenu contextMenu; @@ -256,7 +256,7 @@ void VPieceCarrouselPiece::contextMenuEvent(QContextMenuEvent *event) QVariant data = QVariant::fromValue(layer); moveToLayer->setData(data); - connect(moveToLayer, &QAction::triggered, this, &VPieceCarrouselPiece::on_ActionPieceMovedToLayer); + connect(moveToLayer, &QAction::triggered, this, &VPCarrouselPiece::on_ActionPieceMovedToLayer); } } @@ -266,14 +266,14 @@ void VPieceCarrouselPiece::contextMenuEvent(QContextMenuEvent *event) QAction *removeAction = contextMenu.addAction(tr("Remove from Layout")); QVariant data = QVariant::fromValue(m_piece->GetLayer()->GetLayout()->GetUnplacedPiecesLayer()); removeAction->setData(data); - connect(removeAction, &QAction::triggered, this, &VPieceCarrouselPiece::on_ActionPieceMovedToLayer); + connect(removeAction, &QAction::triggered, this, &VPCarrouselPiece::on_ActionPieceMovedToLayer); } contextMenu.exec(event->globalPos()); } //--------------------------------------------------------------------------------------------------------------------- -void VPieceCarrouselPiece::on_ActionPieceMovedToLayer() +void VPCarrouselPiece::on_ActionPieceMovedToLayer() { QAction *act = qobject_cast(sender()); QVariant v = act->data(); diff --git a/src/app/puzzle/vpiececarrouselpiece.h b/src/app/puzzle/vpcarrouselpiece.h similarity index 85% rename from src/app/puzzle/vpiececarrouselpiece.h rename to src/app/puzzle/vpcarrouselpiece.h index 4f2ad2a8b..452a25774 100644 --- a/src/app/puzzle/vpiececarrouselpiece.h +++ b/src/app/puzzle/vpcarrouselpiece.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpiececarrouselpiece.h + ** @file vpcarrouselpiece.h ** @author Ronan Le Tiec ** @date 25 4, 2020 ** @@ -25,8 +25,8 @@ ** along with Valentina. If not, see . ** *************************************************************************/ -#ifndef VPIECECARROUSELPIECE_H -#define VPIECECARROUSELPIECE_H +#ifndef VPCARROUSELPIECE_H +#define VPCARROUSELPIECE_H #include #include @@ -39,12 +39,12 @@ class VPCarrouselPieceList; -class VPieceCarrouselPiece : public QFrame +class VPCarrouselPiece : public QFrame { Q_OBJECT public: - explicit VPieceCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer); - ~VPieceCarrouselPiece(); + explicit VPCarrouselPiece(VPuzzlePiece *piece, VPCarrouselPieceList *carrouselLayer); + ~VPCarrouselPiece(); void Init(); void Refresh(); @@ -55,7 +55,7 @@ public: void CleanPreview(); /** - * @brief GetLayoutPiece Returns the corresponding layout piece + * @brief GetPiece Returns the corresponding layout piece * @return the corresponding layout piece */ VPuzzlePiece * GetPiece(); @@ -78,7 +78,7 @@ private slots: void on_ActionPieceMovedToLayer(); private: - Q_DISABLE_COPY(VPieceCarrouselPiece) + Q_DISABLE_COPY(VPCarrouselPiece) VPuzzlePiece *m_piece; @@ -93,4 +93,4 @@ private slots: }; -#endif // VPIECECARROUSELPIECE_H +#endif // VPCARROUSELPIECE_H diff --git a/src/app/puzzle/vpcarrouselpiecelist.cpp b/src/app/puzzle/vpcarrouselpiecelist.cpp index d461dd648..dc7e58937 100644 --- a/src/app/puzzle/vpcarrouselpiecelist.cpp +++ b/src/app/puzzle/vpcarrouselpiecelist.cpp @@ -40,7 +40,7 @@ Q_LOGGING_CATEGORY(pCarrouselLayer, "p.carrouselLayer") VPCarrouselPieceList::VPCarrouselPieceList(VPuzzleLayer *layer, VPCarrousel *carrousel) : m_layer(layer), m_carrousel(carrousel), - m_carrouselPieces(QList()) + m_carrouselPieces(QList()) { Init(); } @@ -85,7 +85,7 @@ void VPCarrouselPieceList::Refresh() setVisible(true); for (auto piece : pieces) { - VPieceCarrouselPiece *carrouselPiece = new VPieceCarrouselPiece(piece, this); + VPCarrouselPiece *carrouselPiece = new VPCarrouselPiece(piece, this); m_carrouselPieces.append(carrouselPiece); layout()->addWidget(carrouselPiece); carrouselPiece->CleanPreview(); // fitInView only works if the widget is displayed. @@ -99,7 +99,7 @@ void VPCarrouselPieceList::Clear() // Removes and deletes the carrousel pieces from the layer while (!m_carrouselPieces.isEmpty()) { - VPieceCarrouselPiece *carrouselPiece = m_carrouselPieces.takeLast(); + VPCarrouselPiece *carrouselPiece = m_carrouselPieces.takeLast(); if(carrouselPiece != nullptr) { @@ -111,7 +111,7 @@ void VPCarrouselPieceList::Clear() } //--------------------------------------------------------------------------------------------------------------------- -QList VPCarrouselPieceList::GetCarrouselPieces() +QList VPCarrouselPieceList::GetCarrouselPieces() { return m_carrouselPieces; } diff --git a/src/app/puzzle/vpcarrouselpiecelist.h b/src/app/puzzle/vpcarrouselpiecelist.h index 0e51aa756..f488db2d8 100644 --- a/src/app/puzzle/vpcarrouselpiecelist.h +++ b/src/app/puzzle/vpcarrouselpiecelist.h @@ -31,7 +31,7 @@ #include #include "vpuzzlelayer.h" -#include "vpiececarrouselpiece.h" +#include "vpcarrouselpiece.h" class VPCarrousel; @@ -46,11 +46,11 @@ public: void Refresh(); /** - * @brief Clear it clears the carrousel layer from its pieces + * @brief Clear it clears the carrousel pieceList from its pieces */ void Clear(); - QList GetCarrouselPieces(); + QList GetCarrouselPieces(); VPCarrousel* GetCarrousel(); @@ -65,7 +65,7 @@ private: VPuzzleLayer *m_layer; VPCarrousel *m_carrousel; - QList m_carrouselPieces; + QList m_carrouselPieces; private slots: