comparison mainwindow.cpp @ 193:ef5feb0d648f

* Give all of the substantial confirmation dialogs meaningful labels for their OK buttons

          tr("<h3>%1</h3><p>%2").arg(cf)
          .arg(tr("You are about to commit the following files:")),
          tr("<h3>%1</h3><p>%2").arg(cf)
          .arg(tr("You are about to commit %n file(s).", "", reportFiles.size())),
          reportFiles,
-         comment)) {
+         comment,
+         tr("Commit"))) {
 
         if (!justMerged && !files.empty()) {
             // User wants to commit selected file(s) (and this is not
             // merge commit, which would fail if we selected files)
             params << "commit" << "--message" << comment

 
     if (ConfirmCommentDialog::confirmAndGetShortComment
         (this,
          tr("Tag"),
          tr("Enter tag:"),
-         tag)) {
+         tag,
+         tr("Add Tag"))) {
         if (!tag.isEmpty()) {//!!! do something better if it is empty
 
             params << "tag" << "--user" << getUserInfo();
             params << "--rev" << Changeset::hashOf(id) << filterTag(tag);
             

          rf,
          tr("<h3>%1</h3><p>%2").arg(rf)
          .arg(tr("You are about to <b>revert</b> the following files to their previous committed state.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed:")),
          tr("<h3>%1</h3><p>%2").arg(rf)
          .arg(tr("You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.", "", files.size())),
-         files)) {
+         files,
+         tr("Revert"))) {
 
         lastRevertedFiles = files;
         
         if (files.empty()) {
             params << "revert" << "--no-backup";

     params << "--template" << Changeset::getLogTemplate();
 
     runner->requestAction(HgAction(ACT_INCOMING, workFolderPath, params));
 }
 
-static QMessageBox::StandardButton confirm(QWidget *parent,
-                                           QString title,
-                                           QString text,
-                                           QString okButtonText)
-{
-    QMessageBox box(QMessageBox::Question,
-                    title,
-                    text,
-                    QMessageBox::Cancel,
-                    parent);
-
-    QPushButton *ok = box.addButton(QMessageBox::Ok);
-    ok->setText(okButtonText);
-    if (box.exec() == -1) return QMessageBox::Cancel;
-    return box.standardButton(box.clickedButton());
-}
-
 void MainWindow::hgPull()
 {
-    if (confirm
+    if (ConfirmCommentDialog::confirm
         (this, tr("Confirm pull"),
          format3(tr("Confirm pull from remote repository"),
                  tr("You are about to pull changes from the following remote repository:"),
                  remoteRepoPath),
          tr("Pull")) == QMessageBox::Ok) {

     }
 }
 
 void MainWindow::hgPush()
 {
-    if (confirm
+    if (ConfirmCommentDialog::confirm
         (this, tr("Confirm push"),
          format3(tr("Confirm push to remote repository"),
                  tr("You are about to push your changes to the following remote repository:"),
                  remoteRepoPath),
          tr("Push")) == QMessageBox::Ok) {