diff options
Diffstat (limited to 'src/frontend/bookshelfmanager/removepage/btremovepage.cpp')
| -rw-r--r-- | src/frontend/bookshelfmanager/removepage/btremovepage.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp index 8b9dd3c..57879ea 100644 --- a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp +++ b/src/frontend/bookshelfmanager/removepage/btremovepage.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. * @@ -17,18 +17,19 @@ #include <QGroupBox> #include <QHBoxLayout> #include <QHeaderView> -#include <QMessageBox> #include <QPushButton> #include <QToolButton> #include <QVBoxLayout> #include "backend/bookshelfmodel/btbookshelffiltermodel.h" #include "backend/managers/cswordbackend.h" +#include "bibletimeapp.h" #include "frontend/bookshelfmanager/btmodulemanagerdialog.h" #include "frontend/btbookshelfview.h" #include "frontend/btbookshelfwidget.h" +#include "frontend/messagedialog.h" #include "util/cresmgr.h" -#include "util/dialogutil.h" #include "util/directory.h" +#include "util/geticon.h" // Sword includes: #include <swmgr.h> @@ -40,10 +41,8 @@ const QString groupingOrderKey("GUI/BookshelfManager/RemovePage/grouping"); } BtRemovePage::BtRemovePage(BtModuleManagerDialog *parent) - : BtConfigDialog::Page(util::directory::getIcon(CResMgr::bookshelfmgr::removepage::icon), parent) + : BtConfigDialog::Page(util::getIcon(CResMgr::bookshelfmgr::removepage::icon), parent) { - namespace DU = util::directory; - m_worksGroupBox = new QGroupBox(this); m_worksGroupBox->setFlat(true); QVBoxLayout *wLayout = new QVBoxLayout; @@ -77,7 +76,7 @@ BtRemovePage::BtRemovePage(BtModuleManagerDialog *parent) uLayout->addStretch(1); m_removeButton = new QPushButton(this); - m_removeButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::removepage::remove_icon)); + m_removeButton->setIcon(util::getIcon(CResMgr::bookshelfmgr::removepage::remove_icon)); m_removeButton->setEnabled(false); uLayout->addWidget(m_removeButton, 0, Qt::AlignRight); @@ -131,13 +130,13 @@ void BtRemovePage::slotRemoveModules() { /// \bug <nobr> is not working, Qt bug const QString moduleString("<nobr><img src=\"%1\" width=\"%2\" height=\"%3\"/> %4</nobr>"); const QString iconDir = util::directory::getIconDir().canonicalPath() + '/'; - Q_FOREACH(const CSwordModuleInfo *m, + Q_FOREACH(const CSwordModuleInfo * m, m_bookshelfWidget->treeModel()->checkedModules()) { - const QIcon icon = CSwordModuleInfo::moduleIcon(m); + const QIcon icon = CSwordModuleInfo::moduleIcon(*m); const QSize iconSize = icon.actualSize(QSize(textHeight, textHeight)); prettyModuleNames.append(moduleString - .arg(iconDir + CSwordModuleInfo::moduleIconFilename(m)) + .arg(iconDir + CSwordModuleInfo::moduleIconFilename(*m)) .arg(iconSize.width()) .arg(iconSize.height()) .arg(m->name())); @@ -149,7 +148,7 @@ void BtRemovePage::slotRemoveModules() { .append("<br/><br/>") .append(tr("Do you really want to remove them from your system?")); - if ((util::showQuestion(this, tr("Remove Works?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)) { //Yes was pressed. + if ((message::showQuestion(this, tr("Remove Works?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)) { //Yes was pressed. // Update the module list before really removing. Remember deleting the pointers later. QList<CSwordModuleInfo*> toBeDeleted = CSwordBackend::instance()->takeModulesFromList(moduleNames); @@ -180,7 +179,7 @@ void BtRemovePage::slotRemoveModules() { mgr = mgrDict[ prefixPath ]; } qDebug() << "Removing the module" << mInfo->name() << "..."; - installMgr.removeModule(mgr, mInfo->module()->Name()); + installMgr.removeModule(mgr, mInfo->module()->getName()); } //delete the removed moduleinfo pointers qDeleteAll(toBeDeleted); |