FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some renaming

Browse Source
This commit is contained in:
Martin Rotter 2023-11-08 07:09:44 +01:00
parent 65abae14fb
commit 95df21e385
33 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librssguard/gui/feedsview.cpp
View File

@ -351,7 +351,7 @@ void FeedsView::editItems(const QList<RootItem*>& items) {
QSystemTrayIcon::MessageIcon::Warning});
}
distinct_accounts.front()->editItemsViaGui(FROM_STD_LIST(QList<RootItem*>, std_editable_items));
distinct_accounts.front()->editItems(FROM_STD_LIST(QList<RootItem*>, std_editable_items));
// Changes are done, unlock the update master lock.
qApp->feedUpdateLock()->unlock();
@ -454,7 +454,7 @@ void FeedsView::deleteSelectedItem() {
continue;
}
if (pnt->deleteViaGui()) {
if (pnt->deleteItem()) {
m_proxyModel->invalidate();
}
}

13
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
View File

@ -22,9 +22,9 @@
TextBrowserViewer::TextBrowserViewer(QWidget* parent)
: QTextBrowser(parent), m_resourcesEnabled(false), m_resourceDownloader(new Downloader(this)), m_loadedResources({}),
m_placeholderImage(qApp->icons()->miscPixmap("image-placeholder")),
m_placeholderImageError(qApp->icons()->miscPixmap("image-placeholder-error")), m_downloader(new Downloader(this)),
m_document(new TextBrowserDocument(this)) {
m_placeholderImage(qApp->icons()->miscPixmap(QSL("image-placeholder"))),
m_placeholderImageError(qApp->icons()->miscPixmap(QSL("image-placeholder-error"))),
m_downloader(new Downloader(this)), m_document(new TextBrowserDocument(this)) {
setAutoFillBackground(true);
setFrameShape(QFrame::Shape::NoFrame);
setFrameShadow(QFrame::Shadow::Plain);
@ -44,7 +44,12 @@ TextBrowserViewer::TextBrowserViewer(QWidget* parent)
a_color = qApp->palette().color(QPalette::ColorRole::Highlight);
}
m_document.data()->setDefaultStyleSheet(QSL("a { color: %1; }").arg(a_color.name()));
// m_document.data()->setDefaultStyleSheet(QSL("a { color: %1; }").arg(a_color.name()));
m_document->setDefaultStyleSheet("p {"
"background-color: yellow;"
"border: 1px solid black;"
"}");
connect(this, &TextBrowserViewer::reloadDocument, this, [this]() {
const auto scr = verticalScrollBarPosition();

31
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h
View File

@ -41,12 +41,9 @@ class TextBrowserViewer : public QTextBrowser, public WebViewer {
public:
explicit TextBrowserViewer(QWidget* parent = nullptr);
virtual QSize sizeHint() const;
public:
QVariant loadOneResource(int type, const QUrl& name);
public:
virtual QSize sizeHint() const;
virtual void bindToBrowser(WebBrowser* browser);
virtual void findText(const QString& text, bool backwards);
virtual void setUrl(const QUrl& url);
@ -62,6 +59,9 @@ class TextBrowserViewer : public QTextBrowser, public WebViewer {
virtual qreal zoomFactor() const;
virtual void setZoomFactor(qreal zoom_factor);
bool resourcesEnabled() const;
void setResourcesEnabled(bool enabled);
protected:
virtual void contextMenuEvent(QContextMenuEvent* event);
virtual void resizeEvent(QResizeEvent* event);
@ -72,14 +72,6 @@ class TextBrowserViewer : public QTextBrowser, public WebViewer {
void openLinkInExternalBrowser();
void downloadLink();
void onAnchorClicked(const QUrl& url);
bool resourcesEnabled() const;
void setResourcesEnabled(bool enabled);
signals:
void reloadDocument();
private slots:
void reloadHtmlDelayed();
void downloadNextNeededResource();
void resourceDownloaded(const QUrl& url,
@ -87,15 +79,8 @@ class TextBrowserViewer : public QTextBrowser, public WebViewer {
int http_code,
QByteArray contents = QByteArray());
private:
bool m_resourcesEnabled;
QList<QUrl> m_neededResources; // All URLs here must be resolved.
QScopedPointer<Downloader> m_resourceDownloader;
QMap<QUrl, QByteArray> m_loadedResources; // All URLs here must be resolved.
QPixmap m_placeholderImage;
QPixmap m_placeholderImageError;
signals:
void reloadDocument();
void pageTitleChanged(const QString& new_title);
void pageUrlChanged(const QUrl& url);
void pageIconChanged(const QIcon&);
@ -114,6 +99,12 @@ class TextBrowserViewer : public QTextBrowser, public WebViewer {
PreparedHtml prepareHtmlForMessage(const QList<Message>& messages, RootItem* selected_item) const;
private:
bool m_resourcesEnabled;
QList<QUrl> m_neededResources; // All URLs here must be resolved.
QScopedPointer<Downloader> m_resourceDownloader;
QMap<QUrl, QByteArray> m_loadedResources; // All URLs here must be resolved.
QPixmap m_placeholderImage;
QPixmap m_placeholderImageError;
QUrl m_currentUrl;
QString m_currentHtml;

2
src/librssguard/services/abstract/label.cpp
View File

@ -47,7 +47,7 @@ bool Label::canBeDeleted() const {
return Globals::hasFlag(getParentServiceRoot()->supportedLabelOperations(), ServiceRoot::LabelOperation::Deleting);
}
bool Label::deleteViaGui() {
bool Label::deleteItem() {
QSqlDatabase db = qApp->database()->driver()->connection(metaObject()->className());
if (DatabaseQueries::deleteLabel(db, this)) {

2
src/librssguard/services/abstract/label.h
View File

@ -29,7 +29,7 @@ class RSSGUARD_DLLSPEC Label : public RootItem {
virtual int countOfUnreadMessages() const;
virtual bool canBeEdited() const;
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual bool deleteItem();
virtual void updateCounts(bool including_total_count);
virtual QList<Message> undeletedMessages() const;

2
src/librssguard/services/abstract/rootitem.cpp
View File

@ -63,7 +63,7 @@ bool RootItem::canBeDeleted() const {
return false;
}
bool RootItem::deleteViaGui() {
bool RootItem::deleteItem() {
return false;
}

2
src/librssguard/services/abstract/rootitem.h
View File

@ -80,7 +80,7 @@ class RSSGUARD_DLLSPEC RootItem : public QObject {
// Performs deletion of the item, this
// method should NOT display any additional dialogs.
// Returns result status.
virtual bool deleteViaGui();
virtual bool deleteItem();
// Performs all needed steps (DB update, remote server update)
// to mark this item as read/unread.

2
src/librssguard/services/abstract/search.cpp
View File

@ -48,7 +48,7 @@ bool Search::canBeDeleted() const {
return true;
}
bool Search::deleteViaGui() {
bool Search::deleteItem() {
try {
QSqlDatabase db = qApp->database()->driver()->connection(metaObject()->className());
DatabaseQueries::deleteProbe(db, this);

2
src/librssguard/services/abstract/search.h
View File

@ -33,7 +33,7 @@ class RSSGUARD_DLLSPEC Search : public RootItem {
virtual int countOfUnreadMessages() const;
virtual bool canBeEdited() const;
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual bool deleteItem();
virtual void updateCounts(bool including_total_count);
virtual QList<Message> undeletedMessages() const;

4
src/librssguard/services/abstract/serviceroot.cpp
View File

@ -36,7 +36,7 @@ ServiceRoot::ServiceRoot(RootItem* parent)
ServiceRoot::~ServiceRoot() {}
bool ServiceRoot::deleteViaGui() {
bool ServiceRoot::deleteItem() {
QSqlDatabase database = qApp->database()->driver()->connection(metaObject()->className());
if (DatabaseQueries::deleteAccount(database, this)) {
@ -49,7 +49,7 @@ bool ServiceRoot::deleteViaGui() {
}
}
void ServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void ServiceRoot::editItems(const QList<RootItem*>& items) {
// Feed editing.
auto std_feeds = boolinq::from(items)
.select([](RootItem* it) {

4
src/librssguard/services/abstract/serviceroot.h
View File

@ -64,8 +64,8 @@ class ServiceRoot : public RootItem {
virtual void onDatabaseCleanup();
virtual void updateCounts(bool including_total_count);
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual bool deleteItem();
virtual void editItems(const QList<RootItem*>& items);
virtual bool markAsReadUnread(ReadStatus status);
virtual QList<Message> undeletedMessages() const;
virtual bool supportsFeedAdding() const;

4
src/librssguard/services/feedly/feedlyserviceroot.cpp
View File

@ -36,7 +36,7 @@ FormAccountDetails* FeedlyServiceRoot::accountSetupDialog() const {
return new FormEditFeedlyAccount(qApp->mainFormWidget());
}
void FeedlyServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void FeedlyServiceRoot::editItems(const QList<RootItem*>& items) {
if (items.first()->kind() == RootItem::Kind::ServiceRoot) {
QScopedPointer<FormEditFeedlyAccount> p(qobject_cast<FormEditFeedlyAccount*>(accountSetupDialog()));
@ -44,7 +44,7 @@ void FeedlyServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
QVariantHash FeedlyServiceRoot::customDatabaseData() const {

2
src/librssguard/services/feedly/feedlyserviceroot.h
View File

@ -16,7 +16,7 @@ class FeedlyServiceRoot : public ServiceRoot, public CacheForServiceRoot {
virtual bool isSyncable() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual FormAccountDetails* accountSetupDialog() const;
virtual void start(bool freshly_activated);
virtual QString code() const;

4
src/librssguard/services/gmail/gmailserviceroot.cpp
View File

@ -166,7 +166,7 @@ FormAccountDetails* GmailServiceRoot::accountSetupDialog() const {
return new FormEditGmailAccount(qApp->mainFormWidget());
}
void GmailServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void GmailServiceRoot::editItems(const QList<RootItem*>& items) {
if (items.first()->kind() == RootItem::Kind::ServiceRoot) {
QScopedPointer<FormEditGmailAccount> p(qobject_cast<FormEditGmailAccount*>(accountSetupDialog()));
@ -174,7 +174,7 @@ void GmailServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
bool GmailServiceRoot::supportsFeedAdding() const {

2
src/librssguard/services/gmail/gmailserviceroot.h
View File

@ -24,7 +24,7 @@ class GmailServiceRoot : public ServiceRoot, public CacheForServiceRoot {
virtual QList<QAction*> serviceMenu();
virtual bool isSyncable() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual FormAccountDetails* accountSetupDialog() const;
virtual bool supportsFeedAdding() const;
virtual bool supportsCategoryAdding() const;

4
src/librssguard/services/greader/greaderserviceroot.cpp
View File

@ -30,7 +30,7 @@ FormAccountDetails* GreaderServiceRoot::accountSetupDialog() const {
return new FormEditGreaderAccount(qApp->mainFormWidget());
}
void GreaderServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void GreaderServiceRoot::editItems(const QList<RootItem*>& items) {
if (items.first()->kind() == RootItem::Kind::ServiceRoot) {
QScopedPointer<FormEditGreaderAccount> p(qobject_cast<FormEditGreaderAccount*>(accountSetupDialog()));
@ -38,7 +38,7 @@ void GreaderServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
QVariantHash GreaderServiceRoot::customDatabaseData() const {

2
src/librssguard/services/greader/greaderserviceroot.h
View File

@ -28,7 +28,7 @@ class GreaderServiceRoot : public ServiceRoot, public CacheForServiceRoot {
virtual bool isSyncable() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual FormAccountDetails* accountSetupDialog() const;
virtual void start(bool freshly_activated);
virtual QString code() const;

2
src/librssguard/services/owncloud/owncloudfeed.cpp
View File

@ -14,7 +14,7 @@ bool OwnCloudFeed::canBeDeleted() const {
return true;
}
bool OwnCloudFeed::deleteViaGui() {
bool OwnCloudFeed::deleteItem() {
if (serviceRoot()->network()->deleteFeed(customId(), getParentServiceRoot()->networkProxy()) && removeItself()) {
serviceRoot()->requestItemRemoval(this);
return true;

2
src/librssguard/services/owncloud/owncloudfeed.h
View File

@ -14,7 +14,7 @@ class OwnCloudFeed : public Feed {
explicit OwnCloudFeed(RootItem* parent = nullptr);
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual bool deleteItem();
private:
bool removeItself();

4
src/librssguard/services/owncloud/owncloudserviceroot.cpp
View File

@ -34,7 +34,7 @@ FormAccountDetails* OwnCloudServiceRoot::accountSetupDialog() const {
return new FormEditOwnCloudAccount(qApp->mainFormWidget());
}
void OwnCloudServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void OwnCloudServiceRoot::editItems(const QList<RootItem*>& items) {
if (items.first()->kind() == RootItem::Kind::ServiceRoot) {
QScopedPointer<FormEditOwnCloudAccount> p(qobject_cast<FormEditOwnCloudAccount*>(accountSetupDialog()));
@ -42,7 +42,7 @@ void OwnCloudServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
bool OwnCloudServiceRoot::supportsFeedAdding() const {

2
src/librssguard/services/owncloud/owncloudserviceroot.h
View File

@ -20,7 +20,7 @@ class OwnCloudServiceRoot : public ServiceRoot, public CacheForServiceRoot {
virtual bool isSyncable() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual FormAccountDetails* accountSetupDialog() const;
virtual bool supportsFeedAdding() const;
virtual bool supportsCategoryAdding() const;

4
src/librssguard/services/reddit/redditserviceroot.cpp
View File

@ -80,7 +80,7 @@ bool RedditServiceRoot::canBeEdited() const {
return true;
}
void RedditServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void RedditServiceRoot::editItems(const QList<RootItem*>& items) {
if (items.first()->kind() == RootItem::Kind::ServiceRoot) {
QScopedPointer<FormEditRedditAccount> p(qobject_cast<FormEditRedditAccount*>(accountSetupDialog()));
@ -88,7 +88,7 @@ void RedditServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
FormAccountDetails* RedditServiceRoot::accountSetupDialog() const {

2
src/librssguard/services/reddit/redditserviceroot.h
View File

@ -19,7 +19,7 @@ class RedditServiceRoot : public ServiceRoot, public CacheForServiceRoot {
virtual bool isSyncable() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual FormAccountDetails* accountSetupDialog() const;
virtual bool supportsFeedAdding() const;
virtual bool supportsCategoryAdding() const;

2
src/librssguard/services/standard/standardcategory.cpp
View File

@ -47,7 +47,7 @@ bool StandardCategory::canBeDeleted() const {
return true;
}
bool StandardCategory::deleteViaGui() {
bool StandardCategory::deleteItem() {
if (removeItself()) {
serviceRoot()->requestItemRemoval(this);
return true;

2
src/librssguard/services/standard/standardcategory.h
View File

@ -22,7 +22,7 @@ class StandardCategory : public Category {
virtual bool performDragDropChange(RootItem* target_item);
virtual bool canBeEdited() const;
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual bool deleteItem();
private:
bool removeItself();

2
src/librssguard/services/standard/standardfeed.cpp
View File

@ -78,7 +78,7 @@ StandardServiceRoot* StandardFeed::serviceRoot() const {
return qobject_cast<StandardServiceRoot*>(getParentServiceRoot());
}
bool StandardFeed::deleteViaGui() {
bool StandardFeed::deleteItem() {
if (removeItself()) {
serviceRoot()->requestItemRemoval(this);
return true;

2
src/librssguard/services/standard/standardfeed.h
View File

@ -45,7 +45,7 @@ class StandardFeed : public Feed {
virtual QList<QAction*> contextMenuFeedsList();
virtual QString additionalTooltip() const;
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual bool deleteItem();
virtual QVariantHash customDatabaseData() const;
virtual void setCustomDatabaseData(const QVariantHash& data);
virtual Qt::ItemFlags additionalFlags() const;

4
src/librssguard/services/standard/standardserviceroot.cpp
View File

@ -117,7 +117,7 @@ FormAccountDetails* StandardServiceRoot::accountSetupDialog() const {
return new FormEditStandardAccount(qApp->mainFormWidget());
}
void StandardServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void StandardServiceRoot::editItems(const QList<RootItem*>& items) {
auto std_feeds = boolinq::from(items)
.select([](RootItem* it) {
return qobject_cast<Feed*>(it);
@ -144,7 +144,7 @@ void StandardServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
bool StandardServiceRoot::supportsFeedAdding() const {

2
src/librssguard/services/standard/standardserviceroot.h
View File

@ -30,7 +30,7 @@ class StandardServiceRoot : public ServiceRoot {
virtual void stop();
virtual QString code() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual bool supportsFeedAdding() const;
virtual bool supportsCategoryAdding() const;
virtual Qt::ItemFlags additionalFlags() const;

2
src/librssguard/services/tt-rss/ttrssfeed.cpp
View File

@ -22,7 +22,7 @@ bool TtRssFeed::canBeDeleted() const {
return true;
}
bool TtRssFeed::deleteViaGui() {
bool TtRssFeed::deleteItem() {
TtRssUnsubscribeFeedResponse response =
serviceRoot()->network()->unsubscribeFeed(customNumericId(), getParentServiceRoot()->networkProxy());

2
src/librssguard/services/tt-rss/ttrssfeed.h
View File

@ -14,7 +14,7 @@ class TtRssFeed : public Feed {
explicit TtRssFeed(RootItem* parent = nullptr);
virtual bool canBeDeleted() const;
virtual bool deleteViaGui();
virtual bool deleteItem();
virtual QList<QAction*> contextMenuFeedsList();
private:

4
src/librssguard/services/tt-rss/ttrssserviceroot.cpp
View File

@ -79,7 +79,7 @@ FormAccountDetails* TtRssServiceRoot::accountSetupDialog() const {
return new FormEditTtRssAccount(qApp->mainFormWidget());
}
void TtRssServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
void TtRssServiceRoot::editItems(const QList<RootItem*>& items) {
if (items.first()->kind() == RootItem::Kind::ServiceRoot) {
QScopedPointer<FormEditTtRssAccount> p(qobject_cast<FormEditTtRssAccount*>(accountSetupDialog()));
@ -87,7 +87,7 @@ void TtRssServiceRoot::editItemsViaGui(const QList<RootItem*>& items) {
return;
}
ServiceRoot::editItemsViaGui(items);
ServiceRoot::editItems(items);
}
bool TtRssServiceRoot::supportsFeedAdding() const {

2
src/librssguard/services/tt-rss/ttrssserviceroot.h
View File

@ -26,7 +26,7 @@ class TtRssServiceRoot : public ServiceRoot, public CacheForServiceRoot {
virtual QString code() const;
virtual bool isSyncable() const;
virtual bool canBeEdited() const;
virtual void editItemsViaGui(const QList<RootItem*>& items);
virtual void editItems(const QList<RootItem*>& items);
virtual FormAccountDetails* accountSetupDialog() const;
virtual bool supportsFeedAdding() const;
virtual bool supportsCategoryAdding() const;