Imported Upstream version 2.8.1

1 files changed, 19 insertions, 22 deletions

diff --git a/src/frontend/settingsdialogs/cacceleratorsettings.cpp b/src/frontend/settingsdialogs/cacceleratorsettings.cpp
index 636b9cc..15394fb 100644
--- a/src/frontend/settingsdialogs/cacceleratorsettings.cpp
+++ b/src/frontend/settingsdialogs/cacceleratorsettings.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2009 by the BibleTime developers.
+* Copyright 1999-2011 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -26,12 +26,14 @@
 #include "frontend/displaywindow/clexiconreadwindow.h"
 #include "frontend/displaywindow/creadwindow.h"
 #include "util/cresmgr.h"
+#include "util/directory.h"
 
 
-CAcceleratorSettingsPage::CAcceleratorSettingsPage(QWidget* /* parent */ )
-        : BtConfigPage() {
-    QVBoxLayout* mainLayout = new QVBoxLayout(this);
-    this->setLayout(mainLayout);
+CAcceleratorSettingsPage::CAcceleratorSettingsPage(QWidget *parent)
+        : BtConfigPage(parent)
+{
+    Q_ASSERT(qobject_cast<QVBoxLayout*>(layout()) != 0);
+    QVBoxLayout *mainLayout = static_cast<QVBoxLayout*>(layout());
 
     QHBoxLayout* layoutForWindowTypeChooser = new QHBoxLayout();
     mainLayout->addLayout(layoutForWindowTypeChooser);
@@ -97,7 +99,7 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(QWidget* /* parent */ )
     // ----- Commentary windows ------ //
     m_commentary.actionCollection = new BtActionCollection(this);
     CCommentaryReadWindow::insertKeyboardActions( m_commentary.actionCollection);
-    CBTConfig::setupAccelSettings(CBTConfig::commentaryWindow,	m_commentary.actionCollection);
+    CBTConfig::setupAccelSettings(CBTConfig::commentaryWindow,    m_commentary.actionCollection);
     m_commentary.keyChooser = new BtShortcutsEditor(m_commentary.actionCollection, m_keyChooserStack);
     m_keyChooserStack->addWidget(m_commentary.keyChooser);
     ok = connect(m_commentary.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
@@ -108,7 +110,7 @@ CAcceleratorSettingsPage::CAcceleratorSettingsPage(QWidget* /* parent */ )
     m_lexicon.actionCollection = new BtActionCollection(this);
     CLexiconReadWindow::insertKeyboardActions(  m_lexicon.actionCollection );
     CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, m_lexicon.actionCollection);
-    m_lexicon.keyChooser = new BtShortcutsEditor(m_lexicon.actionCollection, m_keyChooserStack										 );
+    m_lexicon.keyChooser = new BtShortcutsEditor(m_lexicon.actionCollection, m_keyChooserStack                                         );
     m_keyChooserStack->addWidget(m_lexicon.keyChooser);
     ok = connect(m_lexicon.keyChooser, SIGNAL(keyChangeRequest(BtShortcutsEditor*, const QString&)),
                  this, SLOT(completeKeyChangeRequest(BtShortcutsEditor*, const QString&)));
@@ -195,7 +197,7 @@ QString CAcceleratorSettingsPage::getTitleForEditor(BtShortcutsEditor* editor) {
         return m_lexicon.title;
     if (editor == m_book.keyChooser)
         return m_book.title;
-    return QString();
+    return QString::null;
 }
 
 // Gets list of shortcuts editors that can conflict with a key change in the current shortcut editor
@@ -230,12 +232,12 @@ void CAcceleratorSettingsPage::save() {
     if (m_book.keyChooser)
         m_book.keyChooser->commitChanges();
 
-    CBTConfig::saveAccelSettings(CBTConfig::application, m_application.actionCollection);		//application
-    CBTConfig::saveAccelSettings(CBTConfig::allWindows, m_general.actionCollection);			//read display windows
-    CBTConfig::saveAccelSettings(CBTConfig::bibleWindow, m_bible.actionCollection);				//bible
-    CBTConfig::saveAccelSettings(CBTConfig::commentaryWindow, m_commentary.actionCollection);	//commentary
-    CBTConfig::saveAccelSettings(CBTConfig::lexiconWindow, m_lexicon.actionCollection);			//lexicon
-    CBTConfig::saveAccelSettings(CBTConfig::bookWindow,	m_book.actionCollection);				//book
+    CBTConfig::saveAccelSettings(CBTConfig::application, m_application.actionCollection);        //application
+    CBTConfig::saveAccelSettings(CBTConfig::allWindows, m_general.actionCollection);            //read display windows
+    CBTConfig::saveAccelSettings(CBTConfig::bibleWindow, m_bible.actionCollection);                //bible
+    CBTConfig::saveAccelSettings(CBTConfig::commentaryWindow, m_commentary.actionCollection);    //commentary
+    CBTConfig::saveAccelSettings(CBTConfig::lexiconWindow, m_lexicon.actionCollection);            //lexicon
+    CBTConfig::saveAccelSettings(CBTConfig::bookWindow,    m_book.actionCollection);                //book
 }
 
 void CAcceleratorSettingsPage::slotKeyChooserTypeChanged(const QString& title) {
@@ -246,15 +248,10 @@ void CAcceleratorSettingsPage::slotKeyChooserTypeChanged(const QString& title) {
 
 }
 
-QString CAcceleratorSettingsPage::iconName() {
-    return CResMgr::settings::keys::icon;
+const QIcon &CAcceleratorSettingsPage::icon() const {
+    return util::directory::getIcon(CResMgr::settings::keys::icon);
 }
 
-QString CAcceleratorSettingsPage::label() {
-    //: Empty string, don't translate
-    return tr("");
-}
-
-QString CAcceleratorSettingsPage::header() {
+QString CAcceleratorSettingsPage::header() const {
     return tr("Shortcuts");
 }