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

UPdated updates file.

Browse Source
This commit is contained in:
Martin Rotter 2014-03-18 07:35:35 +01:00
parent 0a43b2bf1f
commit 08743d7113
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/text/UPDATES
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<releases> <releases>
<release version="1.9.9.7" type="maintenance"> <release version="1.9.9.7" type="feature">
<url platform="x86" os="Windows">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.7-win32.7z</url> <url platform="x86" os="Windows">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.7-win32.7z</url>
<url platform="x86" os="OS2">https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.7-os2.7z</url>
<changes> <changes>
<![CDATA[<body> <![CDATA[<body>
Fixed: Fixed:

2
src/core/systemfactory.cpp
View File

@ -175,7 +175,7 @@ QPair<UpdateInfo, QNetworkReply::NetworkError> SystemFactory::checkForUpdates()
releases_xml); releases_xml);
if (result.second == QNetworkReply::NoError) { if (result.second == QNetworkReply::NoError) {
result.first = SystemFactory::instance()->parseUpdatesFile(releases_xml); result.first = parseUpdatesFile(releases_xml);
} }
return result; return result;

10
src/gui/feedsview.cpp
View File

@ -416,12 +416,14 @@ void FeedsView::deleteSelectedItem() {
} }
if (selection_model->selectedRows().size() > 1) { 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->clearSelection();
selection_model->select(current_index, QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent); 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))) { if (m_sourceModel->removeItem(m_proxyModel->mapToSource(current_index))) {

3
src/gui/formmain.cpp
View File

@ -64,9 +64,6 @@ FormMain::FormMain(QWidget *parent, Qt::WindowFlags f)
// Add these actions to the list of actions of the main window. // Add these actions to the list of actions of the main window.
// This allows to use actions via shortcuts // This allows to use actions via shortcuts
// even if main menu is not visible. // 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()); addActions(allActions());
// Prepare tabs. // Prepare tabs.

10
src/gui/formupdate.cpp
View File

@ -58,13 +58,6 @@ bool FormUpdate::isUpdateForThisSystem() {
return m_updateInfo.m_urls.keys().contains(OS_ID); 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() { void FormUpdate::checkForUpdates() {
QPair<UpdateInfo, QNetworkReply::NetworkError> update = SystemFactory::instance()->checkForUpdates(); QPair<UpdateInfo, QNetworkReply::NetworkError> update = SystemFactory::instance()->checkForUpdates();
@ -89,9 +82,6 @@ void FormUpdate::checkForUpdates() {
m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok, m_ui->m_lblStatus->setStatus(WidgetWithStatus::Ok,
tr("New release available."), tr("New release available."),
tr("This is new version which can be\ndownloaded and installed.")); 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->setEnabled(true);
m_btnUpdate->setToolTip(isUpdateForThisSystem() ? m_btnUpdate->setToolTip(isUpdateForThisSystem() ?
tr("Download installation file for your OS.") : tr("Download installation file for your OS.") :