zealdocs/zeal
1
1
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2024-11-26 07:37:15 +03:00
Code Issues Projects Releases Wiki Activity

20140120 - allow github docsets list download to fail

Browse Source
This commit is contained in:
Jerzy Kozera 2014-01-20 00:57:44 +01:00
parent b4b63ea92c
commit 66ae5d687c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zeal/zeal.pro
View File

@ -54,7 +54,7 @@ macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -stdlib=libc+
macx:CONFIG += c++11 macx:CONFIG += c++11
win32:DEFINES += WIN32 QUAZIP_BUILD win32:DEFINES += WIN32 QUAZIP_BUILD
DEFINES += ZEAL_VERSION=\\\"20140118\\\" DEFINES += ZEAL_VERSION=\\\"20140120\\\"
LIBS += -lz LIBS += -lz
unix:!macx: LIBS += -lxcb -lxcb-keysyms unix:!macx: LIBS += -lxcb -lxcb-keysyms

7
zeal/zealsettingsdialog.cpp
View File

@ -131,6 +131,10 @@ void ZealSettingsDialog::DownloadCompleteCb(QNetworkReply *reply){
qint8 remainingRetries = replies.take(reply); qint8 remainingRetries = replies.take(reply);
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
endTasks(); endTasks();
if (reply->request().url().host() == "raw.github.com") {
// allow github to fail
return;
}
if (reply->error() != QNetworkReply::OperationCanceledError) { if (reply->error() != QNetworkReply::OperationCanceledError) {
QMessageBox::warning(this, "No docsets found", "Failed retrieving list of docsets: " + reply->errorString()); QMessageBox::warning(this, "No docsets found", "Failed retrieving list of docsets: " + reply->errorString());
} }
@ -165,6 +169,9 @@ void ZealSettingsDialog::DownloadCompleteCb(QNetworkReply *reply){
ui->docsetsList->addItem(lwi); ui->docsetsList->addItem(lwi);
} }
} }
if(urls.size() > 0) {
ui->downloadableGroup->show();
}
} else { } else {
QString list = reply->readAll(); QString list = reply->readAll();
for(auto item : list.split("\n")) { for(auto item : list.split("\n")) {