articles; for (const Article &i : qAsConst(m_articles)) { if (i.isDeleted()) { continue; } auto func = [i](const QSharedPointer &matcher) -> bool { return !matcher->matches(i); }; if (std::find_if(m_filters.cbegin(), filterEnd, func) != filterEnd) { continue; } articles << i; ++num; } text = combinedViewFormatter()->formatArticles(articles, ArticleFormatter::NoIcon); qCDebug(AKREGATOR_LOG) << "Combined view rendering: (" << num << " articles):" << "generating HTML:" << spent.elapsed() << "ms"; renderContent(text); qCDebug(AKREGATOR_LOG) << "HTML rendering:" << spent.elapsed() << "ms"; } void ArticleViewerWidget::slotArticlesUpdated(TreeNode * /*node*/, const QVector

& /*list*/) { if (m_viewMode == CombinedView) { //TODO slotUpdateCombinedView(); } } void ArticleViewerWidget::slotArticlesAdded(TreeNode * /*node*/, const QVector

&list) { if (m_viewMode == CombinedView) { //TODO sort list, then merge m_articles << list; std::sort(m_articles.begin(), m_articles.end()); slotUpdateCombinedView(); } } void ArticleViewerWidget::slotArticlesRemoved(TreeNode * /*node*/, const QVector

&list) { Q_UNUSED(list) if (m_viewMode == CombinedView) { //TODO slotUpdateCombinedView(); } } void ArticleViewerWidget::slotClear() { disconnectFromNode(m_node); m_node = nullptr; m_article = Article(); m_articles.clear(); renderContent(QString()); } void ArticleViewerWidget::showNode(TreeNode *node) { m_viewMode = CombinedView; if (node != m_node) { disconnectFromNode(m_node); } connectToNode(node); m_articles.clear(); m_article = Article(); m_node = node; delete m_listJob; m_listJob = node->createListJob(); connect(m_listJob.data(), &ArticleListJob::finished, this, &ArticleViewerWidget::slotArticlesListed); m_listJob->start(); slotUpdateCombinedView(); } qreal ArticleViewerWidget::zoomFactor() const { return m_articleViewerWidgetNg->articleViewerNg()->zoomFactor(); } void ArticleViewerWidget::slotArticlesListed(KJob *job) { Q_ASSERT(job); Q_ASSERT(job == m_listJob); TreeNode *node = m_listJob->node(); if (job->error() || !node) { if (!node) { qCWarning(AKREGATOR_LOG) << "Node to be listed is already deleted"; } else { qCWarning(AKREGATOR_LOG) << job->errorText(); } slotUpdateCombinedView(); return; } m_articles = m_listJob->articles(); std::sort(m_articles.begin(), m_articles.end()); if (node && !m_articles.isEmpty()) { m_link = m_articles.first().link(); } else { m_link = QUrl(); } slotUpdateCombinedView(); } void ArticleViewerWidget::keyPressEvent(QKeyEvent *e) { e->ignore(); } void ArticleViewerWidget::updateAfterConfigChanged() { switch (m_viewMode) { case NormalView: if (!m_article.isNull()) { renderContent(normalViewFormatter()->formatArticles(QVector() << m_article, ArticleFormatter::ShowIcon)); } break; case CombinedView: slotUpdateCombinedView(); break; case SummaryView: slotShowSummary(m_node); break; } } void ArticleViewerWidget::reload() { beginWriting(); m_articleHtmlWriter->queue(m_currentText); endWriting(); } QSize ArticleViewerWidget::sizeHint() const { // Increase height a bit so that we can (roughly) read 25 lines of text QSize sh = QWidget::sizeHint(); sh.setHeight(qMax(sh.height(), 25 * fontMetrics().height())); return sh; } void ArticleViewerWidget::displayAboutPage() { m_articleViewerWidgetNg->articleViewerNg()->showAboutPage(); } void ArticleViewerWidget::setArticleActionsEnabled(bool enabled) { ActionManager::getInstance()->setArticleActionsEnabled(enabled); } Akregator::ArticleViewerWebEngineWidgetNg *ArticleViewerWidget::articleViewerWidgetNg() const { return m_articleViewerWidgetNg; } diff --git a/src/feed/feedlist.cpp b/src/feed/feedlist.cpp index 80cb05c5..5a275340 100644 --- a/src/feed/feedlist.cpp +++ b/src/feed/feedlist.cpp @@ -1,631 +1,631 @@ /* This file is part of Akregator. Copyright (C) 2004 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "feedlist.h" #include "storage.h" #include "article.h" #include "feed.h" #include "folder.h" #include "treenode.h" #include "treenodevisitor.h" #include "kernel.h" #include "subscriptionlistjobs.h" #include #include "akregator_debug.h" #include -#include +#include #include #include #include #include using namespace Akregator; class Q_DECL_HIDDEN FeedList::Private { FeedList *const q; public: Private(Backend::Storage *st, FeedList *qq); Akregator::Backend::Storage *storage; QList flatList; Folder *rootNode; QHash idMap; AddNodeVisitor *addNodeVisitor; RemoveNodeVisitor *removeNodeVisitor; QHash > urlMap; mutable int unreadCache; }; class FeedList::AddNodeVisitor : public TreeNodeVisitor { public: AddNodeVisitor(FeedList *list) : m_list(list) { } bool visitFeed(Feed *node) override { m_list->d->idMap.insert(node->id(), node); m_list->d->flatList.append(node); m_list->d->urlMap[node->xmlUrl()].append(node); connect(node, &Feed::fetchStarted, m_list, &FeedList::fetchStarted); connect(node, &Feed::fetched, m_list, &FeedList::fetched); connect(node, &Feed::fetchAborted, m_list, &FeedList::fetchAborted); connect(node, &Feed::fetchError, m_list, &FeedList::fetchError); connect(node, &Feed::fetchDiscovery, m_list, &FeedList::fetchDiscovery); visitTreeNode(node); return true; } void visit2(TreeNode *node, bool preserveID) { m_preserveID = preserveID; TreeNodeVisitor::visit(node); } bool visitTreeNode(TreeNode *node) override { if (!m_preserveID) { node->setId(m_list->generateID()); } m_list->d->idMap[node->id()] = node; m_list->d->flatList.append(node); connect(node, &TreeNode::signalDestroyed, m_list, &FeedList::slotNodeDestroyed); connect(node, &TreeNode::signalChanged, m_list, &FeedList::signalNodeChanged); Q_EMIT m_list->signalNodeAdded(node); return true; } bool visitFolder(Folder *node) override { connect(node, &Folder::signalChildAdded, m_list, &FeedList::slotNodeAdded); connect(node, &Folder::signalAboutToRemoveChild, m_list, &FeedList::signalAboutToRemoveNode); connect(node, &Folder::signalChildRemoved, m_list, &FeedList::slotNodeRemoved); visitTreeNode(node); for (TreeNode *i = node->firstChild(); i && i != node; i = i->next()) { m_list->slotNodeAdded(i); } return true; } private: FeedList *m_list = nullptr; bool m_preserveID = false; }; class FeedList::RemoveNodeVisitor : public TreeNodeVisitor { public: RemoveNodeVisitor(FeedList *list) : m_list(list) { } bool visitFeed(Feed *node) override { visitTreeNode(node); m_list->d->urlMap[node->xmlUrl()].removeAll(node); return true; } bool visitTreeNode(TreeNode *node) override { m_list->d->idMap.remove(node->id()); m_list->d->flatList.removeAll(node); m_list->disconnect(node); return true; } bool visitFolder(Folder *node) override { visitTreeNode(node); return true; } private: FeedList *m_list; }; FeedList::Private::Private(Backend::Storage *st, FeedList *qq) : q(qq) , storage(st) , rootNode(nullptr) , addNodeVisitor(new AddNodeVisitor(q)) , removeNodeVisitor(new RemoveNodeVisitor(q)) , unreadCache(-1) { Q_ASSERT(storage); } FeedList::FeedList(Backend::Storage *storage) : QObject(nullptr) , d(new Private(storage, this)) { Folder *rootNode = new Folder(i18n("All Feeds")); rootNode->setId(1); setRootNode(rootNode); addNode(rootNode, true); } QVector FeedList::feedIds() const { QVector ids; const auto f = feeds(); for (const Feed *const i : f) { ids += i->id(); } return ids; } QVector FeedList::feeds() const { QVector constList; const auto rootNodeFeeds = d->rootNode->feeds(); for (const Feed *const i : rootNodeFeeds) { constList.append(i); } return constList; } QVector FeedList::feeds() { return d->rootNode->feeds(); } QVector FeedList::folders() const { QVector constList; const auto nodeFolders = d->rootNode->folders(); for (const Folder *const i : nodeFolders) { constList.append(i); } return constList; } QVector FeedList::folders() { return d->rootNode->folders(); } void FeedList::addNode(TreeNode *node, bool preserveID) { d->addNodeVisitor->visit2(node, preserveID); } void FeedList::removeNode(TreeNode *node) { d->removeNodeVisitor->visit(node); } void FeedList::parseChildNodes(QDomNode &node, Folder *parent) { QDomElement e = node.toElement(); // try to convert the node to an element. if (!e.isNull()) { //QString title = e.hasAttribute("text") ? e.attribute("text") : e.attribute("title"); if (e.hasAttribute(QStringLiteral("xmlUrl")) || e.hasAttribute(QStringLiteral("xmlurl")) || e.hasAttribute(QStringLiteral("xmlURL"))) { Feed *feed = Feed::fromOPML(e, d->storage); if (feed) { if (!d->urlMap[feed->xmlUrl()].contains(feed)) { d->urlMap[feed->xmlUrl()].append(feed); } parent->appendChild(feed); } } else { Folder *fg = Folder::fromOPML(e); parent->appendChild(fg); if (e.hasChildNodes()) { QDomNode child = e.firstChild(); while (!child.isNull()) { parseChildNodes(child, fg); child = child.nextSibling(); } } } } } bool FeedList::readFromOpml(const QDomDocument &doc) { QDomElement root = doc.documentElement(); qCDebug(AKREGATOR_LOG) << "loading OPML feed" << root.tagName().toLower(); qCDebug(AKREGATOR_LOG) << "measuring startup time: START"; QElapsedTimer spent; spent.start(); if (root.tagName().toLower() != QLatin1String("opml")) { return false; } QDomNode bodyNode = root.firstChild(); while (!bodyNode.isNull() && bodyNode.toElement().tagName().toLower() != QLatin1String("body")) { bodyNode = bodyNode.nextSibling(); } if (bodyNode.isNull()) { qCDebug(AKREGATOR_LOG) << "Failed to acquire body node, markup broken?"; return false; } QDomElement body = bodyNode.toElement(); QDomNode i = body.firstChild(); while (!i.isNull()) { parseChildNodes(i, allFeedsFolder()); i = i.nextSibling(); } for (TreeNode *i = allFeedsFolder()->firstChild(); i && i != allFeedsFolder(); i = i->next()) { if (i->id() == 0) { uint id = generateID(); i->setId(id); d->idMap.insert(id, i); } } qCDebug(AKREGATOR_LOG) << "measuring startup time: STOP," << spent.elapsed() << "ms"; qCDebug(AKREGATOR_LOG) << "Number of articles loaded:" << allFeedsFolder()->totalCount(); return true; } FeedList::~FeedList() { Q_EMIT signalDestroyed(this); setRootNode(nullptr); delete d->addNodeVisitor; delete d->removeNodeVisitor; delete d; } const Feed *FeedList::findByURL(const QString &feedURL) const { if (!d->urlMap.contains(feedURL)) { return nullptr; } const QList &v = d->urlMap[feedURL]; return !v.isEmpty() ? v.front() : nullptr; } Feed *FeedList::findByURL(const QString &feedURL) { if (!d->urlMap.contains(feedURL)) { return nullptr; } const QList &v = d->urlMap[feedURL]; return !v.isEmpty() ? v.front() : nullptr; } const Article FeedList::findArticle(const QString &feedURL, const QString &guid) const { const Feed *feed = findByURL(feedURL); return feed ? feed->findArticle(guid) : Article(); } void FeedList::append(FeedList *list, Folder *parent, TreeNode *after) { if (list == this) { return; } if (!d->flatList.contains(parent)) { parent = allFeedsFolder(); } QList children = list->allFeedsFolder()->children(); QList::ConstIterator end(children.constEnd()); for (QList::ConstIterator it = children.constBegin(); it != end; ++it) { list->allFeedsFolder()->removeChild(*it); parent->insertChild(*it, after); after = *it; } } QDomDocument FeedList::toOpml() const { QDomDocument doc; doc.appendChild(doc.createProcessingInstruction(QStringLiteral("xml"), QStringLiteral("version=\"1.0\" encoding=\"UTF-8\""))); QDomElement root = doc.createElement(QStringLiteral("opml")); root.setAttribute(QStringLiteral("version"), QStringLiteral("1.0")); doc.appendChild(root); QDomElement head = doc.createElement(QStringLiteral("head")); root.appendChild(head); QDomElement ti = doc.createElement(QStringLiteral("text")); head.appendChild(ti); QDomElement body = doc.createElement(QStringLiteral("body")); root.appendChild(body); const auto children = allFeedsFolder()->children(); for (const TreeNode *const i : children) { body.appendChild(i->toOPML(body, doc)); } return doc; } const TreeNode *FeedList::findByID(int id) const { return d->idMap[id]; } TreeNode *FeedList::findByID(int id) { return d->idMap[id]; } QList FeedList::findByTitle(const QString &title) const { return allFeedsFolder()->namedChildren(title); } QList FeedList::findByTitle(const QString &title) { return allFeedsFolder()->namedChildren(title); } const Folder *FeedList::allFeedsFolder() const { return d->rootNode; } Folder *FeedList::allFeedsFolder() { return d->rootNode; } bool FeedList::isEmpty() const { return d->rootNode->firstChild() == nullptr; } void FeedList::rootNodeChanged() { Q_ASSERT(d->rootNode); const int newUnread = d->rootNode->unread(); if (newUnread == d->unreadCache) { return; } d->unreadCache = newUnread; Q_EMIT unreadCountChanged(newUnread); } void FeedList::setRootNode(Folder *folder) { if (folder == d->rootNode) { return; } delete d->rootNode; d->rootNode = folder; d->unreadCache = -1; if (d->rootNode) { d->rootNode->setOpen(true); connect(d->rootNode, &Folder::signalChildAdded, this, &FeedList::slotNodeAdded); connect(d->rootNode, &Folder::signalAboutToRemoveChild, this, &FeedList::signalAboutToRemoveNode); connect(d->rootNode, &Folder::signalChildRemoved, this, &FeedList::slotNodeRemoved); connect(d->rootNode, &Folder::signalChanged, this, &FeedList::signalNodeChanged); connect(d->rootNode, &Folder::signalChanged, this, &FeedList::rootNodeChanged); } } int FeedList::generateID() const { return KRandom::random(); } void FeedList::slotNodeAdded(TreeNode *node) { if (!node) { return; } Folder *parent = node->parent(); if (!parent || !d->flatList.contains(parent) || d->flatList.contains(node)) { return; } addNode(node, false); } void FeedList::slotNodeDestroyed(TreeNode *node) { if (!node || !d->flatList.contains(node)) { return; } removeNode(node); } void FeedList::slotNodeRemoved(Folder * /*parent*/, TreeNode *node) { if (!node || !d->flatList.contains(node)) { return; } removeNode(node); Q_EMIT signalNodeRemoved(node); } int FeedList::unread() const { if (d->unreadCache == -1) { d->unreadCache = d->rootNode ? d->rootNode->unread() : 0; } return d->unreadCache; } void FeedList::addToFetchQueue(FetchQueue *qu, bool intervalOnly) { if (d->rootNode) { d->rootNode->slotAddToFetchQueue(qu, intervalOnly); } } KJob *FeedList::createMarkAsReadJob() { return d->rootNode ? d->rootNode->createMarkAsReadJob() : nullptr; } FeedListManagementImpl::FeedListManagementImpl(const QSharedPointer &list) : m_feedList(list) { } void FeedListManagementImpl::setFeedList(const QSharedPointer &list) { m_feedList = list; } static QString path_of_folder(const Folder *fol) { Q_ASSERT(fol); QString path; const Folder *i = fol; while (i) { path = QString::number(i->id()) + QLatin1Char('/') + path; i = i->parent(); } return path; } QStringList FeedListManagementImpl::categories() const { if (!m_feedList) { return QStringList(); } QStringList cats; const auto folders = m_feedList->folders(); for (const Folder *const i : folders) { cats.append(path_of_folder(i)); } return cats; } QStringList FeedListManagementImpl::feeds(const QString &catId) const { if (!m_feedList) { return QStringList(); } const uint lastcatid = catId.split(QLatin1Char('/'), QString::SkipEmptyParts).last().toUInt(); QSet urls; const auto feeds = m_feedList->feeds(); for (const Feed *const i : feeds) { if (lastcatid == i->parent()->id()) { urls.insert(i->xmlUrl()); } } return urls.values(); } void FeedListManagementImpl::addFeed(const QString &url, const QString &catId) { if (!m_feedList) { return; } qCDebug(AKREGATOR_LOG) << "Name:" << url.left(20) << "Cat:" << catId; const uint folder_id = catId.split(QLatin1Char('/'), QString::SkipEmptyParts).last().toUInt(); // Get the folder Folder *m_folder = nullptr; const QVector vector = m_feedList->folders(); for (int i = 0; i < vector.size(); ++i) { if (vector.at(i)->id() == folder_id) { m_folder = vector.at(i); break; } } // Create new feed QScopedPointer new_feedlist(new FeedList(Kernel::self()->storage())); Feed *new_feed = new Feed(Kernel::self()->storage()); new_feed->setXmlUrl(url); // new_feed->setTitle(url); new_feedlist->allFeedsFolder()->appendChild(new_feed); // Get last in the folder TreeNode *m_last = m_folder->childAt(m_folder->totalCount()); // Add the feed m_feedList->append(new_feedlist.data(), m_folder, m_last); } void FeedListManagementImpl::removeFeed(const QString &url, const QString &catId) { qCDebug(AKREGATOR_LOG) << "Name:" << url.left(20) << "Cat:" << catId; uint lastcatid = catId.split(QLatin1Char('/'), QString::SkipEmptyParts).last().toUInt(); const auto feeds = m_feedList->feeds(); for (const Feed *const i : feeds) { if (lastcatid == i->parent()->id()) { if (i->xmlUrl().compare(url) == 0) { qCDebug(AKREGATOR_LOG) << "id:" << i->id(); DeleteSubscriptionJob *job = new DeleteSubscriptionJob; job->setSubscriptionId(i->id()); job->start(); } } } } QString FeedListManagementImpl::getCategoryName(const QString &catId) const { QString catname; if (!m_feedList) { return catname; } const QStringList list = catId.split(QLatin1Char('/'), QString::SkipEmptyParts); for (int i = 0; i < list.size(); ++i) { int index = list.at(i).toInt(); catname += m_feedList->findByID(index)->title() + QLatin1Char('/'); } return catname; } diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp index f9deba3a..685ea6bb 100644 --- a/src/frame/frame.cpp +++ b/src/frame/frame.cpp @@ -1,202 +1,202 @@ /* This file is part of Akregator. Copyright (C) 2004 Sashmit Bhaduri This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "frame.h" #include "utils.h" -#include +#include #include "akregator_debug.h" #include #include using namespace Akregator; Frame::Frame(QWidget *parent) : QWidget(parent) { m_title = i18n("Untitled"); m_state = Idle; m_progress = -1; m_progressItem = nullptr; m_isRemovable = true; m_loading = false; m_id = m_idCounter++; } void Frame::slotSetTitle(const QString &s) { if (m_title != s) { m_title = s; Q_EMIT signalTitleChanged(this, s); } } bool Frame::isLoading() const { return m_loading; } void Frame::slotSetCaption(const QString &s) { if (m_progressItem) { m_progressItem->setLabel(s); } m_caption = s; Q_EMIT signalCaptionChanged(this, s); } void Frame::slotSetStatusText(const QString &s) { m_statusText = s; m_statusText = Akregator::Utils::stripTags(m_statusText); Q_EMIT signalStatusText(this, m_statusText); } void Frame::slotSetProgress(int a) { if (m_progressItem) { m_progressItem->setProgress(static_cast(a)); } m_progress = a; Q_EMIT signalLoadingProgress(this, a); } void Frame::slotSetState(State state) { m_state = state; switch (m_state) { case Frame::Started: Q_EMIT signalStarted(this); break; case Frame::Canceled: Q_EMIT signalCanceled(this, QString()); break; case Frame::Idle: case Frame::Completed: Q_EMIT signalCompleted(this); } } int Frame::m_idCounter = 0; int Frame::id() const { return m_id; } void Frame::setRemovable(bool removable) { m_isRemovable = removable; } bool Frame::isRemovable() const { return m_isRemovable; } Frame::~Frame() { if (m_progressItem) { m_progressItem->setComplete(); } } Frame::State Frame::state() const { return m_state; } QString Frame::title() const { return m_title; } QString Frame::caption() const { return m_caption; } QString Frame::statusText() const { return m_statusText; } QIcon Frame::icon() const { return m_icon; } void Frame::setIcon(const QIcon &icon) { m_icon = icon; } void Frame::slotSetStarted() { m_loading = true; if (m_progressId.isNull() || m_progressId.isEmpty()) { m_progressId = KPIM::ProgressManager::getUniqueID(); } m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, title(), QString(), false); m_progressItem->setStatus(i18n("Loading...")); m_state = Started; Q_EMIT signalStarted(this); } void Frame::slotStop() { if (m_loading) { m_loading = false; } } void Frame::slotSetCanceled(const QString &s) { m_loading = false; if (m_progressItem) { m_progressItem->setStatus(i18n("Loading canceled")); m_progressItem->setComplete(); m_progressItem = nullptr; } m_state = Canceled; Q_EMIT signalCanceled(this, s); } void Frame::slotSetCompleted() { m_loading = false; if (m_progressItem) { m_progressItem->setStatus(i18n("Loading completed")); m_progressItem->setComplete(); m_progressItem = nullptr; } m_state = Completed; Q_EMIT signalCompleted(this); } int Frame::progress() const { return m_progress; } diff --git a/src/frame/frame.h b/src/frame/frame.h index 7315e10c..9c67a9e7 100644 --- a/src/frame/frame.h +++ b/src/frame/frame.h @@ -1,150 +1,150 @@ /* This file is part of Akregator. Copyright (C) 2004 Sashmit Bhaduri 2005 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #ifndef AKREGATOR_FRAME_H #define AKREGATOR_FRAME_H #include #include #include -#include +#include #include "akregator_export.h" class QUrl; namespace KPIM { class ProgressItem; } namespace Akregator { class OpenUrlRequest; class AKREGATOR_EXPORT Frame : public QWidget { Q_OBJECT public: explicit Frame(QWidget *parent = nullptr); ~Frame() override; enum State { Idle, Started, Completed, Canceled }; virtual qreal zoomFactor() const = 0; /** * Returns whether the frame can be removed from * Akregator (via detach or close tab etc.) Usually * all tabs but the main tab can be removed. * Default is @c true */ bool isRemovable() const; /** * returns the URL of the embedded part */ virtual QUrl url() const = 0; Q_REQUIRED_RESULT QString title() const; Q_REQUIRED_RESULT QString caption() const; Q_REQUIRED_RESULT State state() const; Q_REQUIRED_RESULT int progress() const; Q_REQUIRED_RESULT QString statusText() const; Q_REQUIRED_RESULT QIcon icon() const; void setIcon(const QIcon &icon); Q_REQUIRED_RESULT int id() const; /** * returns whether the embedded part is loading a website. If so, it can be stopped using slotStop() */ virtual bool isLoading() const; virtual bool openUrl(const OpenUrlRequest &request) = 0; /** * Load a frame from a config file for session management. */ virtual void loadConfig(const KConfigGroup & /*config*/, const QString & /*prefix*/) { } /** * Save a frame to a config file for session management. */ virtual bool saveConfig(KConfigGroup & /*config*/, const QString & /*prefix*/) { return false; } public Q_SLOTS: /** reloads the current content, if possible. See also isReloadable(). */ virtual void slotReload() { } virtual void slotStop(); void slotSetStarted(); void slotSetCanceled(const QString &); void slotSetCompleted(); void slotSetState(State); void slotSetProgress(int); void slotSetCaption(const QString &); void slotSetTitle(const QString &); void slotSetStatusText(const QString &); Q_SIGNALS: void signalCaptionChanged(Akregator::Frame *, const QString &); void signalTitleChanged(Akregator::Frame *, const QString &); void signalStarted(Akregator::Frame *); void signalCanceled(Akregator::Frame *, const QString &); void signalCompleted(Akregator::Frame *); void signalLoadingProgress(Akregator::Frame *, int); void signalStatusText(Akregator::Frame *, const QString &); void signalOpenUrlRequest(Akregator::OpenUrlRequest &request); void showStatusBarMessage(const QString &msg); protected: void setRemovable(bool removable); protected: QIcon m_icon; QString m_title; QString m_caption; State m_state; int m_progress; QString m_statusText; QString m_progressId; KPIM::ProgressItem *m_progressItem = nullptr; bool m_isRemovable = false; bool m_loading = false; int m_id; static int m_idCounter; }; } // namespace Akregator #endif // AKREGATOR_FRAME_H diff --git a/src/frame/framemanager.cpp b/src/frame/framemanager.cpp index 3461e239..164deb0e 100644 --- a/src/frame/framemanager.cpp +++ b/src/frame/framemanager.cpp @@ -1,288 +1,288 @@ /* This file is part of Akregator. Copyright (C) 2005 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "framemanager.h" #include "akregatorconfig.h" #include "frame.h" #include "actionmanager.h" #include "openurlrequest.h" #include #include -#include -#include -#include +#include +#include +#include #include "akregator_debug.h" #include #include #include using namespace Akregator; FrameManager::FrameManager(QObject *parent) : QObject(parent) , m_currentFrame(nullptr) { } FrameManager::~FrameManager() { } Frame *FrameManager::currentFrame() const { return m_currentFrame; } void FrameManager::slotAddFrame(Frame *frame) { m_frames.insert(frame->id(), frame); connect(frame, &Frame::signalCanceled, this, &FrameManager::slotSetCanceled); connect(frame, &Frame::signalStarted, this, &FrameManager::slotSetStarted); connect(frame, &Frame::signalCaptionChanged, this, &FrameManager::slotSetCaption); connect(frame, &Frame::signalLoadingProgress, this, &FrameManager::slotSetProgress); connect(frame, &Frame::signalCompleted, this, &FrameManager::slotSetCompleted); connect(frame, &Frame::signalTitleChanged, this, &FrameManager::slotSetTitle); connect(frame, &Frame::signalStatusText, this, &FrameManager::slotSetStatusText); connect(frame, &Frame::signalOpenUrlRequest, this, [this](OpenUrlRequest &request) { slotOpenUrlRequest(request); }); //setPartGuiActive(frame->part(), false); Q_EMIT signalFrameAdded(frame); if (m_frames.count() == 1) { slotChangeFrame(frame->id()); } } void FrameManager::slotRemoveFrame(int id) { Frame *frame = m_frames.value(id); if (!frame || !frame->isRemovable()) { return; } frame->disconnect(this); if (m_currentFrame == frame) { slotChangeFrame(-1); } m_frames.insert(id, nullptr); m_frames.remove(id); Q_EMIT signalFrameRemoved(id); delete frame; } Frame *FrameManager::findFrameById(int id) const { return m_frames.value(id); } void FrameManager::slotChangeFrame(int frameId) { Frame *frame = m_frames.value(frameId); if (frame == m_currentFrame) { return; } Frame *oldFrame = m_currentFrame; m_currentFrame = frame; //if (oldFrame) { // setPartGuiActive(oldFrame->part(), false); //} if (frame) { //setPartGuiActive(frame->part(), true); // TODO: handle removable flag switch (frame->state()) { case Frame::Started: Q_EMIT signalStarted(); break; case Frame::Canceled: Q_EMIT signalCanceled(QString()); break; case Frame::Idle: case Frame::Completed: Q_EMIT signalCompleted(); } Q_EMIT signalCaptionChanged(frame->caption()); Q_EMIT signalTitleChanged(frame->title()); Q_EMIT signalLoadingProgress(frame->progress()); Q_EMIT signalStatusText(frame->statusText()); } else { Q_EMIT signalCompleted(); Q_EMIT signalCaptionChanged(QString()); Q_EMIT signalTitleChanged(QString()); Q_EMIT signalLoadingProgress(100); Q_EMIT signalStatusText(QString()); } Q_EMIT signalCurrentFrameChanged(oldFrame, frame); } void FrameManager::slotSetStarted(Frame *frame) { if (frame == m_currentFrame) { Q_EMIT signalStarted(); } } void FrameManager::slotSetCanceled(Frame *frame, const QString &reason) { if (frame == m_currentFrame) { Q_EMIT signalCanceled(reason); } } void FrameManager::slotSetCompleted(Frame *frame) { if (frame == m_currentFrame) { Q_EMIT signalCompleted(); } } void FrameManager::slotSetProgress(Frame *frame, int progress) { if (frame == m_currentFrame) { Q_EMIT signalLoadingProgress(progress); } } void FrameManager::slotSetCaption(Frame *frame, const QString &caption) { if (frame == m_currentFrame) { Q_EMIT signalCaptionChanged(caption); } } void FrameManager::slotSetTitle(Frame *frame, const QString &title) { if (frame == m_currentFrame) { Q_EMIT signalTitleChanged(title); } } void FrameManager::slotSetStatusText(Frame *frame, const QString &statusText) { if (frame == m_currentFrame) { Q_EMIT signalStatusText(statusText); } } void FrameManager::openUrl(OpenUrlRequest &request) { if (request.browserArgs().newTab() || request.browserArgs().forcesNewWindow() || request.options() == OpenUrlRequest::NewTab || (m_currentFrame->id() == 0)) { int newFrameId = -1; Q_EMIT signalRequestNewFrame(newFrameId); request.setFrameId(newFrameId); } else { request.setFrameId(m_currentFrame->id()); } if (m_frames.contains(request.frameId())) { Frame *frame = m_frames.value(request.frameId()); if (frame->openUrl(request)) { request.setWasHandled(true); } } if (!request.openInBackground()) { Q_EMIT signalSelectFrame(request.frameId()); } } void FrameManager::openInExternalBrowser(const OpenUrlRequest &request) { QUrl url = request.url(); if (!url.isValid()) { return; } if (!Settings::externalBrowserUseKdeDefault()) { QHash map; map.insert(QLatin1Char('u'), url.url()); const QString cmd = KMacroExpander::expandMacrosShellQuote(Settings::externalBrowserCustomCommand(), map); const QStringList args = KShell::splitArgs(cmd); if (!args.isEmpty()) { KProcess::startDetached(args); return; } } if (request.args().mimeType().isEmpty()) { QDesktopServices::openUrl(url); } else { KRun::RunFlags flag = {}; KRun::runUrl(url, request.args().mimeType(), nullptr /*window*/, flag); } } void FrameManager::slotOpenUrlRequest(OpenUrlRequest &request, bool useOpenInBackgroundSetting) { qCDebug(AKREGATOR_LOG) << "FrameManager::slotOpenUrlRequest():" << request.debugInfo(); if (request.options() == OpenUrlRequest::ExternalBrowser) { openInExternalBrowser(request); return; } if (useOpenInBackgroundSetting) { // Honour user's preference for foreground/background tabs if (request.options() == OpenUrlRequest::NewTab || request.browserArgs().newTab()) { request.setOpenInBackground(Settings::lMBBehaviour() == Settings::EnumLMBBehaviour::OpenInBackground); } } openUrl(request); } void FrameManager::saveProperties(KConfigGroup &config) { //write children QStringList strlst; QHash::const_iterator i; QHash::const_iterator end(m_frames.constEnd()); for (i = m_frames.constBegin(); i != end; ++i) { // No need to save the main frame Frame *currentFrame = i.value(); if (currentFrame && qobject_cast(currentFrame)) { QString newPrefix = QLatin1Char('T') + QString::number(i.key()); if (currentFrame->saveConfig(config, newPrefix + QLatin1Char('_'))) { strlst.append(newPrefix); if (currentFrame == m_currentFrame) { config.writeEntry(QStringLiteral("CurrentTab"), newPrefix); } } } } config.writeEntry(QStringLiteral("Children"), strlst); } diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 0e3925d5..835e6eee 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -1,1341 +1,1341 @@ /* This file is part of Akregator. Copyright (C) 2004 Stanislav Karchebny 2004 Sashmit Bhaduri 2005 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "mainwidget.h" #include "utils.h" #include "actionmanagerimpl.h" #include "addfeeddialog.h" #include "articlelistview.h" #include "articleviewerwidget.h" #include "abstractselectioncontroller.h" #include "articlejobs.h" #include "articlematcher.h" #include "akregatorconfig.h" #include "akregator_part.h" #include "Libkdepim/BroadcastStatus" #include "createfeedcommand.h" #include "createfoldercommand.h" #include "deletesubscriptioncommand.h" #include "editsubscriptioncommand.h" #include "expireitemscommand.h" #include "importfeedlistcommand.h" #include "feed.h" #include "feedlist.h" #include "feedpropertiesdialog.h" #include "fetchqueue.h" #include "folder.h" #include "framemanager.h" #include "kernel.h" #include "notificationmanager.h" #include "openurlrequest.h" #include "progressmanager.h" #include "widgets/searchbar.h" #include "selectioncontroller.h" #include "subscriptionlistjobs.h" #include "subscriptionlistmodel.h" #include "subscriptionlistview.h" #include "tabwidget.h" #include "treenode.h" #include "treenodevisitor.h" #include "types.h" #include "mainframe.h" #include #include "job/downloadarticlejob.h" -#include +#include #include -#include -#include +#include +#include -#include +#include #include #include #include #include #include #include #include #include #include #include #include #include #include "articleviewer-ng/webengine/articleviewerwebenginewidgetng.h" using namespace Akregator; MainWidget::~MainWidget() { // if m_shuttingDown is false, slotOnShutdown was not called. That // means that not the whole app is shutdown, only the part. So it // should be no risk to do the cleanups now if (!m_shuttingDown) { slotOnShutdown(); } } MainWidget::MainWidget(Part *part, QWidget *parent, ActionManagerImpl *actionManager, const QString &name) : QWidget(parent) , m_feedList() , m_viewMode(NormalView) , m_actionManager(actionManager) , m_feedListManagementInterface(new FeedListManagementImpl) { setObjectName(name); FeedListManagementInterface::setInstance(m_feedListManagementInterface); m_actionManager->initMainWidget(this); m_part = part; m_shuttingDown = false; m_displayingAboutPage = false; setFocusPolicy(Qt::StrongFocus); connect(m_part, &Part::signalSettingsChanged, m_actionManager, &ActionManagerImpl::slotSettingsChanged); QVBoxLayout *lt = new QVBoxLayout(this); lt->setContentsMargins(0, 0, 0, 0); m_horizontalSplitter = new QSplitter(Qt::Horizontal, this); m_horizontalSplitter->setOpaqueResize(true); m_horizontalSplitter->setChildrenCollapsible(false); lt->addWidget(m_horizontalSplitter); connect(Kernel::self()->fetchQueue(), &FetchQueue::signalStarted, this, &MainWidget::slotFetchingStarted); connect(Kernel::self()->fetchQueue(), &FetchQueue::signalStopped, this, &MainWidget::slotFetchingStopped); m_feedListView = new SubscriptionListView(m_horizontalSplitter); m_feedListView->setObjectName(QStringLiteral("feedtree")); m_actionManager->initSubscriptionListView(m_feedListView); connect(m_feedListView, &SubscriptionListView::userActionTakingPlace, this, &MainWidget::ensureArticleTabVisible); m_tabWidget = new TabWidget(m_horizontalSplitter); m_actionManager->initTabWidget(m_tabWidget); connect(m_part, &Part::signalSettingsChanged, this, &MainWidget::slotSettingsChanged); connect(m_tabWidget, &TabWidget::signalCurrentFrameChanged, this, &MainWidget::slotCurrentFrameChanged); connect(m_tabWidget, &TabWidget::signalRemoveFrameRequest, Kernel::self()->frameManager(), &FrameManager::slotRemoveFrame); connect(m_tabWidget, SIGNAL(signalOpenUrlRequest(Akregator::OpenUrlRequest&)), Kernel::self()->frameManager(), SLOT(slotOpenUrlRequest(Akregator::OpenUrlRequest&))); connect(Kernel::self()->frameManager(), &FrameManager::signalFrameAdded, m_tabWidget, &TabWidget::slotAddFrame); connect(Kernel::self()->frameManager(), &FrameManager::signalSelectFrame, m_tabWidget, &TabWidget::slotSelectFrame); connect(Kernel::self()->frameManager(), &FrameManager::signalFrameRemoved, m_tabWidget, &TabWidget::slotRemoveFrame); connect(Kernel::self()->frameManager(), &FrameManager::signalRequestNewFrame, this, &MainWidget::slotRequestNewFrame); connect(Kernel::self()->frameManager(), &FrameManager::signalFrameRemoved, this, &MainWidget::slotFramesChanged); connect(Kernel::self()->frameManager(), &FrameManager::signalCompleted, this, &MainWidget::slotFramesChanged); connect(PimCommon::NetworkManager::self()->networkConfigureManager(), &QNetworkConfigurationManager::onlineStateChanged, this, &MainWidget::slotNetworkStatusChanged); m_tabWidget->setWhatsThis(i18n("You can view multiple articles in several open tabs.")); m_mainTab = new QWidget(this); m_mainTab->setObjectName(QStringLiteral("Article Tab")); m_mainTab->setWhatsThis(i18n("Articles list.")); QVBoxLayout *mainTabLayout = new QVBoxLayout(m_mainTab); mainTabLayout->setContentsMargins(0, 0, 0, 0); m_searchBar = new SearchBar(m_mainTab); if (!Settings::showQuickFilter()) { m_searchBar->hide(); } connect(m_searchBar, &SearchBar::forceLostFocus, this, &MainWidget::slotSetFocusToViewer); m_articleSplitter = new QSplitter(Qt::Vertical, m_mainTab); m_articleSplitter->setObjectName(QStringLiteral("panner2")); m_articleSplitter->setChildrenCollapsible(false); m_articleWidget = new QWidget(m_articleSplitter); QVBoxLayout *articleWidgetLayout = new QVBoxLayout; m_articleWidget->setLayout(articleWidgetLayout); articleWidgetLayout->setContentsMargins(0, 0, 0, 0); articleWidgetLayout->setSpacing(0); m_articleListView = new ArticleListView; articleWidgetLayout->addWidget(m_searchBar); articleWidgetLayout->addWidget(m_articleListView); connect(m_articleListView, &ArticleListView::userActionTakingPlace, this, &MainWidget::ensureArticleTabVisible); m_selectionController = new SelectionController(this); m_selectionController->setArticleLister(m_articleListView); m_selectionController->setFeedSelector(m_feedListView); connect(m_searchBar, &SearchBar::signalSearch, m_selectionController, &AbstractSelectionController::setFilters); connect(m_part, &Part::signalSettingsChanged, m_selectionController, &AbstractSelectionController::settingsChanged); FolderExpansionHandler *expansionHandler = new FolderExpansionHandler(this); connect(m_feedListView, &QTreeView::expanded, expansionHandler, &FolderExpansionHandler::itemExpanded); connect(m_feedListView, &QTreeView::collapsed, expansionHandler, &FolderExpansionHandler::itemCollapsed); m_selectionController->setFolderExpansionHandler(expansionHandler); connect(m_selectionController, &AbstractSelectionController::currentSubscriptionChanged, this, &MainWidget::slotNodeSelected); connect(m_selectionController, &AbstractSelectionController::currentArticleChanged, this, &MainWidget::slotArticleSelected); connect(m_selectionController, &AbstractSelectionController::articleDoubleClicked, this, &MainWidget::slotOpenArticleInBrowser); m_actionManager->initArticleListView(m_articleListView); connect(m_articleListView, &ArticleListView::signalMouseButtonPressed, this, &MainWidget::slotMouseButtonPressed); m_articleViewer = new ArticleViewerWidget(Settings::grantleeDirectory(), m_actionManager->actionCollection(), m_articleSplitter); m_articleListView->setFocusProxy(m_articleViewer); setFocusProxy(m_articleViewer); connect(m_articleViewer, &ArticleViewerWidget::showStatusBarMessage, this, &MainWidget::slotShowStatusBarMessage); connect(m_articleViewer, SIGNAL(signalOpenUrlRequest(Akregator::OpenUrlRequest&)), Kernel::self()->frameManager(), SLOT(slotOpenUrlRequest(Akregator::OpenUrlRequest&))); connect(m_searchBar, &SearchBar::signalSearch, m_articleViewer, &ArticleViewerWidget::setFilters); mainTabLayout->addWidget(m_articleSplitter); m_mainFrame = new MainFrame(this, m_mainTab); m_mainFrame->slotSetTitle(i18n("Articles")); m_mainFrame->setArticleViewer(m_articleViewer); connect(m_articleViewer->articleViewerWidgetNg()->articleViewerNg(), &ArticleViewerWebEngine::articleAction, this, &MainWidget::slotArticleAction); connect(m_tabWidget, &TabWidget::signalCopyInFrame, m_mainFrame, &MainFrame::slotCopyInFrame); connect(m_tabWidget, &TabWidget::signalPrintInFrame, m_mainFrame, &MainFrame::slotPrintInFrame); connect(m_tabWidget, &TabWidget::signalZoomChangedInFrame, m_mainFrame, &MainFrame::slotZoomChangeInFrame); connect(m_tabWidget, &TabWidget::signalPrintPreviewInFrame, m_mainFrame, &MainFrame::slotPrintPreviewInFrame); connect(m_tabWidget, &TabWidget::signalFindTextInFrame, m_mainFrame, &MainFrame::slotFindTextInFrame); connect(m_tabWidget, &TabWidget::signalTextToSpeechInFrame, m_mainFrame, &MainFrame::slotTextToSpeechInFrame); connect(m_tabWidget, &TabWidget::signalSaveLinkAsInFrame, m_mainFrame, &MainFrame::slotSaveLinkAsInFrame); connect(m_tabWidget, &TabWidget::signalCopyLinkAsInFrame, m_mainFrame, &MainFrame::slotCopyLinkAsInFrame); connect(m_tabWidget, &TabWidget::signalCopyImageLocation, m_mainFrame, &MainFrame::slotCopyImageLocationInFrame); connect(m_tabWidget, &TabWidget::signalSaveImageOnDisk, m_mainFrame, &MainFrame::slotSaveImageOnDiskInFrame); connect(m_tabWidget, &TabWidget::signalMute, m_mainFrame, &MainFrame::slotMute); Kernel::self()->frameManager()->slotAddFrame(m_mainFrame); const QList sp1sizes = Settings::splitter1Sizes(); if (sp1sizes.count() >= m_horizontalSplitter->count()) { m_horizontalSplitter->setSizes(sp1sizes); } const QList sp2sizes = Settings::splitter2Sizes(); if (sp2sizes.count() >= m_articleSplitter->count()) { m_articleSplitter->setSizes(sp2sizes); } if (!Settings::self()->disableIntroduction()) { m_articleWidget->hide(); m_articleViewer->displayAboutPage(); m_mainFrame->slotSetTitle(i18n("About")); m_displayingAboutPage = true; } m_fetchTimer = new QTimer(this); connect(m_fetchTimer, &QTimer::timeout, this, &MainWidget::slotDoIntervalFetches); m_fetchTimer->start(1000 * 60); // delete expired articles once per hour m_expiryTimer = new QTimer(this); connect(m_expiryTimer, &QTimer::timeout, this, &MainWidget::slotDeleteExpiredArticles); m_expiryTimer->start(3600 * 1000); m_markReadTimer = new QTimer(this); m_markReadTimer->setSingleShot(true); connect(m_markReadTimer, &QTimer::timeout, this, &MainWidget::slotSetCurrentArticleReadDelayed); setFeedList(QSharedPointer(new FeedList(Kernel::self()->storage()))); switch (Settings::viewMode()) { case CombinedView: slotCombinedView(); break; case WidescreenView: slotWidescreenView(); break; default: slotNormalView(); } if (!Settings::resetQuickFilterOnNodeChange()) { m_searchBar->slotSetStatus(Settings::statusFilter()); m_searchBar->slotSetText(Settings::textFilter()); } } void MainWidget::slotSettingsChanged() { m_tabWidget->slotSettingsChanged(); m_articleViewer->updateAfterConfigChanged(); } void MainWidget::slotSetFocusToViewer() { m_articleViewer->setFocus(); } void MainWidget::slotOnShutdown() { disconnect(m_tabWidget, &TabWidget::signalCurrentFrameChanged, this, &MainWidget::slotCurrentFrameChanged); m_shuttingDown = true; // close all pageviewers in a controlled way // fixes bug 91660, at least when no part loading data while (m_tabWidget->count() > 1) { // remove frames until only the main frame remains m_tabWidget->setCurrentIndex(m_tabWidget->count() - 1); // select last page m_tabWidget->slotRemoveCurrentFrame(); } Kernel::self()->fetchQueue()->slotAbort(); setFeedList(QSharedPointer()); delete m_feedListManagementInterface; delete m_feedListView; // call delete here, so that the header settings will get saved delete m_articleListView; // same for this one delete m_mainTab; delete m_mainFrame; m_mainFrame = nullptr; Settings::self()->save(); } void MainWidget::saveSettings() { const QList spl1 = m_horizontalSplitter->sizes(); if (std::count(spl1.begin(), spl1.end(), 0) == 0) { Settings::setSplitter1Sizes(spl1); } const QList spl2 = m_articleSplitter->sizes(); if (std::count(spl2.begin(), spl2.end(), 0) == 0) { Settings::setSplitter2Sizes(spl2); } Settings::setViewMode(m_viewMode); Settings::self()->save(); } void MainWidget::connectFrame(Akregator::WebEngineFrame *frame) { connect(m_tabWidget, &TabWidget::signalCopyInFrame, frame, &WebEngineFrame::slotCopyInFrame); connect(m_tabWidget, &TabWidget::signalPrintInFrame, frame, &WebEngineFrame::slotPrintInFrame); connect(m_tabWidget, &TabWidget::signalZoomChangedInFrame, frame, &WebEngineFrame::slotZoomChangeInFrame); connect(m_tabWidget, &TabWidget::signalPrintPreviewInFrame, frame, &WebEngineFrame::slotPrintPreviewInFrame); connect(m_tabWidget, &TabWidget::signalFindTextInFrame, frame, &WebEngineFrame::slotFindTextInFrame); connect(m_tabWidget, &TabWidget::signalTextToSpeechInFrame, frame, &WebEngineFrame::slotTextToSpeechInFrame); connect(m_tabWidget, &TabWidget::signalSaveLinkAsInFrame, frame, &WebEngineFrame::slotSaveLinkAsInFrame); connect(m_tabWidget, &TabWidget::signalCopyLinkAsInFrame, frame, &WebEngineFrame::slotCopyLinkAsInFrame); connect(m_tabWidget, &TabWidget::signalCopyImageLocation, frame, &WebEngineFrame::slotCopyImageLocationInFrame); connect(m_tabWidget, &TabWidget::signalSaveImageOnDisk, frame, &WebEngineFrame::slotSaveImageOnDiskInFrame); connect(m_tabWidget, &TabWidget::signalMute, frame, &WebEngineFrame::slotMute); connect(frame, &WebEngineFrame::showStatusBarMessage, this, &MainWidget::slotShowStatusBarMessage); connect(frame, &WebEngineFrame::signalIconChanged, m_tabWidget, &TabWidget::slotSetIcon); connect(frame, &WebEngineFrame::webPageMutedOrAudibleChanged, m_tabWidget, &TabWidget::slotWebPageMutedOrAudibleChanged); } void MainWidget::slotRequestNewFrame(int &frameId) { WebEngineFrame *frame = new WebEngineFrame(m_actionManager->actionCollection(), m_tabWidget); connectFrame(frame); Kernel::self()->frameManager()->slotAddFrame(frame); frameId = frame->id(); } void MainWidget::sendArticle(bool attach) { QByteArray text; QString title; Frame *frame = Kernel::self()->frameManager()->currentFrame(); if (frame && frame->id() > 0) { // are we in some other tab than the articlelist? text = frame->url().toString().toLatin1(); title = frame->title(); } else { // nah, we're in articlelist.. const Article article = m_selectionController->currentArticle(); if (!article.isNull()) { text = article.link().toDisplayString().toLatin1(); title = Akregator::Utils::convertHtmlTags(article.title()); } } if (text.isEmpty()) { return; } sendArticle(text, title, attach); } void MainWidget::cleanUpDownloadFile() { for (QPointer job : qAsConst(mListDownloadArticleJobs)) { if (job) { job->forceCleanupTemporaryFile(); } } } void MainWidget::sendArticle(const QByteArray &text, const QString &title, bool attach) { if (attach) { QPointer download = new Akregator::DownloadArticleJob(this); download->setArticleUrl(QUrl(QString::fromUtf8(text))); download->setText(QString::fromUtf8(text)); download->setTitle(title); mListDownloadArticleJobs.append(download); download->start(); } else { QUrlQuery query; query.addQueryItem(QStringLiteral("subject"), title); query.addQueryItem(QStringLiteral("body"), QString::fromUtf8(text)); QUrl url; url.setScheme(QStringLiteral("mailto")); url.setQuery(query); QDesktopServices::openUrl(url); } } void MainWidget::importFeedList(const QDomDocument &doc) { ImportFeedListCommand *cmd = new ImportFeedListCommand; cmd->setParentWidget(this); cmd->setFeedListDocument(doc); cmd->setTargetList(m_feedList); cmd->start(); } void MainWidget::setFeedList(const QSharedPointer &list) { if (list == m_feedList) { return; } const QSharedPointer oldList = m_feedList; m_feedList = list; if (m_feedList) { connect(m_feedList.data(), &FeedList::unreadCountChanged, this, &MainWidget::slotSetTotalUnread); } slotSetTotalUnread(); m_feedListManagementInterface->setFeedList(m_feedList); Kernel::self()->setFeedList(m_feedList); ProgressManager::self()->setFeedList(m_feedList); m_selectionController->setFeedList(m_feedList); if (oldList) { oldList->disconnect(this); } slotDeleteExpiredArticles(); } void MainWidget::deleteExpiredArticles(const QSharedPointer &list) { if (!list) { return; } ExpireItemsCommand *cmd = new ExpireItemsCommand(this); cmd->setParentWidget(this); cmd->setFeedList(list); cmd->setFeeds(list->feedIds()); cmd->start(); } void MainWidget::slotDeleteExpiredArticles() { deleteExpiredArticles(m_feedList); } QDomDocument MainWidget::feedListToOPML() { QDomDocument dom; if (m_feedList) { dom = m_feedList->toOpml(); } return dom; } void MainWidget::addFeedToGroup(const QString &url, const QString &groupName) { // Locate the group. const QList namedGroups = m_feedList->findByTitle(groupName); Folder *group = nullptr; for (TreeNode *const candidate : namedGroups) { if (candidate->isGroup()) { group = static_cast(candidate); break; } } if (!group) { Folder *g = new Folder(groupName); m_feedList->allFeedsFolder()->appendChild(g); group = g; } // Invoke the Add Feed dialog with url filled in. addFeed(url, nullptr, group, true); } void MainWidget::slotNormalView() { if (m_viewMode == NormalView) { return; } if (m_viewMode == CombinedView) { m_articleWidget->show(); const Article article = m_selectionController->currentArticle(); if (!article.isNull()) { m_articleViewer->showArticle(article); } else { m_articleViewer->slotShowSummary(m_selectionController->selectedSubscription()); } } m_articleSplitter->setOrientation(Qt::Vertical); m_viewMode = NormalView; Settings::setViewMode(m_viewMode); } void MainWidget::slotWidescreenView() { if (m_viewMode == WidescreenView) { return; } if (m_viewMode == CombinedView) { m_articleWidget->show(); Article article = m_selectionController->currentArticle(); if (!article.isNull()) { m_articleViewer->showArticle(article); } else { m_articleViewer->slotShowSummary(m_selectionController->selectedSubscription()); } } m_articleSplitter->setOrientation(Qt::Horizontal); m_viewMode = WidescreenView; Settings::setViewMode(m_viewMode); } void MainWidget::slotCombinedView() { if (m_viewMode == CombinedView) { return; } m_articleListView->slotClear(); m_articleWidget->hide(); m_viewMode = CombinedView; Settings::setViewMode(m_viewMode); } void MainWidget::slotMoveCurrentNodeUp() { TreeNode *current = m_selectionController->selectedSubscription(); if (!current) { return; } TreeNode *prev = current->prevSibling(); Folder *parent = current->parent(); if (!prev || !parent) { return; } parent->removeChild(prev); parent->insertChild(prev, current); m_feedListView->ensureNodeVisible(current); } void MainWidget::slotMoveCurrentNodeDown() { TreeNode *current = m_selectionController->selectedSubscription(); if (!current) { return; } TreeNode *next = current->nextSibling(); Folder *parent = current->parent(); if (!next || !parent) { return; } parent->removeChild(current); parent->insertChild(current, next); m_feedListView->ensureNodeVisible(current); } void MainWidget::slotMoveCurrentNodeLeft() { TreeNode *current = m_selectionController->selectedSubscription(); if (!current || !current->parent() || !current->parent()->parent()) { return; } Folder *parent = current->parent(); Folder *grandparent = current->parent()->parent(); parent->removeChild(current); grandparent->insertChild(current, parent); m_feedListView->ensureNodeVisible(current); } void MainWidget::slotMoveCurrentNodeRight() { TreeNode *current = m_selectionController->selectedSubscription(); if (!current || !current->parent()) { return; } TreeNode *prev = current->prevSibling(); if (prev && prev->isGroup()) { Folder *fg = static_cast(prev); current->parent()->removeChild(current); fg->appendChild(current); m_feedListView->ensureNodeVisible(current); } } void MainWidget::slotSendLink() { sendArticle(); } void MainWidget::slotSendFile() { sendArticle(true); } void MainWidget::slotNodeSelected(TreeNode *node) { m_markReadTimer->stop(); if (m_displayingAboutPage) { m_mainFrame->slotSetTitle(i18n("Articles")); if (m_viewMode != CombinedView) { m_articleWidget->show(); } if (Settings::showQuickFilter()) { m_searchBar->show(); } m_displayingAboutPage = false; } m_tabWidget->setCurrentWidget(m_mainFrame); if (Settings::resetQuickFilterOnNodeChange()) { m_searchBar->slotClearSearch(); } if (m_viewMode == CombinedView) { m_articleViewer->showNode(node); } else { m_articleViewer->slotShowSummary(node); } if (node) { m_mainFrame->setWindowTitle(node->title()); } m_actionManager->slotNodeSelected(node); } void MainWidget::slotFeedAdd() { Folder *group = nullptr; if (!m_selectionController->selectedSubscription()) { group = m_feedList->allFeedsFolder(); } else { if (m_selectionController->selectedSubscription()->isGroup()) { group = static_cast(m_selectionController->selectedSubscription()); } else { group = m_selectionController->selectedSubscription()->parent(); } } TreeNode *const lastChild = !group->children().isEmpty() ? group->children().last() : nullptr; addFeed(QString(), lastChild, group, false); } void MainWidget::addFeed(const QString &url, TreeNode *after, Folder *parent, bool autoExec) { CreateFeedCommand *cmd(new CreateFeedCommand(this)); cmd->setParentWidget(this); cmd->setPosition(parent, after); cmd->setRootFolder(m_feedList->allFeedsFolder()); cmd->setAutoExecute(autoExec); cmd->setUrl(url); cmd->setSubscriptionListView(m_feedListView); cmd->start(); } void MainWidget::slotFeedAddGroup() { CreateFolderCommand *cmd = new CreateFolderCommand(this); cmd->setParentWidget(this); cmd->setSelectedSubscription(m_selectionController->selectedSubscription()); cmd->setRootFolder(m_feedList->allFeedsFolder()); cmd->setSubscriptionListView(m_feedListView); cmd->start(); } void MainWidget::slotFeedRemove() { TreeNode *selectedNode = m_selectionController->selectedSubscription(); // don't delete root element! (safety valve) if (!selectedNode || selectedNode == m_feedList->allFeedsFolder()) { return; } DeleteSubscriptionCommand *cmd = new DeleteSubscriptionCommand(this); cmd->setParentWidget(this); cmd->setSubscription(m_feedList, selectedNode->id()); cmd->start(); } void MainWidget::slotFeedModify() { TreeNode *const node = m_selectionController->selectedSubscription(); if (!node) { return; } EditSubscriptionCommand *cmd = new EditSubscriptionCommand(this); cmd->setParentWidget(this); cmd->setSubscription(m_feedList, node->id()); cmd->setSubscriptionListView(m_feedListView); cmd->start(); } void MainWidget::slotNextUnreadArticle() { ensureArticleTabVisible(); if (m_viewMode == CombinedView) { m_feedListView->slotNextUnreadFeed(); return; } TreeNode *sel = m_selectionController->selectedSubscription(); if (sel && sel->unread() > 0) { m_articleListView->slotNextUnreadArticle(); } else { m_feedListView->slotNextUnreadFeed(); } } void MainWidget::slotPrevUnreadArticle() { ensureArticleTabVisible(); if (m_viewMode == CombinedView) { m_feedListView->slotPrevUnreadFeed(); return; } TreeNode *sel = m_selectionController->selectedSubscription(); if (sel && sel->unread() > 0) { m_articleListView->slotPreviousUnreadArticle(); } else { m_feedListView->slotPrevUnreadFeed(); } } void MainWidget::slotMarkAllFeedsRead() { KJob *job = m_feedList->createMarkAsReadJob(); connect(job, &KJob::finished, m_selectionController, &AbstractSelectionController::forceFilterUpdate); job->start(); } void MainWidget::slotMarkAllRead() { if (!m_selectionController->selectedSubscription()) { return; } KJob *job = m_selectionController->selectedSubscription()->createMarkAsReadJob(); connect(job, &KJob::finished, m_selectionController, &AbstractSelectionController::forceFilterUpdate); job->start(); } void MainWidget::slotSetTotalUnread() { Q_EMIT signalUnreadCountChanged(m_feedList ? m_feedList->unread() : 0); } void MainWidget::slotDoIntervalFetches() { if (!m_feedList) { return; } #if 0 // the following solid check apparently doesn't work reliably and causes // interval fetching not working although the user is actually online (but solid reports he's not const Networking::Status status = Solid::Networking::status(); if (status != Networking::Connected && status != Networking::Unknown) { return; } #endif m_feedList->addToFetchQueue(Kernel::self()->fetchQueue(), true); } void MainWidget::slotFetchCurrentFeed() { if (!m_selectionController->selectedSubscription()) { return; } if (isNetworkAvailable()) { m_selectionController->selectedSubscription()->slotAddToFetchQueue(Kernel::self()->fetchQueue()); } else { m_mainFrame->slotSetStatusText(i18n("Networking is not available.")); } } void MainWidget::slotFetchAllFeeds() { if (m_feedList && isNetworkAvailable()) { m_feedList->addToFetchQueue(Kernel::self()->fetchQueue()); } else if (m_feedList) { m_mainFrame->slotSetStatusText(i18n("Networking is not available.")); } } void MainWidget::slotFetchingStarted() { m_mainFrame->slotSetState(Frame::Started); m_actionManager->action(QStringLiteral("feed_stop"))->setEnabled(true); m_mainFrame->slotSetStatusText(i18n("Fetching Feeds...")); } void MainWidget::slotFetchingStopped() { m_mainFrame->slotSetState(Frame::Completed); m_actionManager->action(QStringLiteral("feed_stop"))->setEnabled(false); m_mainFrame->slotSetStatusText(QString()); } void MainWidget::slotArticleSelected(const Akregator::Article &article) { if (m_viewMode == CombinedView) { return; } m_markReadTimer->stop(); Q_ASSERT(article.isNull() || article.feed()); QVector

articles = m_selectionController->selectedArticles(); Q_EMIT signalArticlesSelected(articles); KToggleAction *const maai = qobject_cast(m_actionManager->action(QStringLiteral("article_set_status_important"))); Q_ASSERT(maai); maai->setChecked(article.keep()); m_articleViewer->showArticle(article); if (m_selectionController->selectedArticles().isEmpty()) { m_articleListView->setCurrentIndex(m_selectionController->currentArticleIndex()); } if (article.isNull() || article.status() == Akregator::Read) { return; } if (!Settings::useMarkReadDelay()) { return; } const int delay = Settings::markReadDelay(); if (delay > 0) { m_markReadTimer->start(delay * 1000); } else { Akregator::ArticleModifyJob *job = new Akregator::ArticleModifyJob; const Akregator::ArticleId aid = { article.feed()->xmlUrl(), article.guid() }; job->setStatus(aid, Akregator::Read); job->start(); } } void MainWidget::slotMouseButtonPressed(int button, const QUrl &url) { if (button != Qt::MidButton) { return; } if (!url.isValid()) { return; } OpenUrlRequest req(url); switch (Settings::mMBBehaviour()) { case Settings::EnumMMBBehaviour::OpenInExternalBrowser: req.setOptions(OpenUrlRequest::ExternalBrowser); break; case Settings::EnumMMBBehaviour::OpenInBackground: req.setOptions(OpenUrlRequest::NewTab); req.setOpenInBackground(true); break; default: req.setOptions(OpenUrlRequest::NewTab); req.setOpenInBackground(false); } Kernel::self()->frameManager()->slotOpenUrlRequest(req); } void MainWidget::slotOpenHomepage() { Feed *feed = dynamic_cast(m_selectionController->selectedSubscription()); if (!feed) { return; } QUrl url(feed->htmlUrl()); if (url.isValid()) { OpenUrlRequest req(url); req.setOptions(OpenUrlRequest::ExternalBrowser); Kernel::self()->frameManager()->slotOpenUrlRequest(req); } } void MainWidget::slotOpenSelectedArticlesInBrowser() { const QVector

articles = m_selectionController->selectedArticles(); for (const Akregator::Article &article : articles) { slotOpenArticleInBrowser(article); } } void MainWidget::slotOpenArticleInBrowser(const Akregator::Article &article) { if (!article.isNull() && article.link().isValid()) { OpenUrlRequest req(article.link()); req.setOptions(OpenUrlRequest::ExternalBrowser); Kernel::self()->frameManager()->slotOpenUrlRequest(req); } } void MainWidget::openSelectedArticles(bool openInBackground) { const QVector

articles = m_selectionController->selectedArticles(); for (const Akregator::Article &article : articles) { const QUrl url = article.link(); if (!url.isValid()) { continue; } OpenUrlRequest req(url); req.setOptions(OpenUrlRequest::NewTab); if (openInBackground) { req.setOpenInBackground(true); Kernel::self()->frameManager()->slotOpenUrlRequest(req, false /*don't use settings for open in background*/); } else { Kernel::self()->frameManager()->slotOpenUrlRequest(req); } } } void MainWidget::currentArticleInfo(QString &link, QString &title) { const Article article = m_selectionController->currentArticle(); if (article.isNull()) { return; } if (article.link().isValid()) { link = article.link().url(); title = Utils::convertHtmlTags(article.title()); } } void MainWidget::updateQuickSearchLineText() { m_searchBar->updateQuickSearchLineText(m_actionManager->quickSearchLineText()); } void MainWidget::slotCopyLinkAddress() { const Article article = m_selectionController->currentArticle(); if (article.isNull()) { return; } QString link; if (article.link().isValid()) { link = article.link().url(); QClipboard *cb = QApplication::clipboard(); cb->setText(link, QClipboard::Clipboard); // don't set url to selection as it's a no-no according to a fd.o spec //cb->setText(link, QClipboard::Selection); } } void MainWidget::slotToggleShowQuickFilter() { if (Settings::showQuickFilter()) { Settings::setShowQuickFilter(false); m_searchBar->slotClearSearch(); m_searchBar->hide(); } else { Settings::setShowQuickFilter(true); if (!m_displayingAboutPage) { m_searchBar->show(); } } } void MainWidget::slotArticleDelete() { if (m_viewMode == CombinedView) { return; } const QVector

articles = m_selectionController->selectedArticles(); QString msg; switch (articles.count()) { case 0: return; case 1: msg = i18n("Are you sure you want to delete article %1?", articles.first().title()); break; default: msg = i18np("Are you sure you want to delete the selected article?", "Are you sure you want to delete the %1 selected articles?", articles.count()); } if (KMessageBox::warningContinueCancel(this, msg, i18n("Delete Article"), KStandardGuiItem::del(), KStandardGuiItem::cancel(), QStringLiteral("Disable delete article confirmation")) != KMessageBox::Continue) { return; } TreeNode *const selected = m_selectionController->selectedSubscription(); if (selected) { selected->setNotificationMode(false); } Akregator::ArticleDeleteJob *job = new Akregator::ArticleDeleteJob; for (const Akregator::Article &i : articles) { Feed *const feed = i.feed(); if (!feed) { continue; } const Akregator::ArticleId aid = { feed->xmlUrl(), i.guid() }; job->appendArticleId(aid); } job->start(); if (selected) { selected->setNotificationMode(true); } } void MainWidget::slotFramesChanged() { // We need to wait till the frame is fully loaded QMetaObject::invokeMethod(m_part, &Akregator::Part::slotAutoSave, Qt::QueuedConnection); } void MainWidget::slotArticleToggleKeepFlag(bool) { const QVector

articles = m_selectionController->selectedArticles(); if (articles.isEmpty()) { return; } bool allFlagsSet = true; for (const Akregator::Article &i : articles) { allFlagsSet = allFlagsSet && i.keep(); if (!allFlagsSet) { break; } } Akregator::ArticleModifyJob *job = new Akregator::ArticleModifyJob; for (const Akregator::Article &i : articles) { const Akregator::ArticleId aid = { i.feed()->xmlUrl(), i.guid() }; job->setKeep(aid, !allFlagsSet); } job->start(); } namespace { void setArticleStatus(const QString &feedUrl, const QString &articleId, int status) { if (!feedUrl.isEmpty() && !articleId.isEmpty()) { Akregator::ArticleModifyJob *job = new Akregator::ArticleModifyJob; const Akregator::ArticleId aid = { feedUrl, articleId }; job->setStatus(aid, status); job->start(); } } void setSelectedArticleStatus(const Akregator::AbstractSelectionController *controller, int status) { const QVector articles = controller->selectedArticles(); if (articles.isEmpty()) { return; } Akregator::ArticleModifyJob *job = new Akregator::ArticleModifyJob; for (const Akregator::Article &i : articles) { const Akregator::ArticleId aid = { i.feed()->xmlUrl(), i.guid() }; job->setStatus(aid, status); } job->start(); } } void MainWidget::slotSetSelectedArticleRead() { ::setSelectedArticleStatus(m_selectionController, Akregator::Read); } void MainWidget::slotSetSelectedArticleUnread() { ::setSelectedArticleStatus(m_selectionController, Akregator::Unread); } void MainWidget::slotSetSelectedArticleNew() { ::setSelectedArticleStatus(m_selectionController, Akregator::New); } void MainWidget::slotSetCurrentArticleReadDelayed() { const Article article = m_selectionController->currentArticle(); if (article.isNull()) { return; } Akregator::ArticleModifyJob *const job = new Akregator::ArticleModifyJob; const Akregator::ArticleId aid = { article.feed()->xmlUrl(), article.guid() }; job->setStatus(aid, Akregator::Read); job->start(); } void MainWidget::slotShowStatusBarMessage(const QString &msg) { KPIM::BroadcastStatus::instance()->setStatusMsg(msg); } void MainWidget::readProperties(const KConfigGroup &config) { if (!Settings::resetQuickFilterOnNodeChange()) { // read filter settings m_searchBar->slotSetText(config.readEntry("searchLine")); m_searchBar->slotSetStatus(config.readEntry("searchCombo").toInt()); } const QString currentTabName = config.readEntry("CurrentTab"); // Reopen tabs const QStringList childList = config.readEntry(QStringLiteral("Children"), QStringList()); int currentFrameId = -1; for (const QString &framePrefix : childList) { WebEngineFrame *const frame = new WebEngineFrame(m_actionManager->actionCollection(), m_tabWidget); frame->loadConfig(config, framePrefix + QLatin1Char('_')); connectFrame(frame); Kernel::self()->frameManager()->slotAddFrame(frame); if (currentTabName == framePrefix) { currentFrameId = frame->id(); } } if (currentFrameId != -1) { m_tabWidget->slotSelectFrame(currentFrameId); } } void MainWidget::saveProperties(KConfigGroup &config) { // save filter settings const QString searchStr(m_searchBar->text()); if (searchStr.isEmpty()) { config.deleteEntry("searchLine"); } else { config.writeEntry("searchLine", m_searchBar->text()); } config.writeEntry("searchCombo", static_cast(m_searchBar->status())); Kernel::self()->frameManager()->saveProperties(config); } void MainWidget::ensureArticleTabVisible() { m_tabWidget->setCurrentWidget(m_mainFrame); } void MainWidget::slotReloadAllTabs() { m_tabWidget->slotReloadAllTabs(); } bool MainWidget::isNetworkAvailable() const { return PimCommon::NetworkManager::self()->networkConfigureManager()->isOnline(); } void MainWidget::slotNetworkStatusChanged(bool status) { if (status) { m_mainFrame->slotSetStatusText(i18n("Networking is available now.")); this->slotFetchAllFeeds(); } else { m_mainFrame->slotSetStatusText(i18n("Networking is not available.")); } } void MainWidget::slotOpenSelectedArticles() { openSelectedArticles(false); } void MainWidget::slotOpenSelectedArticlesInBackground() { openSelectedArticles(true); } void MainWidget::slotCurrentFrameChanged(int frameId) { Kernel::self()->frameManager()->slotChangeFrame(frameId); m_actionManager->zoomActionMenu()->setZoomFactor(Kernel::self()->frameManager()->currentFrame()->zoomFactor() * 100); } void MainWidget::slotFocusQuickSearch() { m_searchBar->setFocusSearchLine(); } void MainWidget::slotArticleAction(Akregator::ArticleViewerWebEngine::ArticleAction type, const QString &articleId, const QString &feed) { switch (type) { case ArticleViewerWebEngine::DeleteAction: { Akregator::ArticleDeleteJob *job = new Akregator::ArticleDeleteJob; const Akregator::ArticleId aid = { feed, articleId }; job->appendArticleId(aid); job->start(); break; } case ArticleViewerWebEngine::MarkAsRead: ::setArticleStatus(feed, articleId, Akregator::Read); break; case ArticleViewerWebEngine::MarkAsUnRead: ::setArticleStatus(feed, articleId, Akregator::Unread); break; case ArticleViewerWebEngine::MarkAsImportant: { Akregator::ArticleModifyJob *job = new Akregator::ArticleModifyJob; const Akregator::Article article = m_feedList->findArticle(feed, articleId); const Akregator::ArticleId aid = { feed, articleId }; job->setKeep(aid, !article.keep()); job->start(); break; } case ArticleViewerWebEngine::SendUrlArticle: { case ArticleViewerWebEngine::SendFileArticle: const Article article = m_feedList->findArticle(feed, articleId); const QByteArray text = article.link().toDisplayString().toLatin1(); const QString title = Akregator::Utils::convertHtmlTags(article.title()); if (text.isEmpty()) { return; } sendArticle(text, title, (type == ArticleViewerWebEngine::SendFileArticle)); break; } case ArticleViewerWebEngine::OpenInBackgroundTab: { const Akregator::Article article = m_feedList->findArticle(feed, articleId); const QUrl url = article.link(); if (url.isValid()) { OpenUrlRequest req(url); req.setOptions(OpenUrlRequest::NewTab); req.setOpenInBackground(true); Kernel::self()->frameManager()->slotOpenUrlRequest(req, false /*don't use settings for open in background*/); } break; } case ArticleViewerWebEngine::OpenInExternalBrowser: { const Akregator::Article article = m_feedList->findArticle(feed, articleId); slotOpenArticleInBrowser(article); break; } } } diff --git a/src/notificationmanager.cpp b/src/notificationmanager.cpp index 5e8e1972..c0b821ec 100644 --- a/src/notificationmanager.cpp +++ b/src/notificationmanager.cpp @@ -1,146 +1,146 @@ /* This file is part of Akregator. Copyright (C) 2005 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "notificationmanager.h" #include "feed.h" #include -#include +#include #include #include using namespace Akregator; NotificationManager::NotificationManager(QObject *parent) : QObject(parent) { m_intervalsLapsed = 0; m_checkInterval = 2000; m_maxIntervals = 10; m_running = false; m_addedInLastInterval = false; m_maxArticles = 20; m_widget = nullptr; } NotificationManager::~NotificationManager() { m_self = nullptr; } void NotificationManager::setWidget(QWidget *widget, const QString &componentName) { m_widget = widget; m_componantName = componentName.isEmpty() ? KAboutData::applicationData().componentName() : componentName; } void NotificationManager::slotNotifyArticle(const Article &article) { m_articles.append(article); m_addedInLastInterval = true; if (!m_running) { m_running = true; QTimer::singleShot(m_checkInterval, this, &NotificationManager::slotIntervalCheck); } } void NotificationManager::slotNotifyFeeds(const QStringList &feeds) { const int feedsCount(feeds.count()); if (feedsCount == 1) { KNotification::event(QStringLiteral("FeedAdded"), i18n("Feed added:\n %1", feeds[0]), QPixmap(), m_widget, KNotification::CloseOnTimeout, m_componantName); } else if (feedsCount > 1) { QString message; QStringList::ConstIterator end = feeds.constEnd(); for (QStringList::ConstIterator it = feeds.constBegin(); it != end; ++it) { message += *it + QLatin1Char('\n'); } KNotification::event(QStringLiteral("FeedAdded"), i18n("Feeds added:\n %1", message), QPixmap(), m_widget, KNotification::CloseOnTimeout, m_componantName); } } void NotificationManager::doNotify() { QString message = QStringLiteral(""); QString feedTitle; int entriesCount = 1; const int maxNewArticlesShown = 2; // adding information about how many new articles auto feedClosure = [&entriesCount, &message]() { if ((entriesCount - maxNewArticlesShown) > 1) { message += i18np("and 1 other", "and %1 others", entriesCount - maxNewArticlesShown - 1) + QLatin1String("
"); } }; for (const Article &i : qAsConst(m_articles)) { const QString currentFeedTitle(i.feed()->title()); if (feedTitle != currentFeedTitle) { // closing previous feed, if any, and resetting the counter feedClosure(); entriesCount = 1; // starting a new feed feedTitle = currentFeedTitle; message += QStringLiteral("

%1:

").arg(feedTitle); } // check not exceeding maxNewArticlesShown per feed if (entriesCount <= maxNewArticlesShown) { message += i.title() + QLatin1String("
"); } entriesCount++; } feedClosure(); message += QLatin1String(""); KNotification::event(QStringLiteral("NewArticles"), message, QPixmap(), m_widget, KNotification::CloseOnTimeout, m_componantName); m_articles.clear(); m_running = false; m_intervalsLapsed = 0; m_addedInLastInterval = false; } void NotificationManager::slotIntervalCheck() { if (!m_running) { return; } m_intervalsLapsed++; if (!m_addedInLastInterval || m_articles.count() >= m_maxArticles || m_intervalsLapsed >= m_maxIntervals) { doNotify(); } else { m_addedInLastInterval = false; QTimer::singleShot(m_checkInterval, this, &NotificationManager::slotIntervalCheck); } } NotificationManager *NotificationManager::m_self = nullptr; NotificationManager *NotificationManager::self() { static NotificationManager self; if (!m_self) { m_self = &self; } return m_self; } diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp index d77d701a..a75c6251 100644 --- a/src/pluginmanager.cpp +++ b/src/pluginmanager.cpp @@ -1,205 +1,205 @@ /*************************************************************************** begin : 2004/03/12 copyright : (C) Mark Kretschmann email : markey@web.de ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "pluginmanager.h" #include "plugin.h" #include #include #include "akregator_debug.h" #include -#include +#include using std::vector; using Akregator::Plugin; namespace Akregator { vector PluginManager::m_store; ///////////////////////////////////////////////////////////////////////////////////// // PUBLIC INTERFACE ///////////////////////////////////////////////////////////////////////////////////// KService::List PluginManager::query(const QString &constraint) { // Add versioning constraint QString str = QStringLiteral("[X-KDE-akregator-framework-version] == "); str += QString::number(AKREGATOR_PLUGIN_INTERFACE_VERSION); str += QStringLiteral(" and "); if (!constraint.trimmed().isEmpty()) { str += constraint + QStringLiteral(" and "); } str += QStringLiteral("[X-KDE-akregator-rank] > 0"); qCDebug(AKREGATOR_LOG) << "Plugin trader constraint:" << str; return KServiceTypeTrader::self()->query(QStringLiteral("Akregator/Plugin"), str); } Plugin * PluginManager::createFromQuery(const QString &constraint) { KService::List offers = query(constraint); if (offers.isEmpty()) { qCWarning(AKREGATOR_LOG) << "No matching plugin found."; return nullptr; } // Select plugin with highest rank int rank = 0; int current = 0; for (int i = 0; i < offers.count(); ++i) { if (offers[i]->property(QStringLiteral("X-KDE-akregator-rank")).toInt() > rank) { current = i; } } return createFromService(offers[current]); } Plugin * PluginManager::createFromService(const KService::Ptr &service, QObject *parent) { qCDebug(AKREGATOR_LOG) << "Trying to load:" << service->library(); KPluginLoader loader(*service); KPluginFactory *factory = loader.factory(); if (!factory) { qCWarning(AKREGATOR_LOG) << QStringLiteral(" Could not create plugin factory for: %1\n" " Error message: %2").arg(service->library(), loader.errorString()); return nullptr; } Plugin *const plugin = factory->create(parent); //put plugin into store StoreItem item; item.plugin = plugin; item.service = service; m_store.push_back(item); dump(service); return plugin; } void PluginManager::unload(Plugin *plugin) { #ifdef TEMPORARILY_REMOVED vector::iterator iter = lookupPlugin(plugin); if (iter != m_store.end()) { delete(*iter).plugin; qCDebug(AKREGATOR_LOG) << "Unloading library:" << (*iter).service->library(); //PENDING(kdab,frank) Review (*iter).library->unload(); m_store.erase(iter); } else { qCWarning(AKREGATOR_LOG) << "Could not unload plugin (not found in store)."; } #else //TEMPORARILY_REMOVED Q_UNUSED(plugin) qCWarning(AKREGATOR_LOG) << "PluginManager::unload temporarily disabled"; #endif //TEMPORARILY_REMOVED } KService::Ptr PluginManager::getService(const Plugin *plugin) { if (!plugin) { qCWarning(AKREGATOR_LOG) << "pointer == NULL"; return KService::Ptr(nullptr); } //search plugin in store vector::const_iterator iter = lookupPlugin(plugin); if (iter == m_store.end()) { qCWarning(AKREGATOR_LOG) << "Plugin not found in store."; return KService::Ptr(nullptr); } return (*iter).service; } void PluginManager::showAbout(const QString &constraint) { KService::List offers = query(constraint); if (offers.isEmpty()) { return; } KService::Ptr s = offers.front(); const QString body = QStringLiteral("%1%2"); QString str = QStringLiteral(""); str += body.arg(i18nc("Name of the plugin", "Name"), s->name()); str += body.arg(i18nc("Library name", "Library"), s->library()); str += body.arg(i18nc("Plugin authors", "Authors"), s->property(QStringLiteral("X-KDE-akregator-authors")).toStringList().join(QLatin1Char('\n'))); str += body.arg(i18nc("Plugin authors' emaila addresses", "Email"), s->property(QStringLiteral("X-KDE-akregator-email")).toStringList().join(QLatin1Char('\n'))); str += body.arg(i18nc("Plugin version", "Version"), s->property(QStringLiteral("X-KDE-akregator-version")).toString()); str += body.arg(i18nc("Framework version plugin requires", "Framework Version"), s->property(QStringLiteral("X-KDE-akregator-framework-version")).toString()); str += QStringLiteral("

"); KMessageBox::information(nullptr, str, i18n("Plugin Information")); } void PluginManager::dump(const KService::Ptr &service) { qCDebug(AKREGATOR_LOG) << "PluginManager Service Info:" << "---------------------------" << "name : " << service->name() << "library : " << service->library() << "desktopEntryPath : " << service->entryPath() << "X-KDE-akregator-plugintype : " << service->property(QStringLiteral("X-KDE-akregator-plugintype")).toString() << "X-KDE-akregator-name : " << service->property(QStringLiteral("X-KDE-akregator-name")).toString() << "X-KDE-akregator-authors : " << service->property(QStringLiteral("X-KDE-akregator-authors")).toStringList() << "X-KDE-akregator-rank : " << service->property(QStringLiteral("X-KDE-akregator-rank")).toString() << "X-KDE-akregator-version : " << service->property(QStringLiteral("X-KDE-akregator-version")).toString() << "X-KDE-akregator-framework-version: " << service->property(QStringLiteral("X-KDE-akregator-framework-version")).toString(); } ///////////////////////////////////////////////////////////////////////////////////// // PRIVATE INTERFACE ///////////////////////////////////////////////////////////////////////////////////// vector::iterator PluginManager::lookupPlugin(const Plugin *plugin) { vector::iterator iter; //search plugin pointer in store vector::const_iterator end; for (iter = m_store.begin(); iter != end; ++iter) { if ((*iter).plugin == plugin) { break; } } return iter; } } // namespace Akregator diff --git a/src/pluginmanager.h b/src/pluginmanager.h index adac17b6..09047169 100644 --- a/src/pluginmanager.h +++ b/src/pluginmanager.h @@ -1,112 +1,112 @@ /*************************************************************************** begin : 2004/03/12 copyright : (C) Mark Kretschmann email : markey@web.de ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef AKREGATOR_PLUGINMANAGER_H #define AKREGATOR_PLUGINMANAGER_H #include "akregatorpart_export.h" #include -#include +#include #include namespace Akregator { class Plugin; class AKREGATORPART_EXPORT PluginManager { public: /** * It will return a list of services that match your * specifications. The only required parameter is the service * type. This is something like 'text/plain' or 'text/html'. The * constraint parameter is used to limit the possible choices * returned based on the constraints you give it. * * The @p constraint language is rather full. The most common * keywords are AND, OR, NOT, IN, and EXIST, all used in an * almost spoken-word form. An example is: * \code * (Type == 'Service') and (('KParts/ReadOnlyPart' in ServiceTypes) or (exist Exec)) * \endcode * * The keys used in the query (Type, ServiceType, Exec) are all * fields found in the .desktop files. * * @param constraint A constraint to limit the choices returned, QString() to * get all services of the given @p servicetype * * @return A list of services that satisfy the query * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ static KService::List query(const QString &constraint = QString()); /** * Load and instantiate plugin from query * @param constraint A constraint to limit the choices returned, QString() to * get all services of the given @p servicetype * @return Pointer to Plugin, or NULL if error * @see http://developer.kde.org/documentation/library/kdeqt/tradersyntax.html */ static Akregator::Plugin *createFromQuery(const QString &constraint = QString()); /** * Load and instantiate plugin from service * @param service Pointer to KService * @param parent Parent object * @return Pointer to Plugin, or NULL if error */ static Akregator::Plugin *createFromService(const KService::Ptr &service, QObject *parent = nullptr); /** * Remove library and delete plugin * @param plugin Pointer to plugin */ static void unload(Akregator::Plugin *plugin); /** * Look up service for loaded plugin from store * @param plugin Pointer to plugin * @return KService, or 0 if not found */ static KService::Ptr getService(const Akregator::Plugin *plugin); /** * Dump properties from a service to stdout for debugging * @param service Pointer to KService */ static void dump(const KService::Ptr &service); /** * Show modal info dialog about plugin * @param constraint A constraint to limit the choices returned */ static void showAbout(const QString &constraint); private: struct StoreItem { Akregator::Plugin *plugin = nullptr; KService::Ptr service; }; static std::vector::iterator lookupPlugin(const Akregator::Plugin *plugin); //attributes: static std::vector m_store; }; } // namespace Akregator #endif // AKREGATOR_PLUGINMANAGER_H diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp index b8223995..64eb482c 100644 --- a/src/tabwidget.cpp +++ b/src/tabwidget.cpp @@ -1,520 +1,520 @@ /* This file is part of Akregator. Copyright (C) 2004 Sashmit Bhaduri This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "tabwidget.h" #include #include #include #include #include #include #include #include #include "akregator_debug.h" #include #include -#include +#include #include -#include +#include #include #include #include "actionmanager.h" #include "akregatorconfig.h" #include "frame.h" #include "framemanager.h" #include "kernel.h" #include "openurlrequest.h" #include "utils/temporaryvalue.h" using namespace Akregator; class Q_DECL_HIDDEN TabWidget::Private { private: TabWidget *const q; public: explicit Private(TabWidget *qq) : q(qq) { } QHash frames; QHash framesById; int currentMaxLength = 30; QWidget *currentItem = nullptr; QToolButton *tabsClose = nullptr; QWidget *selectedWidget() const { return (currentItem && q->indexOf(currentItem) != -1) ? currentItem : q->currentWidget(); } int tabBarWidthForMaxChars(int maxLength); void setTitle(const QString &title, QWidget *sender); void updateTabBarVisibility(); Frame *currentFrame(); }; void TabWidget::Private::updateTabBarVisibility() { const bool tabBarIsHidden = ((q->count() <= 1) && !Settings::alwaysShowTabBar()); if (tabBarIsHidden) { q->tabBar()->hide(); } else { q->tabBar()->show(); } if (q->count() >= 1 && Settings::closeButtonOnTabs()) { q->tabBar()->tabButton(0, QTabBar::RightSide)->hide(); } } TabWidget::TabWidget(QWidget *parent) : QTabWidget(parent) , d(new Private(this)) { setMinimumSize(250, 150); setMovable(false); setDocumentMode(true); setContextMenuPolicy(Qt::CustomContextMenu); connect(this, &TabWidget::customContextMenuRequested, this, &TabWidget::slotTabContextMenuRequest); connect(this, &TabWidget::currentChanged, this, &TabWidget::slotTabChanged); connect(this, &QTabWidget::tabCloseRequested, this, &TabWidget::slotCloseRequest); setTabsClosable(Settings::closeButtonOnTabs()); d->tabsClose = new QToolButton(this); connect(d->tabsClose, &QToolButton::clicked, this, &TabWidget::slotRemoveCurrentFrame); d->tabsClose->setIcon(QIcon::fromTheme(QStringLiteral("tab-close"))); d->tabsClose->setEnabled(false); d->tabsClose->adjustSize(); d->tabsClose->setToolTip(i18n("Close the current tab")); #ifndef QT_NO_ACCESSIBILITY d->tabsClose->setAccessibleName(i18n("Close tab")); #endif setCornerWidget(d->tabsClose, Qt::TopRightCorner); d->updateTabBarVisibility(); } TabWidget::~TabWidget() { delete d; } void TabWidget::slotTabContextMenuRequest(const QPoint &pos) { QTabBar *bar = tabBar(); if (count() <= 1) { return; } const int indexBar = bar->tabAt(bar->mapFrom(this, pos)); if (indexBar == -1) { return; } QMenu menu(this); const int countTab = (count() > 1); QAction *detachTab = menu.addAction(i18nc("@action:inmenu", "Detach Tab")); detachTab->setEnabled((indexBar != 0) && countTab); detachTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-detach"))); menu.addSeparator(); QAction *closeTab = menu.addAction(i18nc("@action:inmenu", "Close Tab")); closeTab->setEnabled((indexBar != 0) && countTab); closeTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-close"))); QAction *allOther = menu.addAction(i18nc("@action:inmenu", "Close All Other Tabs")); allOther->setEnabled(countTab); allOther->setIcon(QIcon::fromTheme(QStringLiteral("tab-close-other"))); QAction *allTab = menu.addAction(i18nc("@action:inmenu", "Close All Tabs")); allTab->setEnabled(countTab); allTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-close"))); QAction *action = menu.exec(mapToGlobal(pos)); if (action == allOther) { // Close all other tabs slotCloseAllTabExcept(indexBar); } else if (action == closeTab) { slotCloseRequest(indexBar); } else if (action == allTab) { slotCloseAllTab(); } else if (action == detachTab) { slotDetachTab(indexBar); } } void TabWidget::closeAllTabExcept(int index) { //Don't close first tab for (int i = count() - 1; i > 0; --i) { if (i == index) { continue; } slotCloseRequest(i); } } void TabWidget::slotCloseAllTabExcept(int index) { closeAllTabExcept(index); } void TabWidget::slotCloseAllTab() { closeAllTabExcept(); } void TabWidget::slotSettingsChanged() { if (tabsClosable() != Settings::closeButtonOnTabs()) { setTabsClosable(Settings::closeButtonOnTabs()); } d->updateTabBarVisibility(); } void TabWidget::slotNextTab() { setCurrentIndex((currentIndex() + 1) % count()); } void TabWidget::slotPreviousTab() { if (currentIndex() == 0) { setCurrentIndex(count() - 1); } else { setCurrentIndex(currentIndex() - 1); } } void TabWidget::slotSelectFrame(int frameId) { Frame *frame = d->framesById.value(frameId); if (frame && frame != d->currentFrame()) { setCurrentWidget(frame); frame->setFocus(); } } void TabWidget::slotAddFrame(Frame *frame) { if (!frame) { return; } d->frames.insert(frame, frame); d->framesById.insert(frame->id(), frame); addTab(frame, frame->title()); connect(frame, &Frame::signalTitleChanged, this, &TabWidget::slotSetTitle); slotSetTitle(frame, frame->title()); } Frame *TabWidget::Private::currentFrame() { QWidget *w = q->currentWidget(); Q_ASSERT(frames.value(w)); return w ? frames.value(w) : nullptr; } void TabWidget::slotZoomChanged(qreal value) { if (!d->currentFrame()) { return; } Q_EMIT signalZoomChangedInFrame(d->currentFrame()->id(), value); } void TabWidget::slotTabChanged(int index) { Frame *frame = d->frames.value(widget(index)); d->tabsClose->setEnabled(frame && frame->isRemovable()); Q_EMIT signalCurrentFrameChanged(frame ? frame->id() : -1); } void TabWidget::tabInserted(int) { d->updateTabBarVisibility(); } void TabWidget::tabRemoved(int) { d->updateTabBarVisibility(); } void TabWidget::slotRemoveCurrentFrame() { Frame *const frame = d->currentFrame(); if (frame) { Q_EMIT signalRemoveFrameRequest(frame->id()); } } void TabWidget::slotRemoveFrame(int frameId) { if (!d->framesById.contains(frameId)) { return; } Frame *f = d->framesById.value(frameId); d->frames.remove(f); d->framesById.remove(frameId); f->disconnect(this); removeTab(indexOf(f)); Q_EMIT signalRemoveFrameRequest(f->id()); if (d->currentFrame()) { d->setTitle(d->currentFrame()->title(), currentWidget()); } } // copied wholesale from KonqFrameTabs int TabWidget::Private::tabBarWidthForMaxChars(int maxLength) { int hframe; QStyleOption o; hframe = q->tabBar()->style()->pixelMetric(QStyle::PM_TabBarTabHSpace, &o, q); QFontMetrics fm = q->tabBar()->fontMetrics(); int x = 0; for (int i = 0; i < q->count(); ++i) { Frame *f = frames.value(q->widget(i)); if (!f) { continue; // frames is out of sync, e.g. because tabInserted wasn't called yet - #185597 } QString newTitle = f->title(); if (newTitle.length() > maxLength) { newTitle = newTitle.left(maxLength - 3) + QLatin1String("..."); } int lw = fm.boundingRect(newTitle).width(); int iw = q->tabBar()->tabIcon(i).pixmap(q->tabBar()->style()->pixelMetric( QStyle::PM_SmallIconSize), QIcon::Normal ).width() + 4; x += (q->tabBar()->style()->sizeFromContents(QStyle::CT_TabBarTab, &o, QSize(qMax(lw + hframe + iw, QApplication::globalStrut().width()), 0), q)).width(); } return x; } void TabWidget::slotSetTitle(Frame *frame, const QString &title) { d->setTitle(title, frame); } void TabWidget::slotWebPageMutedOrAudibleChanged(Akregator::Frame *frame, bool isAudioMuted, bool wasRecentlyAudible) { Q_UNUSED(wasRecentlyAudible); const int idx = indexOf(frame); if (idx < 0) { return; } if (isAudioMuted) { setTabIcon(idx, QIcon::fromTheme(QStringLiteral("audio-volume-muted"))); } else { setTabIcon(idx, frame->icon()); } } void TabWidget::slotSetIcon(Akregator::Frame *frame, const QIcon &icon) { const int idx = indexOf(frame); if (idx < 0) { return; } frame->setIcon(icon); setTabIcon(idx, icon); } void TabWidget::Private::setTitle(const QString &title, QWidget *sender) { int senderIndex = q->indexOf(sender); q->setTabToolTip(senderIndex, QString()); int lcw = 0, rcw = 0; int tabBarHeight = q->tabBar()->sizeHint().height(); QWidget *leftCorner = q->cornerWidget(Qt::TopLeftCorner); if (leftCorner && leftCorner->isVisible()) { lcw = qMax(leftCorner->width(), tabBarHeight); } QWidget *rightCorner = q->cornerWidget(Qt::TopRightCorner); if (rightCorner && rightCorner->isVisible()) { rcw = qMax(rightCorner->width(), tabBarHeight); } int maxTabBarWidth = q->width() - lcw - rcw; int newMaxLength = 30; for (; newMaxLength > 3; newMaxLength--) { if (tabBarWidthForMaxChars(newMaxLength) < maxTabBarWidth) { break; } } QString newTitle = title; if (newTitle.length() > newMaxLength) { q->setTabToolTip(senderIndex, newTitle); newTitle = newTitle.left(newMaxLength - 3) + QLatin1String("..."); } newTitle.replace(QLatin1Char('&'), QStringLiteral("&&")); if (q->tabText(senderIndex) != newTitle) { q->setTabText(senderIndex, newTitle); } if (newMaxLength != currentMaxLength) { for (int i = 0; i < q->count(); ++i) { Frame *f = frames.value(q->widget(i)); if (!f) { continue; // frames is out of sync, e.g. because tabInserted wasn't called yet - #185597 } newTitle = f->title(); int index = q->indexOf(q->widget(i)); q->setTabToolTip(index, QString()); if (newTitle.length() > newMaxLength) { q->setTabToolTip(index, newTitle); newTitle = newTitle.left(newMaxLength - 3) + QLatin1String("..."); } newTitle.replace(QLatin1Char('&'), QStringLiteral("&&")); if (newTitle != q->tabText(index)) { q->setTabText(index, newTitle); } } currentMaxLength = newMaxLength; } } void TabWidget::slotDetachTab(int index) { QWidget *w = widget(index); Frame *frame = d->frames.value(w); if (frame && frame->url().isValid() && frame->isRemovable()) { OpenUrlRequest request; request.setUrl(frame->url()); request.setOptions(OpenUrlRequest::ExternalBrowser); Q_EMIT signalOpenUrlRequest(request); slotCloseRequest(index); } } void TabWidget::slotTextToSpeech() { Q_EMIT signalTextToSpeechInFrame(d->currentFrame()->id()); } void TabWidget::slotFindTextInHtml() { Q_EMIT signalFindTextInFrame(d->currentFrame()->id()); } void TabWidget::slotCopyLinkAddress() { Q_EMIT signalCopyLinkAsInFrame(d->currentFrame()->id()); } void TabWidget::slotSaveLinkAs() { Q_EMIT signalSaveLinkAsInFrame(d->currentFrame()->id()); } void TabWidget::slotPrintPreview() { Q_EMIT signalPrintPreviewInFrame(d->currentFrame()->id()); } void TabWidget::slotPrint() { Q_EMIT signalPrintInFrame(d->currentFrame()->id()); } void TabWidget::slotCopy() { Q_EMIT signalCopyInFrame(d->currentFrame()->id()); } void TabWidget::slotSaveImageOnDisk() { Q_EMIT signalSaveImageOnDisk(d->currentFrame()->id()); } void TabWidget::slotUnMute() { Q_EMIT signalMute(d->currentFrame()->id(), false); } void TabWidget::slotMute() { Q_EMIT signalMute(d->currentFrame()->id(), true); } void TabWidget::slotCopyImageLocation() { Q_EMIT signalCopyImageLocation(d->currentFrame()->id()); } void TabWidget::slotCloseTab() { QWidget *widget = d->selectedWidget(); Frame *frame = d->frames.value(widget); if (frame == nullptr || !frame->isRemovable()) { return; } Q_EMIT signalRemoveFrameRequest(frame->id()); } void TabWidget::slotReloadAllTabs() { for (Frame *frame : qAsConst(d->frames)) { frame->slotReload(); } } void TabWidget::slotCloseRequest(int index) { QWidget *w = widget(index); if (d->frames.value(w)) { Q_EMIT signalRemoveFrameRequest(d->frames.value(w)->id()); } } void TabWidget::slotActivateTab() { setCurrentIndex(sender()->objectName().rightRef(2).toInt() - 1); } diff --git a/src/utils.cpp b/src/utils.cpp index 60b8e166..51bf041b 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -1,48 +1,48 @@ /* This file is part of Akregator. Copyright (C) 2005 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "utils.h" #include #include #include -#include +#include using namespace Akregator; QString Utils::convertHtmlTags(const QString &title) { QTextDocument newText; newText.setHtml(title); return newText.toPlainText(); } QString Utils::stripTags(QString str) { return str.remove(QRegExp(QLatin1String("<[^>]*>"))); } uint Utils::calcHash(const QString &str) { const QByteArray array = str.toLatin1(); return qChecksum(array.constData(), array.size()); } diff --git a/src/widgets/searchbar.cpp b/src/widgets/searchbar.cpp index 4fd6b1bf..73dd2536 100644 --- a/src/widgets/searchbar.cpp +++ b/src/widgets/searchbar.cpp @@ -1,205 +1,205 @@ /* This file is part of Akregator. Copyright (C) 2005 Frank Osterfeld This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. */ #include "searchbar.h" #include "akregatorconfig.h" #include "article.h" #include "widgets/statussearchline.h" -#include +#include #include #include #include #include #include using namespace Akregator; using namespace Akregator::Filters; SearchBar::SearchBar(QWidget *parent) : QWidget(parent) { m_delay = 400; QHBoxLayout *layout = new QHBoxLayout(this); layout->setContentsMargins(2, 2, 2, 2); layout->setSpacing(5); setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); m_searchLine = new StatusSearchLine(this); m_searchLine->setClearButtonEnabled(true); m_searchLine->setPlaceholderText(i18n("Search articles...")); layout->addWidget(m_searchLine); connect(m_searchLine, &KLineEdit::textChanged, this, &SearchBar::slotSearchStringChanged); connect(m_searchLine, &StatusSearchLine::forceLostFocus, this, &SearchBar::forceLostFocus); connect(m_searchLine, &StatusSearchLine::statusChanged, this, &SearchBar::slotStatusChanged); connect(&(m_timer), &QTimer::timeout, this, &SearchBar::slotActivateSearch); m_timer.setSingleShot(true); } SearchBar::~SearchBar() { } QString SearchBar::text() const { return m_searchText; } StatusSearchLine::Status SearchBar::status() const { return m_searchLine->status(); } void SearchBar::setDelay(int ms) { m_delay = ms; } int SearchBar::delay() const { return m_delay; } void SearchBar::setFocusSearchLine() { m_searchLine->setFocus(); } void SearchBar::slotClearSearch() { if (status() != Akregator::StatusSearchLine::AllArticles || !m_searchLine->text().trimmed().isEmpty()) { m_searchLine->clear(); m_searchLine->setStatus(Akregator::StatusSearchLine::AllArticles); m_timer.stop(); slotStopActiveSearch(); } } void SearchBar::slotSetStatus(int status) { m_searchLine->setStatus(static_cast(status)); triggerTimer(); } void SearchBar::slotSetText(const QString &text) { m_searchLine->setText(text); triggerTimer(); } void SearchBar::slotStatusChanged(Akregator::StatusSearchLine::Status /*status*/) { triggerTimer(); } std::vector > SearchBar::matchers() const { return m_matchers; } void SearchBar::updateQuickSearchLineText(const QString &searchLineShortcut) { m_searchLine->setPlaceholderText(i18n("Search articles...<%1>", searchLineShortcut)); } void SearchBar::slotSearchStringChanged(const QString &search) { m_searchText = search; triggerTimer(); } void SearchBar::slotStopActiveSearch() { std::vector > matchers; Settings::setStatusFilter(m_searchLine->status()); Settings::setTextFilter(m_searchText); m_matchers = matchers; Q_EMIT signalSearch(matchers); } void SearchBar::slotActivateSearch() { QVector textCriteria; QVector statusCriteria; if (!m_searchText.isEmpty()) { Criterion subjCrit(Criterion::Title, Criterion::Contains, m_searchText); textCriteria << subjCrit; Criterion crit1(Criterion::Description, Criterion::Contains, m_searchText); textCriteria << crit1; Criterion authCrit(Criterion::Author, Criterion::Contains, m_searchText); textCriteria << authCrit; } switch (m_searchLine->status()) { case StatusSearchLine::AllArticles: break; case StatusSearchLine::NewArticles: { Criterion crit(Criterion::Status, Criterion::Equals, New); statusCriteria << crit; break; } case StatusSearchLine::UnreadArticles: { Criterion crit1(Criterion::Status, Criterion::Equals, New); Criterion crit2(Criterion::Status, Criterion::Equals, Unread); statusCriteria << crit1; statusCriteria << crit2; break; } case StatusSearchLine::ImportantArticles: { Criterion crit(Criterion::KeepFlag, Criterion::Equals, true); statusCriteria << crit; break; } } std::vector > matchers; if (!textCriteria.isEmpty()) { matchers.push_back(QSharedPointer(new ArticleMatcher(textCriteria, ArticleMatcher::LogicalOr))); } if (!statusCriteria.isEmpty()) { matchers.push_back(QSharedPointer(new ArticleMatcher(statusCriteria, ArticleMatcher::LogicalOr))); } Settings::setStatusFilter(m_searchLine->status()); Settings::setTextFilter(m_searchText); m_matchers = matchers; Q_EMIT signalSearch(matchers); } void Akregator::SearchBar::triggerTimer() { if (m_timer.isActive()) { m_timer.stop(); } m_timer.start(200); }