diff --git a/resources/text/UPDATES b/resources/text/UPDATES index 9ac032ef5..48446c84f 100644 --- a/resources/text/UPDATES +++ b/resources/text/UPDATES @@ -1,7 +1,8 @@ - + https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.7-win32.7z + https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.7-os2.7z Fixed: diff --git a/src/core/systemfactory.cpp b/src/core/systemfactory.cpp index 3fbd663a6..0e2746d6c 100644 --- a/src/core/systemfactory.cpp +++ b/src/core/systemfactory.cpp @@ -175,7 +175,7 @@ QPair SystemFactory::checkForUpdates() releases_xml); if (result.second == QNetworkReply::NoError) { - result.first = SystemFactory::instance()->parseUpdatesFile(releases_xml); + result.first = parseUpdatesFile(releases_xml); } return result; diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp index 292911b8e..e7579ca75 100644 --- a/src/gui/feedsview.cpp +++ b/src/gui/feedsview.cpp @@ -416,12 +416,14 @@ void FeedsView::deleteSelectedItem() { } if (selection_model->selectedRows().size() > 1) { - // User selected more than one item. - // Note that we can remove items only one by one. - // TODO: Display information balloon tip - // here, but only if tray icon is active. selection_model->clearSelection(); selection_model->select(current_index, QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent); + + if (SystemTrayIcon::isSystemTrayActivated()) { + SystemTrayIcon::instance()->showMessage(tr("Cannot delete multiple "), + tr("Selected item cannot be deleted because feed update is ongoing."), + QSystemTrayIcon::Warning); + } } if (m_sourceModel->removeItem(m_proxyModel->mapToSource(current_index))) { diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index d9beb1b62..90f2670b8 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -64,9 +64,6 @@ FormMain::FormMain(QWidget *parent, Qt::WindowFlags f) // Add these actions to the list of actions of the main window. // This allows to use actions via shortcuts // even if main menu is not visible. - // TODO: volba zobrazit/skryt hlavni menu - // bude li menu skryte tak jen v rohu robrazit - // tlacitko s tim menu. addActions(allActions()); // Prepare tabs. diff --git a/src/gui/formupdate.cpp b/src/gui/formupdate.cpp index b9f667caa..65f6184d7 100755 --- a/src/gui/formupdate.cpp +++ b/src/gui/formupdate.cpp @@ -58,13 +58,6 @@ bool FormUpdate::isUpdateForThisSystem() { return m_updateInfo.m_urls.keys().contains(OS_ID); } -// TODO: tady v update nacist do m_lblSupportedPlatforms -// seznam platform ktery danej release podporuje oddelenej carkama -// treba "Windows, OS2" atp atp. -// ten combobox se statusem previst na normalni combobox -// asi. jednotlivy URL souborů pro danej release -// sou dostupny v qhashi podle klice podle OS. - void FormUpdate::checkForUpdates() { QPair update = SystemFactory::instance()->checkForUpdates(); @@ -89,9 +82,6 @@ void FormUpdate::checkForUpdates() { m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok, tr("New release available."), tr("This is new version which can be\ndownloaded and installed.")); - // TODO: Display "update" button if - // URL of file for current platform (Windows or OS2) - // is available. m_btnUpdate->setEnabled(true); m_btnUpdate->setToolTip(isUpdateForThisSystem() ? tr("Download installation file for your OS.") :