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

Hmmm.

Browse Source
This commit is contained in:
Martin Rotter 2015-04-02 07:31:18 +02:00
parent 590993eb8f
commit 8f7cf6ab97
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/feedsview.cpp
View File

@ -171,7 +171,7 @@ void FeedsView::updateAllFeeds() {
} }
else { else {
qApp->showGuiMessage(tr("Cannot update all items"), qApp->showGuiMessage(tr("Cannot update all items"),
tr("You cannot update all items because another feed update is ongoing."), tr("You cannot update all items because another another critical operation is ongoing."),
QSystemTrayIcon::Warning, qApp->mainForm()); QSystemTrayIcon::Warning, qApp->mainForm());
} }
} }
@ -189,7 +189,7 @@ void FeedsView::updateSelectedFeeds() {
} }
else { else {
qApp->showGuiMessage(tr("Cannot update selected items"), qApp->showGuiMessage(tr("Cannot update selected items"),
tr("You cannot update selected items because another feed update is ongoing."), tr("You cannot update selected items because another critical operation is ongoing."),
QSystemTrayIcon::Warning, qApp->mainForm()); QSystemTrayIcon::Warning, qApp->mainForm());
} }
} }
@ -258,7 +258,7 @@ void FeedsView::addNewCategory() {
// it is used probably by feed updater or application // it is used probably by feed updater or application
// is quitting. // is quitting.
qApp->showGuiMessage(tr("Cannot add standard category"), qApp->showGuiMessage(tr("Cannot add standard category"),
tr("You cannot add new standard category now because feed update is ongoing."), tr("You cannot add new standard category now because another critical operation is ongoing."),
QSystemTrayIcon::Warning, qApp->mainForm()); QSystemTrayIcon::Warning, qApp->mainForm());
return; return;
} }
@ -287,7 +287,7 @@ void FeedsView::addNewFeed() {
// it is used probably by feed updater or application // it is used probably by feed updater or application
// is quitting. // is quitting.
qApp->showGuiMessage(tr("Cannot add standard feed"), qApp->showGuiMessage(tr("Cannot add standard feed"),
tr("You cannot add new standard feed now because feed update is ongoing."), tr("You cannot add new standard feed now because another critical operation is ongoing."),
QSystemTrayIcon::Warning, qApp->mainForm()); QSystemTrayIcon::Warning, qApp->mainForm());
return; return;
} }
@ -328,7 +328,6 @@ void FeedsView::receiveMessageCountsChange(MessagesModel::MessageMode mode,
// total counts. // total counts.
// b) total count of message was not changed - some messages switched state --> we need to update // b) total count of message was not changed - some messages switched state --> we need to update
// counts of just selected feeds. // counts of just selected feeds.
if (mode == MessagesModel::MessagesFromRecycleBin) { if (mode == MessagesModel::MessagesFromRecycleBin) {
if (total_msg_count_changed) { if (total_msg_count_changed) {
if (any_msg_restored) { if (any_msg_restored) {
@ -353,7 +352,7 @@ void FeedsView::editSelectedItem() {
// it is used probably by feed updater or application // it is used probably by feed updater or application
// is quitting. // is quitting.
qApp->showGuiMessage(tr("Cannot edit item"), qApp->showGuiMessage(tr("Cannot edit item"),
tr("Selected item cannot be edited because feed update is ongoing."), tr("Selected item cannot be edited because another critical operation is ongoing."),
QSystemTrayIcon::Warning, qApp->mainForm()); QSystemTrayIcon::Warning, qApp->mainForm());
// Thus, cannot delete and quit the method. // Thus, cannot delete and quit the method.
@ -380,7 +379,7 @@ void FeedsView::deleteSelectedItem() {
// it is used probably by feed updater or application // it is used probably by feed updater or application
// is quitting. // is quitting.
qApp->showGuiMessage(tr("Cannot delete item"), qApp->showGuiMessage(tr("Cannot delete item"),
tr("Selected item cannot be deleted because feed update is ongoing."), tr("Selected item cannot be deleted because another critical operation is ongoing."),
QSystemTrayIcon::Warning, qApp->mainForm()); QSystemTrayIcon::Warning, qApp->mainForm());
// Thus, cannot delete and quit the method. // Thus, cannot delete and quit the method.
@ -462,15 +461,12 @@ void FeedsView::emptyRecycleBin() {
if (MessageBox::show(qApp->mainForm(), QMessageBox::Question, tr("Permanently delete messages"), if (MessageBox::show(qApp->mainForm(), QMessageBox::Question, tr("Permanently delete messages"),
tr("You are about to permanenty delete all messages from your recycle bin."), tr("You are about to permanenty delete all messages from your recycle bin."),
tr("Do you really want to empty your recycle bin?"), tr("Do you really want to empty your recycle bin?"),
QString(), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No) { QString(), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
// User changed his mind.
return;
}
m_sourceModel->recycleBin()->empty(); m_sourceModel->recycleBin()->empty();
updateCountsOfSelectedFeeds(true); updateCountsOfSelectedFeeds(true);
emit feedsNeedToBeReloaded(1); emit feedsNeedToBeReloaded(1);
}
} }
void FeedsView::restoreRecycleBin() { void FeedsView::restoreRecycleBin() {
@ -637,7 +633,6 @@ void FeedsView::selectionChanged(const QItemSelection &selected, const QItemSele
foreach (FeedsModelFeed *feed, selected_feeds) { foreach (FeedsModelFeed *feed, selected_feeds) {
#if defined(DEBUG) #if defined(DEBUG)
QModelIndex index_for_feed = m_sourceModel->indexForItem(feed); QModelIndex index_for_feed = m_sourceModel->indexForItem(feed);
qDebug("Selecting feed '%s' (source index [%d, %d]).", qPrintable(feed->title()), index_for_feed.row(), index_for_feed.column()); qDebug("Selecting feed '%s' (source index [%d, %d]).", qPrintable(feed->title()), index_for_feed.row(), index_for_feed.column());
#endif #endif