fixup! Crash and UI issues.

kiwix · Sep 13, 2024 · 6937c65 · 6937c65
1 parent f4ad9f8
commit 6937c65
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 18 deletions.
diff --git a/resources/css/style.css b/resources/css/style.css
@@ -343,28 +343,59 @@ ContentTypeFilter {
 #readinglistbar QPushButton::menu-indicator {
     width: 0;
     height: 0;
-
+}
 /* ----------------------------------------
     Text to Speech Page
 */
 
-#TextToSpeechBar {
+TextToSpeechBar {
     border-top: 1px solid #ccc;
 }
 
-TextToSpeechBar > #closeButton {
+TextToSpeechBar #closeButton {
     outline: none;
     max-height: 36px;
     max-width: 36px;
     border: 1px solid #ccc;
     border-radius: 0;
 }
 
-TextToSpeechBar > #closeButton:pressed {
+TextToSpeechBar #stopButton {
+    outline: none;
+    max-height: 36px;
+    padding-left: 10px;
+    padding-right: 10px;
+    border: 1px solid #ccc;
+    background-color: white;
+    border-radius: 0;
+}
+
+TextToSpeechBar #stopButton:hover {
     background-color: #D9E9FF;
     border: 1px solid #3366CC;
 }
 
-TextToSpeechBar > #stopButton:disabled {
+TextToSpeechBar #stopButton:disabled {
     color: grey;
+    background-color: darkgrey;
+}
+
+TextToSpeechBar QComboBox::drop-down {
+    image: url(":/icons/search_forward.svg");
+    background-color: white;
 }
+
+TextToSpeechBar QComboBox {
+    background-color: white;
+    border: 1px solid #ccc;
+}
+
+TextToSpeechBar QComboBox QAbstractItemView QScrollBar {
+    width: 5px;
+    border: none;
+    outline: none;
+}
+
+TextToSpeechBar QComboBox QAbstractItemView QScrollBar::handle {
+    background-color: grey;
+}
diff --git a/src/texttospeechbar.cpp b/src/texttospeechbar.cpp
@@ -3,15 +3,16 @@
 #include "ui_texttospeechbar.h"
 #include <QDebug>
 
+QTextToSpeech TextToSpeechBar::m_speech;
 TextToSpeechBar::TextToSpeechBar(QWidget *parent)
-    : QFrame(parent), mp_speech(new QTextToSpeech(this)),
+    : QFrame(parent),
       mp_ui(new Ui::TextToSpeechBar)
 {
     close();
     mp_ui->setupUi(this);
     mp_ui->stopButton->setText(gt("stop"));
     mp_ui->voiceLabel->setText(gt("voice"));
-    connect(mp_speech, &QTextToSpeech::stateChanged, this,
+    connect(&m_speech, &QTextToSpeech::stateChanged, this,
             &TextToSpeechBar::onStateChanged);
     connect(mp_ui->stopButton, &QPushButton::released, this,
             &TextToSpeechBar::stop);
@@ -21,7 +22,7 @@ TextToSpeechBar::TextToSpeechBar(QWidget *parent)
     mp_ui->langLabel->setText(gt("language"));
     mp_ui->langComboBox->setMaxVisibleItems(10);
     QLocale current = QLocale::system().language();
-    for (auto locale : mp_speech->availableLocales())
+    for (auto locale : m_speech.availableLocales())
     {
         QString name(QString("%1 (%2)")
                         .arg(QLocale::languageToString(locale.language()))
@@ -44,12 +45,12 @@ TextToSpeechBar::TextToSpeechBar(QWidget *parent)
 
 void TextToSpeechBar::speak(const QString &text)
 {
-    mp_speech->say(text);
+    m_speech.say(text);
 }
 
 void TextToSpeechBar::stop()
 {
-    mp_speech->stop();
+    m_speech.stop();
 }
 
 void TextToSpeechBar::onStateChanged(QTextToSpeech::State state)
@@ -63,8 +64,9 @@ void TextToSpeechBar::languageSelected(int index)
     disconnect(mp_ui->voiceComboBox, &QComboBox::currentIndexChanged, this, &TextToSpeechBar::voiceSelected);
     mp_ui->voiceComboBox->clear();
 
-    m_voices = mp_speech->availableVoices();
-    QVoice currentVoice = mp_speech->voice();
+    m_speech.setLocale(locale);
+    m_voices = m_speech.availableVoices();
+    QVoice currentVoice = m_speech.voice();
     for (auto voice : m_voices)
     {
         mp_ui->voiceComboBox->addItem(QString("%1 - %2 - %3").arg(voice.name())
@@ -78,7 +80,7 @@ void TextToSpeechBar::languageSelected(int index)
 
 void TextToSpeechBar::voiceSelected(int index)
 {
-    mp_speech->setVoice(m_voices.at(index));
+    m_speech.setVoice(m_voices.at(index));
 }
 
 void TextToSpeechBar::speechBarClose()
@@ -89,6 +91,6 @@ void TextToSpeechBar::speechBarClose()
         return;
     current->setFocus();
 
-    mp_speech->stop();
+    m_speech.stop();
     close();
 }
diff --git a/src/texttospeechbar.h b/src/texttospeechbar.h
@@ -24,7 +24,7 @@ public slots:
     void onStateChanged(QTextToSpeech::State state);
 
 private:
-    QTextToSpeech *mp_speech;
+    static QTextToSpeech m_speech;
     Ui::TextToSpeechBar *mp_ui;
     QVector<QVoice> m_voices;
 };

diff --git a/src/texttospeechbar.ui b/src/texttospeechbar.ui
@@ -79,7 +79,7 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string/>
      </property>
      <property name="text">
       <string/>

diff --git a/src/zimview.cpp b/src/zimview.cpp
@@ -33,13 +33,13 @@ ZimView::ZimView(TabBar *tabBar, QWidget *parent)
                     return;
                 mp_ttsBar->speak(mp_webView->page()->selectedText());
             });
-    connect(app->getAction(KiwixApp::ReadTextAction), &QAction::triggered, [=](){
+    connect(app->getAction(KiwixApp::ReadTextAction), &QAction::triggered, this, [=](){
         if (mp_tabBar->currentZimView() != this)
             return;
         if (this->getWebView()->page()->hasSelection())
             mp_ttsBar->show();
     });
-    connect(app->getAction(KiwixApp::ReadArticleAction), &QAction::triggered, [=](){
+    connect(app->getAction(KiwixApp::ReadArticleAction), &QAction::triggered, this, [=](){
         if (mp_tabBar->currentZimView() == this)
             mp_ttsBar->show();
     });