Option to clear chat log without confirmation (closes #1041)

tfar · Jan 22, 2010 · af5d8a7 · af5d8a7
1 parent c62fe1f
commit af5d8a7
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/options/default.xml b/options/default.xml
@@ -103,6 +103,7 @@
 				<use-chat-says-style type="bool">false</use-chat-says-style>
 				<use-expanding-line-edit type="bool">true</use-expanding-line-edit>
 				<use-small-chats type="bool">false</use-small-chats>
+				<warn-before-clear type="bool">true</warn-before-clear>
 			</chat>
 			<contactlist comment="Contact list options">
 				<auto-delete-unlisted comment="Automatically remove an unlisted contact from the contact list if it does not have any pending messages anymore" type="bool">false</auto-delete-unlisted>

diff --git a/src/groupchatdlg.cpp b/src/groupchatdlg.cpp
@@ -1018,9 +1018,26 @@ void GCMainDlg::doClear()
 
 void GCMainDlg::doClearButton()
 {
-	int n = QMessageBox::information(this, tr("Warning"), tr("Are you sure you want to clear the chat window?\n(note: does not affect saved history)"), tr("&Yes"), tr("&No"));
-	if(n == 0)
+	if (PsiOptions::instance()->getOption("options.ui.chat.warn-before-clear").toBool()) {
+		switch (
+			QMessageBox::warning(
+				this,
+				tr("Warning"),
+				tr("Are you sure you want to clear the chat window?\n(note: does not affect saved history)"),
+				QMessageBox::Yes, QMessageBox::YesAll, QMessageBox::No
+			)
+		) {
+		case QMessageBox::No:
+			break;
+		case QMessageBox::YesAll:
+			PsiOptions::instance()->setOption("options.ui.chat.warn-before-clear", false);
+			// fall-through
+		case QMessageBox::Yes:
+			doClear();
+		}
+	} else {
 		doClear();
+	}
 }
 
 void GCMainDlg::openFind()

diff --git a/src/psichatdlg.cpp b/src/psichatdlg.cpp
@@ -468,9 +468,26 @@ void PsiChatDlg::updatePGP()
 
 void PsiChatDlg::doClearButton()
 {
-	int n = QMessageBox::information(this, tr("Warning"), tr("Are you sure you want to clear the chat window?\n(note: does not affect saved history)"), tr("&Yes"), tr("&No"));
-	if (n == 0)
+	if (PsiOptions::instance()->getOption("options.ui.chat.warn-before-clear").toBool()) {
+		switch (
+			QMessageBox::warning(
+				this,
+				tr("Warning"),
+				tr("Are you sure you want to clear the chat window?\n(note: does not affect saved history)"),
+				QMessageBox::Yes, QMessageBox::YesAll, QMessageBox::No
+			)
+		) {
+		case QMessageBox::No:
+			break;
+		case QMessageBox::YesAll:
+			PsiOptions::instance()->setOption("options.ui.chat.warn-before-clear", false);
+			// fall-through
+		case QMessageBox::Yes:
+			doClear();
+		}
+	} else {
 		doClear();
+	}
 }
 
 void PsiChatDlg::setPGPEnabled(bool enabled)