Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-11-10 11:22:12 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-11-10 12:37:15 (GMT) |
| commit | 94ec9c25311f8d54519f045205d58526d885412a (patch) | |
| tree | 423bf068441e7314e8736622f53dc2ce42f2244c /Swift/QtUI/QtSpellCheckerWindow.cpp | |
| parent | d2ba1ab8a36333523bf794c23226bd044e1717c2 (diff) | |
| download | swift-94ec9c25311f8d54519f045205d58526d885412a.zip swift-94ec9c25311f8d54519f045205d58526d885412a.tar.bz2 | |
Move Qt specific setting constants to QtUISettingConstants.h
Test-Information:
Builds on macOS 10.12.1, ./scons test=all passes, Swift
successfully logins and remembered Trellis configuration.
Change-Id: Id94d6af1448d44d7d46ba2b8606f3e5ebe98be7a
Diffstat (limited to 'Swift/QtUI/QtSpellCheckerWindow.cpp')
| -rw-r--r-- | Swift/QtUI/QtSpellCheckerWindow.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Swift/QtUI/QtSpellCheckerWindow.cpp b/Swift/QtUI/QtSpellCheckerWindow.cpp index ed7e7e8..a8178c4 100644 --- a/Swift/QtUI/QtSpellCheckerWindow.cpp +++ b/Swift/QtUI/QtSpellCheckerWindow.cpp @@ -1,101 +1,98 @@ /* * Copyright (c) 2011 Vlad Voicu * Licensed under the Simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ /* * Copyright (c) 2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swift/QtUI/QtSpellCheckerWindow.h> #include <QCoreApplication> #include <QDir> #include <QFileDialog> #include <QStringList> #include <QTimer> #include <Swiften/Base/Log.h> -#include <Swift/Controllers/SettingConstants.h> -#include <Swift/Controllers/Settings/SettingsProvider.h> - #include <Swift/QtUI/QtSwiftUtil.h> #include <Swift/QtUI/QtUISettingConstants.h> namespace Swift { QtSpellCheckerWindow::QtSpellCheckerWindow(SettingsProvider* settings, QWidget* parent) : QDialog(parent) { settings_ = settings; ui_.setupUi(this); #ifdef HAVE_HUNSPELL ui_.hunspellOptions->show(); #else ui_.hunspellOptions->hide(); QTimer::singleShot(0, this, SLOT(shrinkWindow())); #endif connect(ui_.spellChecker, SIGNAL(toggled(bool)), this, SLOT(handleChecker(bool))); connect(ui_.cancel, SIGNAL(clicked()), this, SLOT(handleCancel())); connect(ui_.apply, SIGNAL(clicked()), this, SLOT(handleApply())); setFromSettings(); } void QtSpellCheckerWindow::shrinkWindow() { resize(0,0); } void QtSpellCheckerWindow::setFromSettings() { - ui_.spellChecker->setChecked(settings_->getSetting(SettingConstants::SPELL_CHECKER)); - setEnabled(settings_->getSetting(SettingConstants::SPELL_CHECKER)); + ui_.spellChecker->setChecked(settings_->getSetting(QtUISettingConstants::SPELL_CHECKER)); + setEnabled(settings_->getSetting(QtUISettingConstants::SPELL_CHECKER)); } void QtSpellCheckerWindow::setSupportedLanguages(const std::vector<std::string>& languages) { languageItems_.clear(); ui_.languageView->clear(); for (const auto& shortLang : languages) { auto locale = QLocale(P2QSTRING(shortLang)); auto label = QString("%1 ( %2 )").arg(locale.nativeLanguageName(), locale.nativeCountryName()); QListWidgetItem* item = new QListWidgetItem(label); item->setData(Qt::UserRole, P2QSTRING(shortLang)); languageItems_[shortLang] = item; ui_.languageView->addItem(item); } } void QtSpellCheckerWindow::setActiveLanguage(const std::string& language) { SWIFT_LOG_ASSERT(languageItems_.find(language) != languageItems_.end(), warning) << "Language '" << language << "' is not available." << std::endl; if (languageItems_.find(language) != languageItems_.end()) { languageItems_[language]->setSelected(true); } } void QtSpellCheckerWindow::setAutomaticallyIdentifiesLanguage(bool isAutomaticallyIdentifying) { ui_.languageView->setHidden(isAutomaticallyIdentifying); } void QtSpellCheckerWindow::handleChecker(bool state) { setEnabled(state); } void QtSpellCheckerWindow::setEnabled(bool state) { ui_.language->setEnabled(state); } void QtSpellCheckerWindow::handleApply() { - settings_->storeSetting(SettingConstants::SPELL_CHECKER, ui_.spellChecker->isChecked()); + settings_->storeSetting(QtUISettingConstants::SPELL_CHECKER, ui_.spellChecker->isChecked()); QList<QListWidgetItem* > selectedLanguage = ui_.languageView->selectedItems(); if (!selectedLanguage.empty()) { - settings_->storeSetting(SettingConstants::SPELL_CHECKER_LANGUAGE, Q2PSTRING(selectedLanguage.first()->data(Qt::UserRole).toString())); + settings_->storeSetting(QtUISettingConstants::SPELL_CHECKER_LANGUAGE, Q2PSTRING(selectedLanguage.first()->data(Qt::UserRole).toString())); } this->done(0); } void QtSpellCheckerWindow::handleCancel() { this->done(0); } } |