diff options
Diffstat (limited to 'src/frontend/searchdialog/csearchresultview.cpp')
| -rw-r--r-- | src/frontend/searchdialog/csearchresultview.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/frontend/searchdialog/csearchresultview.cpp b/src/frontend/searchdialog/csearchresultview.cpp index 7966e56..c08e5cc 100644 --- a/src/frontend/searchdialog/csearchresultview.cpp +++ b/src/frontend/searchdialog/csearchresultview.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,10 +16,12 @@ #include <QTreeWidgetItem> #include <QWidget> #include "backend/keys/cswordversekey.h" +#include "bibletimeapp.h" #include "frontend/cdragdrop.h" #include "frontend/cexportmanager.h" #include "util/cresmgr.h" -#include "util/directory.h" +#include "util/geticon.h" +#include "backend/config/btconfig.h" namespace Search { @@ -33,8 +35,6 @@ CSearchResultView::CSearchResultView(QWidget* parent) /** Initializes the view of this widget. */ void CSearchResultView::initView() { - namespace DU = util::directory; - setToolTip(tr("Search result of the selected work")); setHeaderLabel(tr("Results")); setDragEnabled(true); @@ -45,7 +45,7 @@ void CSearchResultView::initView() { m_popup = new QMenu(this); m_actions.copyMenu = new QMenu(tr("Copy..."), m_popup); - m_actions.copyMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::foundItems::copyMenu::icon)); + m_actions.copyMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::foundItems::copyMenu::icon)); m_actions.copy.result = new QAction(tr("Reference only"), this); QObject::connect(m_actions.copy.result, SIGNAL(triggered()), this, SLOT(copyItems()) ); @@ -59,7 +59,7 @@ void CSearchResultView::initView() { m_popup->addMenu(m_actions.copyMenu); m_actions.saveMenu = new QMenu(tr("Save..."), m_popup); - m_actions.saveMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::foundItems::saveMenu::icon)); + m_actions.saveMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::foundItems::saveMenu::icon)); m_actions.save.result = new QAction(tr("Reference only"), this); QObject::connect(m_actions.save.result, SIGNAL(triggered()), this, SLOT(saveItems()) ); @@ -71,7 +71,7 @@ void CSearchResultView::initView() { m_popup->addMenu(m_actions.saveMenu); m_actions.printMenu = new QMenu(tr("Print..."), m_popup); - m_actions.printMenu->setIcon(DU::getIcon(CResMgr::searchdialog::result::foundItems::printMenu::icon)); + m_actions.printMenu->setIcon(util::getIcon(CResMgr::searchdialog::result::foundItems::printMenu::icon)); m_actions.print.result = new QAction(tr("Reference with text"), this); QObject::connect(m_actions.print.result, SIGNAL(triggered()), this, SLOT(printItems()) ); @@ -91,16 +91,14 @@ void CSearchResultView::initConnections() { /** Setups the list with the given module. */ void CSearchResultView::setupTree(const CSwordModuleInfo *m, - const sword::ListKey &results) + const sword::ListKey & result) { clear(); if (!m) return; m_module = m; - /// \warning This is a workaround for Sword constness - sword::ListKey &result = const_cast<sword::ListKey&>(results); - const int count = result.Count(); + const int count = result.getCount(); if (!count) return; setUpdatesEnabled(false); @@ -169,7 +167,7 @@ void CSearchResultView::printItems() { foreach (QTreeWidgetItem* k, items) { list.append( k->text(0) ); } - mgr.printKeyList( list, module(), CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ); + mgr.printKeyList( list, module(), btConfig().getDisplayOptions(), btConfig().getFilterOptions() ); } void CSearchResultView::saveItems() { |