diff options
Diffstat (limited to 'src/frontend/displaywindow/clexiconreadwindow.cpp')
| -rw-r--r-- | src/frontend/displaywindow/clexiconreadwindow.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/frontend/displaywindow/clexiconreadwindow.cpp b/src/frontend/displaywindow/clexiconreadwindow.cpp index 7d76293..3b76f38 100644 --- a/src/frontend/displaywindow/clexiconreadwindow.cpp +++ b/src/frontend/displaywindow/clexiconreadwindow.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. * **********/ @@ -17,13 +17,10 @@ #include <QDebug> #include "bibletime.h" -#include "backend/config/cbtconfig.h" #include "backend/keys/cswordldkey.h" #include "backend/keys/cswordkey.h" #include "frontend/cexportmanager.h" #include "frontend/display/bthtmlreaddisplay.h" -#include "frontend/display/cdisplay.h" -#include "frontend/display/creaddisplay.h" #include "frontend/displaywindow/btactioncollection.h" #include "frontend/displaywindow/bttoolbarpopupaction.h" #include "frontend/displaywindow/btdisplaysettingsbutton.h" @@ -36,7 +33,7 @@ #include "util/tool.h" -CLexiconReadWindow::CLexiconReadWindow(QList<CSwordModuleInfo*> moduleList, CMDIArea* parent) +CLexiconReadWindow::CLexiconReadWindow(const QList<CSwordModuleInfo *> & moduleList, CMDIArea * parent) : CReadWindow(moduleList, parent) { moduleList.first(); setKey( CSwordKey::createInstance(moduleList.first()) ); @@ -158,7 +155,7 @@ void CLexiconReadWindow::initActions() { addAction(m_actions.print.entry); // init with the user defined settings - CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, ac); + ac->readShortcuts("Lexicon shortcuts"); } /** No descriptions */ @@ -194,7 +191,7 @@ void CLexiconReadWindow::initConnections() { void CLexiconReadWindow::initView() { // Create display widget for this window - setDisplayWidget( CDisplay::createReadInstance(this) ); + setDisplayWidget(new BtHtmlReadDisplay(this, this)); setCentralWidget( displayWidget()->view() ); setWindowIcon(util::tool::getIconForModule(modules().first())); @@ -320,7 +317,7 @@ void CLexiconReadWindow::updatePopupMenu() { void CLexiconReadWindow::reload(CSwordBackend::SetupChangedReason reason) { CReadWindow::reload(reason); - CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection()); + actionCollection()->readShortcuts("Lexicon shortcuts"); } /** No descriptions */ |