[SCM] KDE Accessibility module packaging branch, master, updated. debian/4.4.5-4-34-g91d2de6
Pino Toscano
pino-guest at alioth.debian.org
Fri Apr 15 13:45:49 UTC 2011
The following commit has been merged in the master branch:
commit 91d2de6fe1b641939e2e5c59b163ae62e04613fc
Author: Pino Toscano <pino at kde.org>
Date: Fri Apr 15 15:44:41 2011 +0200
extract scrolling when adding fix from kcmkttsd_support_talker_editing.diff
... to a new jovie_scroll_when_add.diff.
remove kcmkttsd_support_talker_editing.diff, no more useful now
---
debian/changelog | 5 +-
debian/patches/jovie_scroll_when_add.diff | 19 +++
.../patches/kcmkttsd_support_talker_editing.diff | 143 --------------------
debian/patches/series | 1 +
4 files changed, 23 insertions(+), 145 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c42a50..ea40077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,8 @@ kdeaccessibility (4:4.6.2-0r0) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Remove backport_kttsd_1072198_1138400.diff, no longer needed.
- * Disable the following patches:
+ * Disable the following patch:
- kcmkttsd_permanent_settings_jobmgr_fixes.diff
- - kcmkttsd_support_talker_editing.diff
* Rename kttsd package as jovie.
- TODO: fix description, update jovie.README.Debian
* Update installed files.
@@ -24,6 +23,8 @@ kdeaccessibility (4:4.6.2-0r0) UNRELEASED; urgency=low
* Remove unused build dependencies:
- libasound2-dev
* Add kaccessible as dependency of the kdeaccessibility meta package.
+ * Extract the last useful part from kcmkttsd_support_talker_editing.diff to
+ a new jovie_scroll_when_add.diff, and remove the former patch.
[ Modestas Vainius ]
* Switch debian/rules engine to dhmk based qt-kde-team/2/*.
diff --git a/debian/patches/jovie_scroll_when_add.diff b/debian/patches/jovie_scroll_when_add.diff
new file mode 100644
index 0000000..7f52100
--- /dev/null
+++ b/debian/patches/jovie_scroll_when_add.diff
@@ -0,0 +1,19 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Fix scrolling when adding a talker
+Last-Update: 2011-04-15
+Origin: vendor
+Forwarded: no
+
+This fixes the scrolling to a new talker row after adding a new one.
+
+--- a/jovie/kcmkttsmgr/kcmkttsmgr.cpp
++++ b/jovie/kcmkttsmgr/kcmkttsmgr.cpp
+@@ -733,7 +733,7 @@
+ m_talkerListModel.appendRow (code);
+
+ // Make sure visible.
+- const QModelIndex modelIndex = m_talkerListModel.index (m_talkerListModel.rowCount(),
++ const QModelIndex modelIndex = m_talkerListModel.index (m_talkerListModel.rowCount()-1,
+ 0, QModelIndex());
+ talkersView->scrollTo (modelIndex);
+
diff --git a/debian/patches/kcmkttsd_support_talker_editing.diff b/debian/patches/kcmkttsd_support_talker_editing.diff
deleted file mode 100644
index 7a3ba5e..0000000
--- a/debian/patches/kcmkttsd_support_talker_editing.diff
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Subject: Make "Edit talker" functional again
-Last-Update: 2010-12-04
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599825
-Origin: vendor
-Forwarded: no
-
-This makes "Edit talker" button in KTTS talker configuration dialog work again.
-"Edit" support is based on "Add talker" support and reuses its dialog and
-majority of support code.
-
---- a/kttsd/kcmkttsmgr/addtalker.cpp
-+++ b/kttsd/kcmkttsmgr/addtalker.cpp
-@@ -37,16 +37,21 @@
- #include <kmessagebox.h>
-
- #include "kspeechinterface.h"
-+#include "talkercode.h"
-
- #include "ui_addtalkerwidget.h"
-
- const int kLanguageColumn = 0;
- const int kSynthesizerColumn = 1;
-
--AddTalker::AddTalker(QWidget* parent)
-+AddTalker::AddTalker(QWidget* parent, TalkerCode const * initTc)
- : KDialog(parent)
- {
-- this->setCaption(i18n("Add Talker"));
-+ if (initTc)
-+ this->setCaption(i18n("Edit Talker"));
-+ else
-+ this->setCaption(i18n("Add Talker"));
-+
- this->setButtons(KDialog::Help|KDialog::Ok|KDialog::Cancel);
- this->setDefaultButton(KDialog::Cancel);
- this->enableButtonOk(false);
-@@ -67,7 +72,10 @@ AddTalker::AddTalker(QWidget* parent)
- QString fullLanguageCode = KGlobal::locale()->defaultLanguage();
- QString languageCode;
- QString countryCode;
-- TalkerCode::splitFullLanguageCode(fullLanguageCode, languageCode, countryCode);
-+ if (initTc)
-+ languageCode = initTc->language();
-+ else
-+ TalkerCode::splitFullLanguageCode(fullLanguageCode, languageCode, countryCode);
-
- QTableWidgetItem * defaultItem = 0;
-
-@@ -85,7 +93,8 @@ AddTalker::AddTalker(QWidget* parent)
- mUi->AvailableTalkersTable->setItem(rowcount, kSynthesizerColumn, item);
-
- QString langName = TalkerCode::languageCodeToLanguage(language);
-- if (language == languageCode)
-+ if (!defaultItem && language == languageCode &&
-+ (!initTc || initTc->outputModule() == module))
- {
- defaultItem = item;
- }
-@@ -107,6 +116,16 @@ AddTalker::AddTalker(QWidget* parent)
- {
- mUi->AvailableTalkersTable->setCurrentItem(defaultItem);
- }
-+
-+ // Set name, voice, volume, speed, pitch, from initTc if available
-+ if (initTc)
-+ {
-+ mUi->nameEdit->setText(initTc->name());
-+ mUi->voiceComboBox->setCurrentIndex(initTc->voiceType() - 1);
-+ mUi->volumeSlider->setValue(initTc->volume());
-+ mUi->speedSlider->setValue(initTc->rate());
-+ mUi->pitchSlider->setValue(initTc->pitch());
-+ }
- }
-
- AddTalker::~AddTalker()
---- a/kttsd/kcmkttsmgr/addtalker.h
-+++ b/kttsd/kcmkttsmgr/addtalker.h
-@@ -33,6 +33,8 @@
-
- #include "../libkttsd/talkercode.h"
-
-+class TalkerCode;
-+
- namespace Ui
- {
- class AddTalkerWidget;
-@@ -48,7 +50,7 @@ public:
- * @param parent Inherited KDialog parameter.
- * @param name Inherited KDialog parameter.
- */
-- explicit AddTalker(QWidget* parent = 0);
-+ explicit AddTalker(QWidget* parent = 0, TalkerCode const * initTc = 0);
-
- /**
- * Destructor.
---- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
-+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
-@@ -766,7 +766,7 @@ void KCMKttsMgr::slotAddTalkerButton_cli
- m_talkerListModel.appendRow(code);
-
- // Make sure visible.
-- const QModelIndex modelIndex = m_talkerListModel.index(m_talkerListModel.rowCount(),
-+ const QModelIndex modelIndex = m_talkerListModel.index(m_talkerListModel.rowCount()-1,
- 0, QModelIndex());
- talkersView->scrollTo(modelIndex);
-
-@@ -1225,10 +1225,31 @@ void KCMKttsMgr::kttsdExiting()
- */
- 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());
-+ // 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());
-+
-+ QPointer<AddTalker> dlg = new AddTalker(this, &tc);
-+ if (dlg->exec() == QDialog::Accepted) {
-+ int row = modelIndex.row();
-+ TalkerCode code = dlg->getTalkerCode();
-+ m_talkerListModel.updateRow(row, code);
-+
-+ // Make sure visible.
-+ const QModelIndex newIndex = m_talkerListModel.index(row, 0);
-+ talkersView->scrollTo(newIndex);
-+
-+ // Select the new item, update buttons.
-+ talkersView->setCurrentIndex(newIndex);
-+ updateTalkerButtons();
-+
-+ // Inform Control Center that change has been made.
-+ configChanged();
-+ }
-+ delete dlg;
-+
-+ kDebug() << "KCMKttsMgr::configureTalker: done.";
- //QString talkerID = tc.id();
- //QString synthName = tc.plugInName();
- //QString desktopEntryName = tc.desktopEntryName();
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..df444c3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+jovie_scroll_when_add.diff
--
KDE Accessibility module packaging
More information about the pkg-kde-commits
mailing list