Hello community,
here is the log from the commit of package kdeaccessibility4 for openSUSE:Factory
checked in at Tue Dec 14 12:28:47 CET 2010.
--------
--- KDE/kdeaccessibility4/kdeaccessibility4-icons.changes 2010-11-23 00:38:41.000000000 +0100
+++ kdeaccessibility4/kdeaccessibility4-icons.changes 2010-12-14 12:27:52.108130000 +0100
@@ -1,0 +2,9 @@
+Fri Dec 3 17:07:34 CET 2010 - dmueller@suse.de
+
+- update to 4.5.85
+ * KDE 4.6 Beta2
+ * Final Beta before RC, various fixes from Beta1
+ * no upstream changelog available.
+
+
+-------------------------------------------------------------------
kdeaccessibility4.changes: same change
calling whatdependson for head-i586
Old:
----
kdeaccessibility-4.5.80.tar.bz2
New:
----
kdeaccessibility-4.5.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeaccessibility4-icons.spec ++++++
--- /var/tmp/diff_new_pack.Pp4zdc/_old 2010-12-14 12:28:00.000000000 +0100
+++ /var/tmp/diff_new_pack.Pp4zdc/_new 2010-12-14 12:28:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeaccessibility4-icons (Version 4.5.80)
+# spec file for package kdeaccessibility4-icons (Version 4.5.85)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,7 +26,7 @@
Group: System/GUI/KDE
Summary: Monochrome Icon Set for KDE
Url: http://www.kde.org
-Version: 4.5.80
+Version: 4.5.85
Release: 1
Source0: kdeaccessibility-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kdeaccessibility4.spec ++++++
--- /var/tmp/diff_new_pack.Pp4zdc/_old 2010-12-14 12:28:00.000000000 +0100
+++ /var/tmp/diff_new_pack.Pp4zdc/_new 2010-12-14 12:28:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdeaccessibility4 (Version 4.5.80)
+# spec file for package kdeaccessibility4 (Version 4.5.85)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,7 +28,7 @@
Group: System/GUI/KDE
Summary: Base Package for kdeaccessibility apps
Url: http://www.kde.org
-Version: 4.5.80
+Version: 4.5.85
Release: 1
Source0: kdeaccessibility-%version.tar.bz2
Patch: 4_5_BRANCH.diff
++++++ kdeaccessibility-4.5.80.tar.bz2 -> kdeaccessibility-4.5.85.tar.bz2 ++++++
Files old/kdeaccessibility-4.5.80/doc/jovie/index.cache.bz2 and new/kdeaccessibility-4.5.85/doc/jovie/index.cache.bz2 differ
Files old/kdeaccessibility-4.5.80/doc/kmag/index.cache.bz2 and new/kdeaccessibility-4.5.85/doc/kmag/index.cache.bz2 differ
Files old/kdeaccessibility-4.5.80/doc/kmousetool/index.cache.bz2 and new/kdeaccessibility-4.5.85/doc/kmousetool/index.cache.bz2 differ
Files old/kdeaccessibility-4.5.80/doc/kmouth/index.cache.bz2 and new/kdeaccessibility-4.5.85/doc/kmouth/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/filters/stringreplacer/jovie_stringreplacerplugin.desktop new/kdeaccessibility-4.5.85/jovie/filters/stringreplacer/jovie_stringreplacerplugin.desktop
--- old/kdeaccessibility-4.5.80/jovie/filters/stringreplacer/jovie_stringreplacerplugin.desktop 2010-09-27 21:52:06.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/filters/stringreplacer/jovie_stringreplacerplugin.desktop 2010-12-01 23:23:19.000000000 +0100
@@ -69,7 +69,6 @@
Comment[en_GB]=Generic String Replacement Filter Plugin for Jovie
Comment[es]=Complemento de filtro genérico de sustitución de cadenas para Jovie
Comment[et]=Jovie üldine stringiasendusfiltri plugin
-Comment[fr]=Module de filtrage de remplacement de chaînes génériques pour Jovie
Comment[hu]=Általános sztringcserélő modul a Jovie-hoz
Comment[is]=Almennt strengjaútskiptinga-íforrit fyrir Jovie
Comment[it]=Estensione generica per il filtro di sostituzione di stringhe per Jovie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/filters/talkerchooser/jovie_talkerchooserplugin.desktop new/kdeaccessibility-4.5.85/jovie/filters/talkerchooser/jovie_talkerchooserplugin.desktop
--- old/kdeaccessibility-4.5.80/jovie/filters/talkerchooser/jovie_talkerchooserplugin.desktop 2010-09-27 21:52:06.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/filters/talkerchooser/jovie_talkerchooserplugin.desktop 2010-12-01 23:23:19.000000000 +0100
@@ -67,7 +67,6 @@
Comment[en_GB]=Generic Talker Chooser Filter Plugin for Jovie
Comment[es]=Complemento genérico de filtro de selección de locutor para Jovie
Comment[et]=Jovie üldine kõneleja valimise filtri plugin
-Comment[fr]=Module de filtrage de sélection de voix pour Jovie
Comment[hu]=Általános hangkiválasztó modul a Jovie-hoz
Comment[is]=Almennt talvalsíforrit fyrir Jovie
Comment[it]=Estensione generica per il filtro di scelta dell'oratore per Jovie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/filters/xmltransformer/jovie_xmltransformerplugin.desktop new/kdeaccessibility-4.5.85/jovie/filters/xmltransformer/jovie_xmltransformerplugin.desktop
--- old/kdeaccessibility-4.5.80/jovie/filters/xmltransformer/jovie_xmltransformerplugin.desktop 2010-09-27 21:52:06.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/filters/xmltransformer/jovie_xmltransformerplugin.desktop 2010-12-01 23:23:19.000000000 +0100
@@ -67,7 +67,6 @@
Comment[en_GB]=Generic XML Transformation Filter Plugin for Jovie
Comment[es]=Complemento genérico de filtro transformación de XML para Jovie
Comment[et]=Jovie üldine XML-i teisenduse filtri plugin
-Comment[fr]=Module de filtrage de transformation XML générique pour Jovie
Comment[hu]=Általános XML-átalakító modul a Jovie-hoz
Comment[is]=Almennt XML-ummyndunar-íforrit fyrir Jovie
Comment[it]=Estensione generica per il filtro di trasformazione XML per Jovie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/jovie/jovie.desktop new/kdeaccessibility-4.5.85/jovie/jovie/jovie.desktop
--- old/kdeaccessibility-4.5.80/jovie/jovie/jovie.desktop 2010-09-27 21:52:07.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/jovie/jovie.desktop 2010-12-01 23:23:19.000000000 +0100
@@ -15,7 +15,6 @@
Name[en_GB]=Jovie
Name[es]=Jovie
Name[et]=Jovie
-Name[fr]=Jovie
Name[hu]=Jovie
Name[is]=Jovie
Name[it]=Jovie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/jovie/kttsd.desktop new/kdeaccessibility-4.5.85/jovie/jovie/kttsd.desktop
--- old/kdeaccessibility-4.5.80/jovie/jovie/kttsd.desktop 2010-09-27 21:52:07.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/jovie/kttsd.desktop 2010-12-01 23:23:19.000000000 +0100
@@ -15,7 +15,6 @@
Name[en_GB]=Jovie
Name[es]=Jovie
Name[et]=Jovie
-Name[fr]=Jovie
Name[hu]=Jovie
Name[is]=Jovie
Name[it]=Jovie
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/addtalker.cpp new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/addtalker.cpp
--- old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/addtalker.cpp 2010-09-27 21:52:06.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/addtalker.cpp 2010-12-01 23:23:19.000000000 +0100
@@ -38,7 +38,7 @@
{
this->setCaption(i18n("Add Talker"));
this->setButtons(KDialog::Help|KDialog::Ok|KDialog::Cancel);
- this->setDefaultButton(KDialog::Cancel);
+ this->setDefaultButton(KDialog::Ok);
this->enableButtonOk(false);
this->setHelp(QLatin1String( "select-plugin" ), QLatin1String( "jovie" ));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/kcmkttsmgr.cpp new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/kcmkttsmgr.cpp
--- old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/kcmkttsmgr.cpp 2010-09-27 21:52:06.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/kcmkttsmgr.cpp 2010-12-01 23:23:19.000000000 +0100
@@ -1159,57 +1159,24 @@
*/
void KCMKttsMgr::slotConfigureTalkerButton_clicked()
{
- //// Get highlighted plugin from Talker ListView and load into memory.
- //QModelIndex modelIndex = talkersView->currentIndex();
- //if (!modelIndex.isValid()) return;
- //TalkerCode tc = m_talkerListModel.getRow(modelIndex.row());
- //QString talkerID = tc.id();
- //QString synthName = tc.plugInName();
- //QString desktopEntryName = tc.desktopEntryName();
- //QString languageCode = tc.fullLanguageCode();
- //m_loadedTalkerPlugIn = loadTalkerPlugin(desktopEntryName);
- //if (!m_loadedTalkerPlugIn) return;
- //// kDebug() << "KCMKttsMgr::slotConfigureTalkerButton_clicked: plugin for " << synthName << " loaded successfully.";
-
- //// Tell plugin to load its configuration.
- //m_loadedTalkerPlugIn->setDesiredLanguage(languageCode);
- //// kDebug() << "KCMKttsMgr::slotConfigureTalkerButton_clicked: about to call plugin load() method with Talker ID = " << talkerID;
- //m_loadedTalkerPlugIn->load(m_config, QString("Talker_")+talkerID);
-
- //// Display configuration dialog.
- //configureTalker();
-
- //// Did user Cancel?
- //if (!m_loadedTalkerPlugIn)
- //{
- // delete m_configDlg;
- // m_configDlg = 0;
- // return;
- //}
-
- //// Get Talker Code. Note that plugin may return a code different from before.
- //QString talkerCode = m_loadedTalkerPlugIn->getTalkerCode();
-
- //// If plugin was successfully configured, save its configuration.
- //if (!talkerCode.isEmpty())
- //{
- // m_loadedTalkerPlugIn->save(m_config, QString("Talker_")+talkerID);
- // talkerCode = TalkerCode::normalizeTalkerCode(talkerCode, languageCode);
- // KConfigGroup talkerConfig(m_config, QString("Talker_")+talkerID);
- // talkerConfig.writeEntry("TalkerCode", talkerCode);
- // m_config->sync();
-
- // // Update display.
- // tc.setTalkerCode(talkerCode);
- // m_talkerListModel.updateRow(modelIndex.row(), tc);
- // // Inform Control Center that configuration has changed.
- // configChanged();
- //}
-
- //delete m_loadedTalkerPlugIn;
- //m_loadedTalkerPlugIn = 0;
- //delete m_configDlg;
- //m_configDlg = 0;
+ // Get highlighted Talker from ListView.
+ QModelIndex modelIndex = talkersView->currentIndex();
+
+ if (!modelIndex.isValid())
+ return;
+
+ TalkerCode tc = m_talkerListModel.getRow(modelIndex.row());
+
+ QPointer<AddTalker> dlg = new AddTalker (this);
+ dlg->setTalkerCode(tc);
+ if (dlg->exec() == QDialog::Accepted) {
+ TalkerCode code = dlg->getTalkerCode();
+
+ // Change the existing talker code to this new code.
+ m_talkerListModel.updateRow(modelIndex.row(), code);
+
+ configChanged();
+ }
}
void KCMKttsMgr::slotConfigureFilterButton_clicked()
@@ -1286,34 +1253,6 @@
}
/**
-* Display talker configuration dialog. The plugin is assumed already loaded into
-* memory referenced by m_loadedTalkerPlugIn.
-*/
-void KCMKttsMgr::configureTalker()
-{
- //if (!m_loadedTalkerPlugIn) return;
- //m_configDlg = new KDialog(this);
- //m_configDlg->setCaption(i18n("Talker Configuration"));
- //m_configDlg->setButtons(KDialog::Help|KDialog::Default|KDialog::Ok|KDialog::Cancel);
- //m_configDlg->setDefaultButton(KDialog::Cancel);
- ////m_configDlg->setMainWidget(m_loadedTalkerPlugIn);
- //m_configDlg->setHelp("configure-plugin", "jovie");
- //m_configDlg->enableButtonOk(false);
- //connect(m_loadedTalkerPlugIn, SIGNAL( changed(bool) ), this, SLOT( slotConfigTalkerDlg_ConfigChanged() ));
- //connect(m_configDlg, SIGNAL( defaultClicked() ), this, SLOT( slotConfigTalkerDlg_DefaultClicked() ));
- //connect(m_configDlg, SIGNAL( cancelClicked() ), this, SLOT (slotConfigTalkerDlg_CancelClicked() ));
- //// Create a Player object for the plugin to use for testing.
- //int playerOption = 0;
- //QString sinkName;
- //// kDebug() << "KCMKttsMgr::configureTalker: playerOption = " << playerOption << " audioStretchFactor = " << audioStretchFactor << " sink name = " << sinkName;
- ////TestPlayer* testPlayer = new TestPlayer(this, "ktts_testplayer",
- //// playerOption, audioStretchFactor, sinkName);
- ////m_loadedTalkerPlugIn->setPlayer(testPlayer);
- //// Display the dialog.
- //m_configDlg->exec();
-}
-
-/**
* Display filter configuration dialog. The plugin is assumed already loaded into
* memory referenced by m_loadedFilterPlugIn.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/kcmkttsmgr.h new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/kcmkttsmgr.h
--- old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/kcmkttsmgr.h 2010-05-27 19:24:57.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/kcmkttsmgr.h 2010-12-01 23:23:19.000000000 +0100
@@ -207,11 +207,6 @@
KttsFilterConf* loadFilterPlugin(const QString& plugInName);
/**
- * Display the Talker Configuration Dialog.
- */
- void configureTalker();
-
- /**
* Display the Filter Configuration Dialog.
*/
void configureFilterItem();
@@ -281,11 +276,6 @@
KDialog* m_configDlg;
/**
- * Talker(synth) Plugin currently loaded into configuration dialog.
- */
- //PlugInConf *m_loadedTalkerPlugIn;
-
- /**
* Filter Plugin currently loaded into configuration dialog.
*/
KttsFilterConf *m_loadedFilterPlugIn;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/talkerwidget.cpp new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/talkerwidget.cpp
--- old/kdeaccessibility-4.5.80/jovie/kcmkttsmgr/talkerwidget.cpp 2010-09-27 21:52:06.000000000 +0200
+++ new/kdeaccessibility-4.5.85/jovie/kcmkttsmgr/talkerwidget.cpp 2010-12-01 23:23:19.000000000 +0100
@@ -24,6 +24,7 @@
#include "talkerwidget.h"
// Qt includes.
+#include