- load() is called implicitely when the kcm is shown.

- It's not necessary to add the collection each time load is called. Prevents
          the shortcuts from beeing shown 2 times. Mmmhh Why here only 2times and
          3times with the others?
        - the readSettings and writeSettings calls aren't necessary since the
          actionCollection contains only global shortcuts and these are saved by
          the kdedglobalaccel daemon (correct Andreas?).
        - Fix the default button.

svn path=/trunk/KDE/kdebase/workspace/; revision=815405
This commit is contained in:
Michael Jansen 2008-06-01 17:42:14 +00:00
parent 87124b4cce
commit a9d4fed3d3

View file

@ -71,7 +71,8 @@ ThumbnailAsideEffectConfig::ThumbnailAsideEffectConfig(QWidget* parent, const QV
a->setGlobalShortcut(KShortcut(Qt::META + Qt::CTRL + Qt::Key_T)); a->setGlobalShortcut(KShortcut(Qt::META + Qt::CTRL + Qt::Key_T));
a->setProperty("isConfigurationAction", true); a->setProperty("isConfigurationAction", true);
load(); m_ui->editor->addCollection(m_actionCollection);
} }
ThumbnailAsideEffectConfig::~ThumbnailAsideEffectConfig() ThumbnailAsideEffectConfig::~ThumbnailAsideEffectConfig()
@ -95,9 +96,6 @@ void ThumbnailAsideEffectConfig::load()
m_ui->spinSpacing->setValue(spacing); m_ui->spinSpacing->setValue(spacing);
m_ui->spinOpacity->setValue(opacity); m_ui->spinOpacity->setValue(opacity);
m_actionCollection->readSettings();
m_ui->editor->addCollection(m_actionCollection);
emit changed(false); emit changed(false);
} }
@ -127,7 +125,10 @@ void ThumbnailAsideEffectConfig::defaults()
m_ui->spinWidth->setValue(200); m_ui->spinWidth->setValue(200);
m_ui->spinSpacing->setValue(10); m_ui->spinSpacing->setValue(10);
m_ui->spinOpacity->setValue(50); m_ui->spinOpacity->setValue(50);
m_ui->editor->allDefault();
emit changed(true); emit changed(true);
} }