modificato: snap/snapcraft.yaml

modificato: src/audioplay/cambiostatoplayer.cpp modificato: src/audioplay/enableriascolto.cpp modificato: src/audioplay/playbottonfunction.cpp modificato: src/audioplay/riascoltoaudioprogressivo.cpp modificato: src/mainwindow.cpp modificato: src/mainwindow.h
giacomogroppi · Dec 6, 2020 · 4d08bdc · 4d08bdc
1 parent 73abaad
commit 4d08bdc
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 17 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: writernote
-version: 1.2.7
+version: 1.2.8
 
 summary: Writernote
 

diff --git a/src/audioplay/cambiostatoplayer.cpp b/src/audioplay/cambiostatoplayer.cpp
@@ -2,7 +2,10 @@
 #include "ui_mainwindow.h"
 #include <QMediaPlayer>
 
+#include "cambioiconariascolto.h"
+
 void MainWindow::cambiostatoplayer(QMediaPlayer::State state){
+    //qDebug() << "cambiostatoplayer richiamata";
     /* l'utente ha deciso di stoppare l'audio oppure è finito */
     if(state == QMediaPlayer::StoppedState){
         this->ui->audioSlider->setValue(0);
@@ -13,10 +16,6 @@ void MainWindow::cambiostatoplayer(QMediaPlayer::State state){
         this->ui->stopriascolto->setEnabled(false);
         this->ui->startrecording->setEnabled(false);
 
-        /* pulsante della mano -> se si clicca viene disattivato il riascolto */
-        this->ui->actionListen_current_audio->setChecked(true);
-
-
         this->ui->actionImport_Video->setEnabled(true);
         this->ui->actionDelete_audio->setEnabled(true);
         this->ui->actionDelete_copybook->setEnabled(true);
@@ -25,15 +24,19 @@ void MainWindow::cambiostatoplayer(QMediaPlayer::State state){
 
         /* creazione del nuovo copybook */
         this->ui->actionCreate_new_copybook->setEnabled(true);
-
+        this->ui->actionListen_current_audio->setChecked(false);
         /* cambiare il font in grandezza e in tipo*/
         this->ui->spinBox_fontsize->setEnabled(true);
         this->ui->fontComboBox_fonttipo->setEnabled(true);
         this->ui->insertimagebotton->setEnabled(true);
         this->ui->inserttablebotton->setEnabled(true);
         this->ui->listbotton->setEnabled(true);
 
+        cambioiconariascolto(this);
+
+        this->ui->statusBar->clearMessage();
 
+        qDebug() << "\n" << this->self->currenttitle.testi;
         this->ui->textEdit->setHtml(this->self->currenttitle.testi);
 
     }

diff --git a/src/audioplay/enableriascolto.cpp b/src/audioplay/enableriascolto.cpp
@@ -16,7 +16,6 @@ void MainWindow::on_actionListen_current_audio_triggered()
 {
     cambioiconariascolto(this);
     if(this->player->state() == QMediaPlayer::PlayingState || this->player->mediaStatus() == QMediaPlayer::EndOfMedia){
-
         settingaudio_riascoltoinatto(this, false);
 
         /* ribilitazione del pulsanti per lo stile, e per modifica su testo [copia, incolla...] */

diff --git a/src/audioplay/playbottonfunction.cpp b/src/audioplay/playbottonfunction.cpp
@@ -9,7 +9,7 @@
 
 void cambioiconariascolto(MainWindow *parent){
     QIcon icon;
-    if(parent->player->state() == QMediaPlayer::PlayingState)
+    if(parent->player->state() == QMediaPlayer::PlayingState || parent->player->mediaStatus() == QMediaPlayer::EndOfMedia)
         icon.addFile(QString::fromUtf8(":image/images/play.png"), QSize(), QIcon::Normal, QIcon::Off);
 
     else

diff --git a/src/audioplay/riascoltoaudioprogressivo.cpp b/src/audioplay/riascoltoaudioprogressivo.cpp
@@ -16,7 +16,6 @@ void MainWindow::riascoltoaudioprogressivo(qint64 position){
     if(position_inlist == -1) return;
 
     int lenght = this->self->currenttitle.testinohtml.at(position_inlist).length();
-
     QString testoGrassetto = "<!DOCTYPE html><html><body><b>" + this->self->currenttitle.testinohtml[position_inlist] + "</b>";
     testoGrassetto += self->currenttitle.testinohtml.last().mid(lenght, -1) + "</body></html>";
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -74,16 +74,11 @@ MainWindow::MainWindow(QWidget *parent)
     player = new QMediaPlayer;
     connect(player, &QMediaPlayer::positionChanged, this, &MainWindow::riascoltoaudioprogressivo);
     connect(player, &QMediaPlayer::stateChanged, this, &MainWindow::cambiostatoplayer);
-    connect(player, &QMediaPlayer::mediaStatusChanged, this, &MainWindow::endofthemedia);
 
     self = new SelfClass;
     setting_ui_start(this);
 }
 
-void MainWindow::endofthemedia(QMediaPlayer::MediaStatus status){
-    if(status == QMediaPlayer::EndOfMedia)
-        this->on_actionListen_current_audio_triggered();
-}
 
 MainWindow::~MainWindow()
 {
@@ -418,6 +413,8 @@ void MainWindow::processBuffer(const QAudioBuffer& buffer)
 /* editor di testo -> quando cambia il testo scritto */
 void MainWindow::on_textEdit_textChanged()
 {
+    if(this->player->state() == QMediaPlayer::PlayingState || this->player->state() == QMediaPlayer::PausedState)
+        return;
     this->self->currenttitle.testi = this->ui->textEdit->toHtml();
 
     if(this->m_audioRecorder->status() != QMediaRecorder::RecordingStatus)

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -138,9 +138,6 @@ private slots:
 
     void on_spinBox_fontsize_valueChanged(const QString &arg1);
 
-
-    void endofthemedia(QMediaPlayer::MediaStatus);
-
 private:
     /* gestione dell'audio */
     void clearAudioLevels();