From db7fbc687a86c44395bf3cdd0f825d655b9eb153 Mon Sep 17 00:00:00 2001 From: Knut Petter Svendsen Date: Fri, 2 Jan 2015 16:15:20 +0100 Subject: ClearCase: Persist save keep file on undo checkout When undoing checkout on a modified file the user is prompted to preserve the contents of the checked-out version under a file-name of the form element-name.keep. Save the user's choice and use it on subsequent undo checkout actions. Change-Id: I26a73c7f1f456ae0cf1cad6741d30ff2aab4bf3f Reviewed-by: Orgad Shaneh --- src/plugins/clearcase/clearcaseplugin.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/plugins/clearcase/clearcaseplugin.cpp') diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index e08e392381..766b798b1d 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -920,9 +920,14 @@ void ClearCasePlugin::undoCheckOutCurrent() QDialog uncoDlg; uncoUi.setupUi(&uncoDlg); uncoUi.lblMessage->setText(tr("Do you want to undo the check out of \"%1\"?").arg(fileName)); + uncoUi.chkKeep->setChecked(m_settings.keepFileUndoCheckout); if (uncoDlg.exec() != QDialog::Accepted) return; keep = uncoUi.chkKeep->isChecked(); + if (keep != m_settings.keepFileUndoCheckout) { + m_settings.keepFileUndoCheckout = keep; + m_settings.toSettings(ICore::settings()); + } } vcsUndoCheckOut(state.topLevel(), file, keep); } -- cgit v1.2.1