💎 Chord progression creation dialog (elieserdejesus#1132) (close elieserdejesus#1124, close elieserdejesus#1042)

* Creating Chord Progression Creation dialog manual test

* Finishing the Chord Progression Dialog

* Integrating chords dialog in Ninjam Window

* Guessing a good measures number when opening chord progression dialog

* Always opening current progression in chords dialog

Author: elieserdejesus

PROJECTS/Jamtaba-common.pri

@@ -147,6 +147,7 @@ HEADERS += gui/chords/ChordsPanel.h
 HEADERS += gui/chords/ChordProgression.h
 HEADERS += gui/chords/ChordProgressionMeasure.h
 HEADERS += gui/chords/ChordsProgressionParser.h
+HEADERS += gui/chords/ChordProgressionCreationDialog.h
 HEADERS += gui/chords/ChatChordsProgressionParser.h
 HEADERS += gui/chords/Chord.h
 HEADERS += gui/LocalTrackView.h
@@ -273,6 +274,7 @@ SOURCES += gui/BpiUtils.cpp
 SOURCES += gui/chords/ChordsPanel.cpp
 SOURCES += gui/chords/ChordProgression.cpp
 SOURCES += gui/chords/ChordProgressionMeasure.cpp
+SOURCES += gui/chords/ChordProgressionCreationDialog.cpp
 SOURCES += gui/chords/Chord.cpp
 SOURCES += gui/chords/ChordLabel.cpp
 SOURCES += gui/chords/ChatChordsProgressionParser.cpp
@@ -311,6 +313,7 @@ FORMS += gui/PrivateServerWindow.ui
 FORMS += gui/UserNameDialog.ui
 FORMS += gui/MainWindow.ui
 FORMS += gui/chords/ChordsPanel.ui
+FORMS += gui/chords/ChordProgressionCreationDialog.ui
 
 RESOURCES += ../resources/jamtaba.qrc
 

src/Common/gui/GuiUtils.cpp

@@ -34,3 +34,20 @@ QString gui::sanitizeServerName(const QString &serverName)
     return serverName;
 }
 
+void gui::clearLayout(QLayout *layout)
+{
+    if (!layout)
+        return;
+
+    QLayoutItem *item = nullptr;
+    while ((item = layout->takeAt(0)) != nullptr) {
+
+        if (item->widget())
+            item->widget()->deleteLater();
+
+        if (item->layout())
+            clearLayout(item->layout());
+
+        delete item;
+    }
+}

src/Common/gui/GuiUtils.h

@@ -12,6 +12,8 @@ namespace gui {
 
     QString sanitizeServerName(const QString &serverName);
 
+    void clearLayout(QLayout *layout);
+
 } // namespace
 
 #endif

src/Common/gui/MainWindow.cpp

@@ -13,6 +13,7 @@
 #include "PrivateServerWindow.h"
 #include "chords/ChordsPanel.h"
 #include "chords/ChatChordsProgressionParser.h"
+#include "chords/ChordProgressionCreationDialog.h"
 #include "widgets/BlinkableButton.h"
 #include "InactivityDetector.h"
 #include "IconFactory.h"
@@ -1319,7 +1320,7 @@ void MainWindow::enterInRoom(const login::RoomInfo &roomInfo)
 
     ui.leftPanel->adjustSize();
 
-    wireNinjamControllerSignals();
+    wireNinjamSignals();
 
     enableLooperButtonInLocalTracks(true); // looper buttons are enabled when entering in a server
 
@@ -1386,7 +1387,7 @@ void MainWindow::addNinjamPanelsInBottom()
 
 }
 
-void MainWindow::wireNinjamControllerSignals()
+void MainWindow::wireNinjamSignals()
 {
     auto controller = mainController->getNinjamController();
     connect(controller, &NinjamController::preparedToTransmit, this, &MainWindow::startTransmission);
@@ -1416,6 +1417,11 @@ void MainWindow::wireNinjamControllerSignals()
     Q_ASSERT(xmitInactivityDetector);
     xmitInactivityDetector->initialize(controller);
 
+    if (ninjamWindow) {
+        auto chordsDialog = ninjamWindow->getChordProgressionDialog();
+        connect(chordsDialog, &ChordProgressionCreationDialog::chordProgressionCreated, this, &MainWindow::acceptChordProgression);
+    }
+
 }
 
 void MainWindow::setPrivateChatInputstatus(const QString userName, bool enabled)
