diff options
Diffstat (limited to 'src/frontend/btbookshelfdockwidget.cpp')
| -rw-r--r-- | src/frontend/btbookshelfdockwidget.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/frontend/btbookshelfdockwidget.cpp b/src/frontend/btbookshelfdockwidget.cpp index 2d85930..46ee023 100644 --- a/src/frontend/btbookshelfdockwidget.cpp +++ b/src/frontend/btbookshelfdockwidget.cpp @@ -4,7 +4,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,16 +16,17 @@ #include <QActionGroup> #include <QLabel> #include <QMenu> -#include <QMessageBox> #include <QPushButton> #include <QStackedWidget> #include <QVBoxLayout> #include "backend/managers/cswordbackend.h" #include "bibletime.h" +#include "bibletimeapp.h" #include "frontend/btbookshelfview.h" #include "frontend/btbookshelfwidget.h" +#include "frontend/messagedialog.h" #include "util/cresmgr.h" -#include "util/directory.h" +#include "util/geticon.h" namespace { @@ -102,7 +103,6 @@ BtBookshelfDockWidget::BtBookshelfDockWidget(QWidget *parent, Qt::WindowFlags f) } void BtBookshelfDockWidget::initMenus() { - namespace DU = util::directory; namespace RM = CResMgr::mainIndex; m_itemContextMenu = new QMenu(this); @@ -115,30 +115,30 @@ void BtBookshelfDockWidget::initMenus() { m_itemContextMenu->addAction(m_itemOpenAction); m_itemSearchAction = new QAction(this); - m_itemSearchAction->setIcon(DU::getIcon(RM::search::icon)); + m_itemSearchAction->setIcon(util::getIcon(RM::search::icon)); m_itemActionGroup->addAction(m_itemSearchAction); m_itemContextMenu->addAction(m_itemSearchAction); m_itemEditMenu = new QMenu(this); - m_itemEditMenu->setIcon(DU::getIcon(RM::editModuleMenu::icon)); + m_itemEditMenu->setIcon(util::getIcon(RM::editModuleMenu::icon)); m_itemContextMenu->addMenu(m_itemEditMenu); m_itemEditPlainAction = new QAction(this); - m_itemEditPlainAction->setIcon(DU::getIcon(RM::editModulePlain::icon)); + m_itemEditPlainAction->setIcon(util::getIcon(RM::editModulePlain::icon)); m_itemActionGroup->addAction(m_itemEditPlainAction); m_itemEditMenu->addAction(m_itemEditPlainAction); m_itemEditHtmlAction = new QAction(this); - m_itemEditHtmlAction->setIcon(DU::getIcon(RM::editModuleHTML::icon)); + m_itemEditHtmlAction->setIcon(util::getIcon(RM::editModuleHTML::icon)); m_itemActionGroup->addAction(m_itemEditHtmlAction); m_itemEditMenu->addAction(m_itemEditHtmlAction); m_itemUnlockAction = new QAction(this); - m_itemUnlockAction->setIcon(DU::getIcon(RM::unlockModule::icon)); + m_itemUnlockAction->setIcon(util::getIcon(RM::unlockModule::icon)); m_itemActionGroup->addAction(m_itemUnlockAction); m_itemContextMenu->addAction(m_itemUnlockAction); m_itemAboutAction = new QAction(this); - m_itemAboutAction->setIcon(DU::getIcon(RM::aboutModule::icon)); + m_itemAboutAction->setIcon(util::getIcon(RM::aboutModule::icon)); m_itemActionGroup->addAction(m_itemAboutAction); m_itemContextMenu->addAction(m_itemAboutAction); @@ -170,7 +170,7 @@ void BtBookshelfDockWidget::slotModuleActivated(CSwordModuleInfo *module) { warning message. Actually the whole case when the user tries to open a locked module needs to be rethought and refactored. */ - QMessageBox::warning(this, tr("Warning: Module locked!"), + message::showWarning(this, tr("Warning: Module locked!"), tr("You are trying to access an encrypted module. Please " "provide an unlock key in the following dialog to open the " "module.")); |