download-repo-dialog.cpp (seafile-client-9.0.1) | : | download-repo-dialog.cpp (seafile-client-9.0.2) | ||
---|---|---|---|---|
skipping to change at line 387 | skipping to change at line 387 | |||
{ | { | |||
QString msg = tr("Failed to get repo download information:\n%1").arg(error.t oString()); | QString msg = tr("Failed to get repo download information:\n%1").arg(error.t oString()); | |||
seafApplet->warningBox(msg, this); | seafApplet->warningBox(msg, this); | |||
setAllInputsEnabled(true); | setAllInputsEnabled(true); | |||
} | } | |||
void DownloadRepoDialog::setMergeWithExisting(const QString& localPath) { | void DownloadRepoDialog::setMergeWithExisting(const QString& localPath) { | |||
merge_without_question_ = true; | merge_without_question_ = true; | |||
if (!manual_merge_mode_) { | ||||
manual_merge_mode_ = true; | ||||
} | ||||
setDirectoryText(localPath); | setDirectoryText(localPath); | |||
updateSyncMode(); | ||||
} | } | |||
void DownloadRepoDialog::setResyncMode() { | void DownloadRepoDialog::setResyncMode() { | |||
resync_mode_ = true; | resync_mode_ = true; | |||
setAllInputsEnabled(false); | setAllInputsEnabled(false); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 5 lines changed or added |