no need to tie the TTS object to the page view stuff, just emit the error messages and let the page view handle them

svn path=/trunk/KDE/kdegraphics/okular/; revision=851245
remotes/origin/old/work/tiff-improvements
Pino Toscano 18 years ago
parent 3011b861fd
commit 723aa28f91
  1. 4
      ui/pageview.cpp
  2. 7
      ui/tts.cpp
  3. 5
      ui/tts.h

@ -186,11 +186,13 @@ OkularTTS* PageViewPrivate::tts()
{ {
if ( !m_tts ) if ( !m_tts )
{ {
m_tts = new OkularTTS( messageWindow, q ); m_tts = new OkularTTS( q );
if ( aSpeakStop ) if ( aSpeakStop )
{ {
QObject::connect( m_tts, SIGNAL( hasSpeechs( bool ) ), QObject::connect( m_tts, SIGNAL( hasSpeechs( bool ) ),
aSpeakStop, SLOT( setEnabled( bool ) ) ); aSpeakStop, SLOT( setEnabled( bool ) ) );
QObject::connect( m_tts, SIGNAL( errorMessage( const QString & ) ),
q, SLOT( errorMessage( const QString & ) ) );
} }
} }

@ -15,7 +15,6 @@
#include <kspeech.h> #include <kspeech.h>
#include <ktoolinvocation.h> #include <ktoolinvocation.h>
#include "pageviewutils.h"
#include "kspeechinterface.h" #include "kspeechinterface.h"
/* Private storage. */ /* Private storage. */
@ -31,7 +30,6 @@ public:
void teardownIface(); void teardownIface();
OkularTTS *q; OkularTTS *q;
PageViewMessage *messageWindow;
org::kde::KSpeech* kspeech; org::kde::KSpeech* kspeech;
QSet< int > jobs; QSet< int > jobs;
}; };
@ -51,7 +49,7 @@ void OkularTTS::Private::setupIface()
QString error; QString error;
if ( KToolInvocation::startServiceByDesktopName( "kttsd", QStringList(), &error ) ) if ( KToolInvocation::startServiceByDesktopName( "kttsd", QStringList(), &error ) )
{ {
messageWindow->display( i18n( "Starting KTTSD Failed: %1", error ) ); emit q->errorMessage( i18n( "Starting KTTSD Failed: %1", error ) );
} }
else else
{ {
@ -82,10 +80,9 @@ void OkularTTS::Private::teardownIface()
} }
OkularTTS::OkularTTS( PageViewMessage *messageWindow, QObject *parent ) OkularTTS::OkularTTS( QObject *parent )
: QObject( parent ), d( new Private( this ) ) : QObject( parent ), d( new Private( this ) )
{ {
d->messageWindow = messageWindow;
} }
OkularTTS::~OkularTTS() OkularTTS::~OkularTTS()

@ -12,13 +12,11 @@
#include <qobject.h> #include <qobject.h>
class PageViewMessage;
class OkularTTS : public QObject class OkularTTS : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
OkularTTS( PageViewMessage *messageWindow, QObject *parent = 0 ); OkularTTS( QObject *parent = 0 );
~OkularTTS(); ~OkularTTS();
void say( const QString &text ); void say( const QString &text );
@ -26,6 +24,7 @@ class OkularTTS : public QObject
signals: signals:
void hasSpeechs( bool has ); void hasSpeechs( bool has );
void errorMessage( const QString &message );
private slots: private slots:
void slotServiceUnregistered( const QString& ); void slotServiceUnregistered( const QString& );

Loading…
Cancel
Save