refresh langs and fix dumb message on exit
This commit is contained in:
parent
31b83ebe14
commit
0e7899d690
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -509,16 +509,16 @@ bool FeedsModel::markItemRead(RootItem* item, RootItem::ReadStatus read) {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FeedsModel::markItemCleared(RootItem* item, bool clean_read_only) {
|
||||
bool FeedsModel::markItemCleared(RootItem* item, bool clean_read_only, bool ask) {
|
||||
if (item != nullptr) {
|
||||
if (MsgBox::show(nullptr,
|
||||
QMessageBox::Icon::Question,
|
||||
tr("Are you sure?"),
|
||||
tr("Do you really want to clean all articles from selected item?"),
|
||||
{},
|
||||
{},
|
||||
QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No,
|
||||
QMessageBox::StandardButton::No) != QMessageBox::StandardButton::Yes) {
|
||||
if (ask && MsgBox::show(nullptr,
|
||||
QMessageBox::Icon::Question,
|
||||
tr("Are you sure?"),
|
||||
tr("Do you really want to clean all articles from selected item?"),
|
||||
{},
|
||||
{},
|
||||
QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No,
|
||||
QMessageBox::StandardButton::No) != QMessageBox::StandardButton::Yes) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -113,7 +113,7 @@ class RSSGUARD_DLLSPEC FeedsModel : public QAbstractItemModel {
|
||||
|
||||
// Feeds operations.
|
||||
bool markItemRead(RootItem* item, RootItem::ReadStatus read);
|
||||
bool markItemCleared(RootItem* item, bool clean_read_only);
|
||||
bool markItemCleared(RootItem* item, bool clean_read_only, bool ask);
|
||||
|
||||
// Signals that properties (probably counts)
|
||||
// of ALL items have changed.
|
||||
|
@ -200,11 +200,11 @@ void FeedsView::updateSelectedItems() {
|
||||
}
|
||||
|
||||
void FeedsView::clearSelectedFeeds() {
|
||||
m_sourceModel->markItemCleared(selectedItem(), false);
|
||||
m_sourceModel->markItemCleared(selectedItem(), false, true);
|
||||
}
|
||||
|
||||
void FeedsView::clearAllFeeds() {
|
||||
m_sourceModel->markItemCleared(m_sourceModel->rootItem(), false);
|
||||
m_sourceModel->markItemCleared(m_sourceModel->rootItem(), false, true);
|
||||
}
|
||||
|
||||
void FeedsView::editSelectedItem() {
|
||||
|
@ -398,7 +398,7 @@ void FeedReader::quit() {
|
||||
}
|
||||
|
||||
if (qApp->settings()->value(GROUP(Messages), SETTING(Messages::ClearReadOnExit)).toBool()) {
|
||||
m_feedsModel->markItemCleared(m_feedsModel->rootItem(), true);
|
||||
m_feedsModel->markItemCleared(m_feedsModel->rootItem(), true, false);
|
||||
}
|
||||
|
||||
m_feedsModel->stopServiceAccounts();
|
||||
|
Loading…
x
Reference in New Issue
Block a user