Imported Upstream version 2.4

1 files changed, 31 insertions, 30 deletions

diff --git a/src/frontend/displaywindow/cdisplaywindow.cpp b/src/frontend/displaywindow/cdisplaywindow.cpp
index 394e96b..4ba567a 100644
--- a/src/frontend/displaywindow/cdisplaywindow.cpp
+++ b/src/frontend/displaywindow/cdisplaywindow.cpp
@@ -7,27 +7,29 @@
 *
 **********/
 
-#include "cdisplaywindow.h"
-#include "bttoolbarpopupaction.h"
-#include "btactioncollection.h"
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
+#include "frontend/displaywindow/cdisplaywindow.h"
+
+#include <QCloseEvent>
+#include <QDebug>
+#include <QMenu>
+#include <QStringList>
+#include <QWidget>
+#include "backend/config/cbtconfig.h"
 #include "backend/keys/cswordkey.h"
+#include "bibletime.h"
+#include "frontend/cmdiarea.h"
+#include "frontend/display/cdisplay.h"
+#include "frontend/displaywindow/bttoolbarpopupaction.h"
+#include "frontend/displaywindow/btactioncollection.h"
+#include "frontend/displaywindow/cmodulechooserbar.h"
+#include "frontend/displaywindow/cbuttons.h"
 #include "frontend/keychooser/ckeychooser.h"
 #include "frontend/keychooser/bthistory.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/cmdiarea.h"
 #include "frontend/profile/cprofilewindow.h"
-#include "backend/config/cbtconfig.h"
 #include "frontend/searchdialog/csearchdialog.h"
+#include "util/directory.h"
 #include "util/cresmgr.h"
-#include "util/directoryutil.h"
 
-#include <QWidget>
-#include <QCloseEvent>
-#include <QStringList>
-#include <QDebug>
-#include <QMenu>
 
 using namespace Profile;
 
@@ -44,7 +46,7 @@ CDisplayWindow::CDisplayWindow(QList<CSwordModuleInfo*> modules, CMDIArea *paren
         m_mainToolBar(0),
         m_popupMenu(0),
         m_displayWidget(0) {
-    qDebug("CDisplayWindow::CDisplayWindow");
+    qDebug() << "CDisplayWindow::CDisplayWindow";
     setAttribute(Qt::WA_DeleteOnClose); //we want to destroy this window when it is closed
     parent->addSubWindow(this);
     m_actionCollection = new BtActionCollection(this);
@@ -86,13 +88,9 @@ QList<CSwordModuleInfo*> CDisplayWindow::modules() {
     return mods;
 }
 
-/** Set the window caption. */
-void CDisplayWindow::setCaption( const QString&  ) {
-    QWidget::setWindowTitle( windowCaption() );
-    m_mdi->emitWindowCaptionChanged();
-}
-
 void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
+    namespace DU = util::directory;
+
     qDebug() << "CDisplayWindow::insertKeyboardActions: ac: " << a;
 
     QAction* actn = new QAction(QIcon(), tr("Zoom in"), a);
@@ -123,13 +121,13 @@ void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
     actn->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
     a->addAction("openLocation", actn);
 
-    actn = new QAction(QIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::general::search::icon)),
+    actn = new QAction(QIcon(DU::getIcon(CResMgr::displaywindows::general::search::icon)),
                        tr("Search with works of this window"), a);
     actn->setShortcut(CResMgr::displaywindows::general::search::accel);
     a->addAction(CResMgr::displaywindows::general::search::actionName, actn);
 
     BtToolBarPopupAction* action = new BtToolBarPopupAction(
-        QIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::general::backInHistory::icon)),
+        QIcon(DU::getIcon(CResMgr::displaywindows::general::backInHistory::icon)),
         tr("Back in history"),
         a
     );
@@ -137,7 +135,7 @@ void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
     a->addAction(CResMgr::displaywindows::general::backInHistory::actionName, action);
 
     action = new BtToolBarPopupAction(
-        QIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::general::forwardInHistory::icon)),
+        QIcon(DU::getIcon(CResMgr::displaywindows::general::forwardInHistory::icon)),
         tr("Forward in history"),
         a
     );
@@ -146,7 +144,7 @@ void CDisplayWindow::insertKeyboardActions( BtActionCollection* a ) {
 }
 
 void CDisplayWindow::initActions() {
-    qDebug("CDisplayWindow::initActions");
+    qDebug() << "CDisplayWindow::initActions";
 
     BtActionCollection* ac = actionCollection();
 
@@ -320,7 +318,7 @@ void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) {
 
 /** Sets the modules. */
 void CDisplayWindow::setModules( const QList<CSwordModuleInfo*>& newModules ) {
-    qDebug("CDisplayWindow::setModules");
+    qDebug() << "CDisplayWindow::setModules";
     m_modules.clear();
 
     foreach (CSwordModuleInfo* mod, newModules) {
@@ -330,11 +328,11 @@ void CDisplayWindow::setModules( const QList<CSwordModuleInfo*>& newModules ) {
 
 /** Initialize the window. Call this method from the outside, because calling this in the constructor is not possible! */
 bool CDisplayWindow::init() {
-    qDebug("CDisplayWindow::init");
+    qDebug() << "CDisplayWindow::init";
     initView();
     setMinimumSize( 100, 100 );
 
-    setCaption(windowCaption());
+    setWindowTitle(windowCaption());
     //setup focus stuff.
     setFocusPolicy(Qt::ClickFocus);
     parentWidget()->setFocusPolicy(Qt::ClickFocus);
@@ -403,7 +401,7 @@ void CDisplayWindow::lookupModKey( const QString& moduleName, const QString& key
         return;
     }
 
-    //ToDo: check for containsRef compat
+    /// \todo check for containsRef compat
     if (m && modules().contains(m)) {
         key()->key(keyName);
         keyChooser()->setKey(key()); //the key chooser does send an update signal
@@ -413,7 +411,10 @@ void CDisplayWindow::lookupModKey( const QString& moduleName, const QString& key
         //create a new window for the given module
         QList<CSwordModuleInfo*> mList;
         mList.append(m);
-        mdi()->emitCreateDisplayWindow(mList, keyName);
+
+        Q_ASSERT(qobject_cast<BibleTime*>(mdi()->parent()) != 0);
+        BibleTime *mainWindow(static_cast<BibleTime*>(mdi()->parent()));
+        mainWindow->createReadDisplayWindow(mList, keyName);
     }
 }