diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-28 14:19:28 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-28 14:33:57 +0100 |
| commit | 7b20d233b52f16cd3822bdf01d86f552fc7cfcff (patch) | |
| tree | a679b02c592cbf40f0739586c9ea3085b6a4336d /examples | |
| parent | 967567ef0ce0ce4381a9356f2520705568b43480 (diff) | |
Some fixups
Make the example work again, fix volume on OS X
Change-Id: I7730213838666eba10317ccbe0b2a759192e829f
Reviewed-by: Laurent Montel <laurent.montel@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/hello_speak/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/hello_speak/mainwindow.ui | 26 |
2 files changed, 11 insertions, 17 deletions
diff --git a/examples/widgets/hello_speak/mainwindow.cpp b/examples/widgets/hello_speak/mainwindow.cpp index 2ecd416..fca7412 100644 --- a/examples/widgets/hello_speak/mainwindow.cpp +++ b/examples/widgets/hello_speak/mainwindow.cpp @@ -63,7 +63,7 @@ MainWindow::MainWindow(QWidget *parent) connect(ui.pitch, SIGNAL(valueChanged(double)), &m_speech, SLOT(setPitch(double))); connect(ui.rate, SIGNAL(valueChanged(double)), &m_speech, SLOT(setRate(double))); - connect(ui.volume, SIGNAL(valueChanged(double)), &m_speech, SLOT(setVolume(double))); + connect(ui.volume, SIGNAL(valueChanged(int)), &m_speech, SLOT(setVolume(int))); connect(&m_speech, &QTextToSpeech::stateChanged, this, &MainWindow::stateChanged); connect(ui.language, SIGNAL(currentIndexChanged(int)), this, SLOT(languageSelected(int))); diff --git a/examples/widgets/hello_speak/mainwindow.ui b/examples/widgets/hello_speak/mainwindow.ui index 9cc2d5e..c3f97e3 100644 --- a/examples/widgets/hello_speak/mainwindow.ui +++ b/examples/widgets/hello_speak/mainwindow.ui @@ -57,22 +57,6 @@ Done, over and out.</string> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - <property name="buddy"> - <cstring>volume</cstring> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QDoubleSpinBox" name="volume"> - <property name="minimum"> - <double>-1.000000000000000</double> - </property> - <property name="maximum"> - <double>1.000000000000000</double> - </property> - <property name="singleStep"> - <double>0.100000000000000</double> - </property> </widget> </item> <item row="2" column="0"> @@ -156,6 +140,16 @@ Done, over and out.</string> <item row="2" column="4"> <widget class="QComboBox" name="voiceType"/> </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="volume"> + <property name="maximum"> + <number>100</number> + </property> + <property name="value"> + <number>70</number> + </property> + </widget> + </item> </layout> </item> <item> |