Mercurial > hg > easyhg
diff confirmcommentdialog.cpp @ 301:3bb6b63420ad status_outside_tabs
Merge from the default branch
author | Chris Cannam |
---|---|
date | Tue, 22 Feb 2011 15:52:22 +0000 |
parents | fd9dc5a457d8 |
children |
line wrap: on
line diff
--- a/confirmcommentdialog.cpp Tue Feb 22 13:12:16 2011 +0000 +++ b/confirmcommentdialog.cpp Tue Feb 22 15:52:22 2011 +0000 @@ -73,26 +73,33 @@ QString ConfirmCommentDialog::buildFilesText(QString intro, QStringList files) { QString text; - text = "<qt>" + intro; - text += "<p><code>"; + + if (intro == "") text = "<qt>"; + else text = "<qt>" + intro + "<p>"; + + text += "<code>"; foreach (QString file, files) { text += " " + xmlEncode(file) + "<br>"; } text += "</code></qt>"; + return text; } bool ConfirmCommentDialog::confirm(QWidget *parent, QString title, + QString head, QString text, QString okButtonText) { QMessageBox box(QMessageBox::Question, title, - text, + head, QMessageBox::Cancel, parent); + box.setInformativeText(text); + QPushButton *ok = box.addButton(QMessageBox::Ok); ok->setText(okButtonText); box.setDefaultButton(QMessageBox::Ok); @@ -102,15 +109,18 @@ bool ConfirmCommentDialog::confirmDangerous(QWidget *parent, QString title, + QString head, QString text, QString okButtonText) { QMessageBox box(QMessageBox::Warning, title, - text, + head, QMessageBox::Cancel, parent); + box.setInformativeText(text); + QPushButton *ok = box.addButton(QMessageBox::Ok); ok->setText(okButtonText); box.setDefaultButton(QMessageBox::Cancel); @@ -131,7 +141,7 @@ } else { text = "<qt>" + introTextWithCount + "</qt>"; } - return confirm(parent, title, text, okButtonText); + return confirm(parent, title, text, "", okButtonText); } bool ConfirmCommentDialog::confirmDangerousFilesAction(QWidget *parent, @@ -147,7 +157,7 @@ } else { text = "<qt>" + introTextWithCount + "</qt>"; } - return confirmDangerous(parent, title, text, okButtonText); + return confirmDangerous(parent, title, text, "", okButtonText); } bool ConfirmCommentDialog::confirmAndGetShortComment(QWidget *parent,