diff options
Diffstat (limited to 'src/frontend/settingsdialogs/btfontsettings.cpp')
| -rw-r--r-- | src/frontend/settingsdialogs/btfontsettings.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/frontend/settingsdialogs/btfontsettings.cpp b/src/frontend/settingsdialogs/btfontsettings.cpp index 77a8b0b..57a8aba 100644 --- a/src/frontend/settingsdialogs/btfontsettings.cpp +++ b/src/frontend/settingsdialogs/btfontsettings.cpp @@ -2,7 +2,7 @@ * * This file is part of BibleTime's source code, http://www.bibletime.info/. * -* Copyright 1999-2011 by the BibleTime developers. +* Copyright 1999-2014 by the BibleTime developers. * The BibleTime source code is licensed under the GNU General Public License version 2.0. * **********/ @@ -16,11 +16,13 @@ #include <QLabel> #include <QVBoxLayout> #include <QWidget> +#include "backend/config/btconfig.h" +#include "bibletimeapp.h" #include "frontend/settingsdialogs/btfontchooserwidget.h" #include "frontend/settingsdialogs/cconfigurationdialog.h" #include "util/cresmgr.h" +#include "util/geticon.h" #include "util/tool.h" -#include "util/directory.h" // Sword includes: #include <localemgr.h> @@ -28,10 +30,8 @@ BtFontSettingsPage::BtFontSettingsPage(CConfigurationDialog *parent) - : BtConfigDialog::Page(util::directory::getIcon(CResMgr::settings::fonts::icon), parent) + : BtConfigDialog::Page(util::getIcon(CResMgr::settings::fonts::icon), parent) { - namespace DU = util::directory; - m_languageLabel = new QLabel(this); m_languageComboBox = new QComboBox(this); m_languageLabel->setBuddy(m_languageComboBox); @@ -58,13 +58,13 @@ BtFontSettingsPage::BtFontSettingsPage(CConfigurationDialog *parent) ? &L::abbrev : &L::translatedName; - m_fontMap.insert((l->*f)(), CBTConfig::get(l)); + m_fontMap.insert((l->*f)(), btConfig().getFontForLanguage(*l)); } for (FontMap::ConstIterator it = m_fontMap.constBegin(); it != m_fontMap.constEnd(); ++it) { const QString &k = it.key(); if (m_fontMap[k].first) { // show font icon - m_languageComboBox->addItem(DU::getIcon("fonts.svg"), k); + m_languageComboBox->addItem(util::getIcon("fonts.svg"), k); } else { // don't show icon for font m_languageComboBox->addItem(k); } @@ -84,7 +84,7 @@ BtFontSettingsPage::BtFontSettingsPage(CConfigurationDialog *parent) connect(m_languageComboBox, SIGNAL(activated(const QString&)), this, SLOT(newDisplayWindowFontAreaSelected(const QString&))); - const CBTConfig::FontSettingsPair &v = m_fontMap.value(m_languageComboBox->currentText()); + const BtConfig::FontSettingsPair &v = m_fontMap.value(m_languageComboBox->currentText()); m_fontChooser->setFont(v.second); useOwnFontClicked(v.first); m_languageCheckBox->setChecked(v.first); @@ -116,12 +116,12 @@ void BtFontSettingsPage::save() const { // We possibly use a language, for which we have only the abbrevation if (!lang->abbrev().isEmpty()) { // Create a temp language: - CLanguageMgr::Language l(k, k, k); - CBTConfig::set(&l, it.value()); + const CLanguageMgr::Language l(k, k, k); + btConfig().setFontForLanguage(l, it.value()); } } else { - CBTConfig::set(lang, it.value()); + btConfig().setFontForLanguage(*lang, it.value()); } } } @@ -129,23 +129,21 @@ void BtFontSettingsPage::save() const { void BtFontSettingsPage::newDisplayWindowFontSelected(const QFont &newFont) { const QString languageName = m_languageComboBox->currentText(); m_fontMap.insert(languageName, - CBTConfig::FontSettingsPair(m_fontMap[languageName].first, newFont)); + BtConfig::FontSettingsPair(m_fontMap[languageName].first, newFont)); } void BtFontSettingsPage::newDisplayWindowFontAreaSelected(const QString &usage) { - const CBTConfig::FontSettingsPair &p = m_fontMap[usage]; + const BtConfig::FontSettingsPair &p = m_fontMap[usage]; useOwnFontClicked(p.first); m_languageCheckBox->setChecked(p.first); m_fontChooser->setFont(p.second); } void BtFontSettingsPage::useOwnFontClicked(bool isOn) { - namespace DU = util::directory; - m_fontChooser->setEnabled(isOn); m_fontMap[m_languageComboBox->currentText()].first = isOn; m_languageComboBox->setItemIcon(m_languageComboBox->currentIndex(), - isOn ? DU::getIcon("fonts.svg") : QIcon()); + isOn ? util::getIcon("fonts.svg") : QIcon()); } void BtFontSettingsPage::retranslateUi() { |