@@ -2657,6 +2663,8 @@ ChordsPanel *MainWindow::createChordsPanel()
         }
     });
 
+    connect(chordsPanel, &ChordsPanel::openingChordsDialog, ninjamWindow.data(), &NinjamRoomWindow::showChordProgressionDialog);
+
     connect(mainController->getNinjamController(), &NinjamController::intervalBeatChanged, chordsPanel, &ChordsPanel::setCurrentBeat);
 
     return chordsPanel;
@@ -2715,14 +2723,27 @@ void MainWindow::showChordsPanel()
     if (!mainController || !mainController->isPlayingInNinjamRoom())
         return;
 
-    if (ui.contentTabWidget->count() < 3) { // chords tab is not created
+    if (!chordsPanelIsVisible()) { // chords tab is not created
         auto chordsPanel = createChordsPanel();
         auto tabTitle = tr("Chords");
         auto tabIndex = ui.contentTabWidget->addTab(chordsPanel, tabTitle);
         ui.contentTabWidget->setCurrentIndex(tabIndex);
     }
 }
 
+bool MainWindow::chordsPanelIsVisible() const
+{
+    return ui.contentTabWidget->count() >= 3;
+}
+
+ChordsPanel *MainWindow::getChordsPanel() const
+{
+    if (!chordsPanelIsVisible())
+        return nullptr;
+
+    return qobject_cast<ChordsPanel *>(ui.contentTabWidget->widget(2));
+}
+
 // ninjam controller events
 void MainWindow::updateBpi(int bpi)
 {

src/Common/gui/MainWindow.h

@@ -120,6 +120,8 @@ class MainWindow : public QMainWindow
 
     void fillUserContextMenu(QMenu &menu, const QString &userFullName, bool addInvitationEntry);
 
+    ChordsPanel* getChordsPanel() const;
+
 public slots:
     void enterInRoom(const login::RoomInfo &roomInfo);
     void openLooperWindow(uint trackID);
@@ -316,6 +318,8 @@ private slots:
 
     void connectInMainChat();
 
+    bool chordsPanelIsVisible() const;
+
 private:
 
     static const QString JAMTABA_CHAT_BOT_NAME;
@@ -368,7 +372,7 @@ private slots:
 
     void showMessageBox(const QString &title, const QString &text, QMessageBox::Icon icon);
 
-    void wireNinjamControllerSignals();
+    void wireNinjamSignals();
 
     int timerID; // timer used to refresh the entire GUI: animations, peak meters, etc
     static const quint8 DEFAULT_REFRESH_RATE;

src/Common/gui/NinjamRoomWindow.cpp

@@ -50,7 +50,8 @@ NinjamRoomWindow::NinjamRoomWindow(MainWindow *mainWindow, const RoomInfo &roomI
     tracksSize(TracksSize::WIDE),
     metronomeFloatingWindow(nullptr),
     roomInfo(roomInfo),
-    usersColorsPool(mainWindow->getUsersColorsPool())
+    usersColorsPool(mainWindow->getUsersColorsPool()),
+    chordProgressionDialog(new ChordProgressionCreationDialog(this))
 {
     qCDebug(jtNinjamGUI) << "NinjamRoomWindow::NinjamRoomWindow ctor";
     ui->setupUi(this);
@@ -733,6 +734,23 @@ void NinjamRoomWindow::setupSignals(controller::NinjamController* ninjamControll
 
     connect(mainController->getNinjamService(), &ninjam::client::Service::videoIntervalCompleted, this, &NinjamRoomWindow::setVideoInterval);
 
+    connect(ui->chordsButton, &QPushButton::clicked, [=](){
+
+        auto chordsPanel = mainWindow->getChordsPanel();
+        auto currentProgression = ChordProgression();
+        if (chordsPanel)
+            currentProgression = chordsPanel->getChordProgression();
+
+        showChordProgressionDialog(currentProgression);
+    });
+}
+
+void NinjamRoomWindow::showChordProgressionDialog(const ChordProgression &currentProgression)
+{
+    if (chordProgressionDialog) {
+        auto currentBpi = ninjamPanel->getBpi();
+        chordProgressionDialog->show(currentBpi, currentProgression);
+    }
 }
 
 void NinjamRoomWindow::setVideoInterval(const User &user, const QByteArray &encodedVideoData)

src/Common/gui/NinjamRoomWindow.h

@@ -11,6 +11,7 @@
 #include "NinjamPanel.h"
 #include "MetronomePanel.h"
 #include "intervalProgress/IntervalProgressWindow.h"
+#include "chords/ChordProgressionCreationDialog.h"
 #include "chat/ChatPanel.h"
 #include "ninjam/client/UserChannel.h"
 
@@ -44,6 +45,7 @@ class NinjamRoomWindow : public QWidget
 
     NinjamPanel *getNinjamPanel() const;
     MetronomePanel *getMetronomePanel() const;
+    ChordProgressionCreationDialog *getChordProgressionDialog() const;
 
     void setTracksLayout(TracksLayout newLayout);
 
@@ -73,6 +75,7 @@ public slots:
     void setChannelXmitStatus(long channelID, bool transmiting);
     void resetBpiComboBox();
     void resetBpmComboBox();
+    void showChordProgressionDialog(const ChordProgression &currentProgression);
 
 protected:
     Ui::NinjamRoomWindow *ui;
@@ -103,6 +106,7 @@ public slots:
     TracksSize tracksSize;
 
     IntervalProgressWindow *metronomeFloatingWindow;
+    ChordProgressionCreationDialog *chordProgressionDialog;
 
     void createLayoutButtons(TracksLayout initialLayout);
     QToolButton *horizontalLayoutButton;
@@ -174,6 +178,11 @@ private slots:
     void updateStylesheet();
 };
 
+inline ChordProgressionCreationDialog *NinjamRoomWindow::getChordProgressionDialog() const
+{
+    return chordProgressionDialog;
+}
+
 inline QList<NinjamTrackGroupView *> NinjamRoomWindow::getTrackGroups() const
 {
     return trackGroups.values();

src/Common/gui/NinjamRoomWindow.ui

@@ -92,6 +92,29 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="chordsButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="MinimumExpanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../resources/jamtaba.qrc">
+         <normaloff>:/images/chords.png</normaloff>:/images/chords.png</iconset>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -139,6 +162,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../resources/jamtaba.qrc"/>
+ </resources>
  <connections/>
 </ui>

src/Common/gui/chords/ChordProgression.cpp

@@ -15,6 +15,18 @@ const QList<ChordProgressionMeasure *> ChordProgression::getMeasures() const
     return measuresPointers;
 }
 
+int ChordProgression::getMaxChordsPerMeasure() const
+{
+    auto maxChords = 1;
+    for (auto measure : measures) {
+        auto chords = measure.getChords().size();
+        if (chords > maxChords)
+            maxChords = chords;
+    }
+
+    return maxChords;
+}
+
 bool ChordProgression::canBeUsed(int bpi) const
 {
     auto dividers = bpiUtils::getBpiDividers(bpi);

src/Common/gui/chords/ChordProgression.h

@@ -12,6 +12,8 @@ class ChordProgression
     bool isEmpty() const;
     void addMeasure(const ChordProgressionMeasure &measure);
     const QList<ChordProgressionMeasure *> getMeasures() const;
+    int getMeasuresCount() const;
+    int getMaxChordsPerMeasure() const;
     QString toString() const;
     bool canBeUsed(int bpi) const;
     ChordProgression getStretchedVersion(int bpi) const;
@@ -23,6 +25,10 @@ class ChordProgression
     QList<ChordProgressionMeasure> measures;
 };
 
+inline int ChordProgression::getMeasuresCount() const
+{
+    return measures.count();
+}
 
 inline bool ChordProgression::isEmpty() const
 {