[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeaccessibility/kttsd
From: Jeremy Paul Whiting <jeremy () scitools ! com>
Date: 2009-07-09 21:35:17
Message-ID: 1247175317.072966.16193.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 994007 by whiting:
dont crash when cancelling add talker dialog, switch e-mail address used in \
copyrights
M +1 -1 kcmkttsmgr/addtalker.cpp
M +38 -43 kcmkttsmgr/kcmkttsmgr.cpp
M +1 -1 kttsd/filtermgr.h
M +2 -2 kttsd/main.cpp
M +2 -1 kttsd/speaker.cpp
M +1 -0 kttsd/speaker.h
M +1 -1 kttsjobmgr/kttsjobmgr.cpp
M +1 -1 kttsjobmgr/kttsjobmgr.h
M +2 -2 libkttsd/talkerlistmodel.h
--- trunk/KDE/kdeaccessibility/kttsd/kcmkttsmgr/addtalker.cpp #994006:994007
@@ -3,7 +3,7 @@
Uses addtalkerwidget.ui.
-------------------
Copyright: (C) 2004 by Gary Cramblitt <garycramblitt@comcast.net>
- Copyright: (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ Copyright: (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
--- trunk/KDE/kdeaccessibility/kttsd/kcmkttsmgr/kcmkttsmgr.cpp #994006:994007
@@ -744,57 +744,52 @@
AddTalker* addTalkerWidget = new AddTalker(dlg);
dlg->setMainWidget(addTalkerWidget);
dlg->setHelp("select-plugin", "kttsd");
- int dlgResult = dlg->exec();
- QString languageCode = addTalkerWidget->getLanguageCode();
- QString synthName = addTalkerWidget->getSynthesizer();
- delete dlg;
- kDebug() << "adding talker with language code: " << languageCode << " and synth: \
" << synthName;
-
- // Also delete addTalkerWidget
- if (dlgResult != QDialog::Accepted) {
- delete addTalkerWidget;
- return;
- }
-
- // If user chose "Other", must now get a language from him.
- if(languageCode == "other")
+ if (dlg->exec() == QDialog::Accepted)
{
- QPointer<SelectLanguageDlg> dlg = new SelectLanguageDlg(
- this,
- i18n("Select Language"),
- QStringList(),
- SelectLanguageDlg::SingleSelect,
- SelectLanguageDlg::BlankNotAllowed);
- int dlgResult = dlg->exec();
- languageCode = dlg->selectedLanguageCode();
+ QString languageCode = addTalkerWidget->getLanguageCode();
+ QString synthName = addTalkerWidget->getSynthesizer();
delete dlg;
+ kDebug() << "adding talker with language code: " << languageCode << " and \
synth: " << synthName; + // If user chose "Other", must now get a language \
from him. + if(languageCode == "other")
+ {
+ QPointer<SelectLanguageDlg> dlg = new SelectLanguageDlg(
+ this,
+ i18n("Select Language"),
+ QStringList(),
+ SelectLanguageDlg::SingleSelect,
+ SelectLanguageDlg::BlankNotAllowed);
+ int dlgResult = dlg->exec();
+ languageCode = dlg->selectedLanguageCode();
+ delete dlg;
- // TODO: Also delete QTableWidget and hBox?
- if (dlgResult != QDialog::Accepted)
- return; // got no language
- }
+ // TODO: Also delete QTableWidget and hBox?
+ if (dlgResult != QDialog::Accepted)
+ return; // got no language
+ }
- if (languageCode.isEmpty())
- return;
- QString language = TalkerCode::languageCodeToLanguage(languageCode);
- if (language.isEmpty())
- return;
+ if (languageCode.isEmpty())
+ return;
+ QString language = TalkerCode::languageCodeToLanguage(languageCode);
+ if (language.isEmpty())
+ return;
- m_languagesToCodes[language] = languageCode;
+ m_languagesToCodes[language] = languageCode;
- // Assign a new Talker ID for the talker. Wraps around to 1.
- QString talkerID = QString::number(m_lastTalkerID + 1);
+ // Assign a new Talker ID for the talker. Wraps around to 1.
+ QString talkerID = QString::number(m_lastTalkerID + 1);
- // Erase extraneous Talker configuration entries that might be there.
- m_config->deleteGroup(QString("Talker_")+talkerID, 0);
- m_config->sync();
+ // Erase extraneous Talker configuration entries that might be there.
+ m_config->deleteGroup(QString("Talker_")+talkerID, 0);
+ m_config->sync();
- // Convert translated plugin name to DesktopEntryName.
- QString desktopEntryName = TalkerCode::TalkerNameToDesktopEntryName(synthName);
- // This shouldn't happen, but just in case.
- if (desktopEntryName.isEmpty())
- return;
-
+ // Convert translated plugin name to DesktopEntryName.
+ QString desktopEntryName = \
TalkerCode::TalkerNameToDesktopEntryName(synthName); + // This shouldn't \
happen, but just in case. + if (desktopEntryName.isEmpty())
+ return;
+ }
+ delete dlg;
// Load the plugin.
//m_loadedTalkerPlugIn = loadTalkerPlugin(desktopEntryName);
//if (!m_loadedTalkerPlugIn) return;
--- trunk/KDE/kdeaccessibility/kttsd/kttsd/filtermgr.h #994006:994007
@@ -5,7 +5,7 @@
Copyright:
(C) 2005 by Gary Cramblitt <garycramblitt@comcast.net>
- (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
--- trunk/KDE/kdeaccessibility/kttsd/kttsd/main.cpp #994006:994007
@@ -6,7 +6,7 @@
Copyright:
(C) 2002-2003 by José Pablo Ezequiel "Pupeno" Fernández <pupeno@kde.org>
(C) 2006 by Gary Cramblitt <garycramblitt@comcast.net>
- (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
@@ -42,7 +42,7 @@
"0.5.0", ki18n("Text-to-speech synthesis daemon"),
KAboutData::License_GPL, ki18n("(C) 2002, José Pablo Ezequiel \
Fernández"));
aboutdata.addAuthor(ki18n("José Pablo Ezequiel Fernández"),ki18n("Original \
Author"),"pupeno@pupeno.com");
- aboutdata.addAuthor(ki18n("Jeremy Whiting"), ki18n("Current Maintainer"), \
"jeremy@scitools.com"); + aboutdata.addAuthor(ki18n("Jeremy Whiting"), \
ki18n("Current Maintainer"), "jpwhiting@kde.org");
aboutdata.addAuthor(ki18n("Gary Cramblitt"), ki18n("Previous \
Maintainer"),"garycramblitt@comcast.net");
aboutdata.addAuthor(ki18n("Gunnar Schmi Dt"), \
ki18n("Contributor"),"gunnar@schmi-dt.de");
aboutdata.addAuthor(ki18n("Olaf Schmidt"), \
ki18n("Contributor"),"ojschmidt@kde.org");
--- trunk/KDE/kdeaccessibility/kttsd/kttsd/speaker.cpp #994006:994007
@@ -6,7 +6,7 @@
-------------------
Copyright:
(C) 2006 by Gary Cramblitt <garycramblitt@comcast.net>
- (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
@@ -446,6 +446,7 @@
if (jobNum != -1)
{
+ kDebug() << "incoming job with text: " << text;
kDebug() << "saying post filtered text: " << filteredText;
}
--- trunk/KDE/kdeaccessibility/kttsd/kttsd/speaker.h #994006:994007
@@ -6,6 +6,7 @@
-------------------
Copyright:
(C) 2006 by Gary Cramblitt <garycramblitt@comcast.net>
+ (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
--- trunk/KDE/kdeaccessibility/kttsd/kttsjobmgr/kttsjobmgr.cpp #994006:994007
@@ -3,7 +3,7 @@
advance, change Talker, etc.
-------------------
Copyright : (C) 2004,2005 by Gary Cramblitt <garycramblitt@comcast.net>
- Copyright : (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ Copyright : (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
This program is free software; you can redistribute it and/or modify
--- trunk/KDE/kdeaccessibility/kttsd/kttsjobmgr/kttsjobmgr.h #994006:994007
@@ -3,7 +3,7 @@
advance, change Talker, etc.
-------------------
Copyright : (C) 2004 by Gary Cramblitt <garycramblitt@comcast.net>
- Copyright : (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ Copyright : (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
This program is free software; you can redistribute it and/or modify
--- trunk/KDE/kdeaccessibility/kttsd/libkttsd/talkerlistmodel.h #994006:994007
@@ -2,10 +2,10 @@
Model for listing Talkers, typically in a QTreeView.
-------------------
Copyright : (C) 2005 by Gary Cramblitt <garycramblitt@comcast.net>
- Copyright : (C) 2009 by Jeremy Whiting <jeremy@scitools.com>
+ Copyright : (C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
-------------------
Original author: Gary Cramblitt <garycramblitt@comcast.net>
- Current Maintainer: Jeremy Whiting <jeremy@scitools.com>
+ Current Maintainer: Jeremy Whiting <jpwhiting@kde.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic