[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeaccessibility/kttsd
From:       Gary Cramblitt <garycramblitt () comcast ! net>
Date:       2005-03-03 4:22:28
Message-ID: 20050303042228.47CE51751E () office ! kde ! org
[Download RAW message or body]

CVS commit by cramblitt: 

Allow to remove any Filter.


  M +1 -0      ChangeLog   1.77
  M +1 -21     kcmkttsmgr/kcmkttsmgr.cpp   1.69


--- kdeaccessibility/kttsd/ChangeLog  #1.76:1.77
@@ -2,4 +2,5 @@
         * BUG:100600 Fix for messages and warnings not spoken when text job is paused.
         * Bug.  Talker Chooser claims it can autoconfigure itself, but it cannot really.
+        * Allow to remove any Filter.
 
 2005-02-17  Gary Cramblitt (PhantomsDad)

--- kdeaccessibility/kttsd/kcmkttsmgr/kcmkttsmgr.cpp  #1.68:1.69
@@ -1410,18 +1410,4 @@ void KCMKttsMgr::removeFilter( bool sbd 
 //    m_config->deleteGroup("Filter_"+filterID, true, false);
 
-    // If this is the only instance of a multi-instance plugin, or it is a single-instance plugin,
-    // instead of deleting it, uncheck it.
-    bool multiInstance = (itemToRemove->text(flvcMultiInstance) == "T");
-    QString filterPlugInName = itemToRemove->text(flvcPlugInName);
-    if (!sbd)
-    {
-        if (!multiInstance || countFilterPlugins(filterPlugInName) <= 1)
-        {
-            dynamic_cast<QCheckListItem*>(itemToRemove)->setOn(false);
-            configChanged();
-            return;
-        }
-    }
-
     // Delete the filter from list view.
     delete itemToRemove;
@@ -1530,10 +1516,4 @@ void KCMKttsMgr::updateFilterButtons(){
     QListViewItem* item = m_kttsmgrw->filtersList->selectedItem();
     if (item) {
-        // Disable Remove button if single-instance or last of multi-instance plugin.
-        bool multiInstance = (item->text(flvcMultiInstance) == "T");
-        QString filterPlugInName = item->text(flvcPlugInName);
-        if (!multiInstance || countFilterPlugins(filterPlugInName) <= 1)
-            m_kttsmgrw->removeFilterButton->setEnabled(false);
-        else
             m_kttsmgrw->removeFilterButton->setEnabled(true);
         m_kttsmgrw->configureFilterButton->setEnabled(true);


[prev in list] [next in list] [prev in thread] [next in thread]