[Cmake-commits] CMake branch, next, updated. v3.7.0-1201-g027c414

Brad King brad.king at kitware.com
Tue Nov 15 11:01:40 EST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  027c414ab53ad6d204cff4473827652439b785a5 (commit)
       via  5ca4abb27f314ce03fc337514c489e67bfcf0ee5 (commit)
       via  a9562eac3ee74b3ed396f2900dfae322186e2ebe (commit)
      from  e909a7d71cc39698e2613722cc43122d33b0472a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=027c414ab53ad6d204cff4473827652439b785a5
commit 027c414ab53ad6d204cff4473827652439b785a5
Merge: e909a7d 5ca4abb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 15 11:01:39 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 15 11:01:39 2016 -0500

    Merge topic 'ccmake_fix_print_keys' into next
    
    5ca4abb2 ccmake: Correctly display edit mode and associated keys
    a9562eac ccmake: Add missing spaces to match the previous text length


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ca4abb27f314ce03fc337514c489e67bfcf0ee5
commit 5ca4abb27f314ce03fc337514c489e67bfcf0ee5
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Tue Nov 15 11:55:03 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 15 11:01:01 2016 -0500

    ccmake: Correctly display edit mode and associated keys
    
    Specific widgets can implement `PrintKeys` but their effects were hidden
    by the main widget `PrintKeys`.  Fix this to give the user a better hint
    about the edit mode status.
    
    Closes: #13757

diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index fd4ecd1..4b5b4b1 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -347,61 +347,56 @@ void cmCursesMainForm::PrintKeys(int process /* = 0 */)
     cw = reinterpret_cast<cmCursesWidget*>(field_userptr(currentField));
   }
 
-  if (cw) {
-    cw->PrintKeys();
-  }
-
-  //    {
-  //    }
-  //  else
-  //    {
-  char firstLine[512] = "";
-  char secondLine[512] = "";
-  char thirdLine[512] = "";
-  if (process) {
-    const char* clearLine =
-      "                                                                    ";
-    strcpy(firstLine, clearLine);
-    strcpy(secondLine, clearLine);
-    strcpy(thirdLine, clearLine);
-  } else {
-    if (this->OkToGenerate) {
-      sprintf(firstLine,
-              "Press [c] to configure       Press [g] to generate and exit");
+  char fmt_s[] = "%s";
+  if (cw == CM_NULLPTR || !cw->PrintKeys()) {
+    char firstLine[512] = "";
+    char secondLine[512] = "";
+    char thirdLine[512] = "";
+    if (process) {
+      const char* clearLine =
+        "                                                                    ";
+      strcpy(firstLine, clearLine);
+      strcpy(secondLine, clearLine);
+      strcpy(thirdLine, clearLine);
     } else {
-      sprintf(firstLine,
-              "Press [c] to configure                                     ");
-    }
-    {
-      const char* toggleKeyInstruction =
-        "Press [t] to toggle advanced mode (Currently %s)";
-      sprintf(thirdLine, toggleKeyInstruction,
-              this->AdvancedMode ? "On" : "Off");
+      if (this->OkToGenerate) {
+        sprintf(firstLine,
+                "Press [c] to configure       Press [g] to generate and exit");
+      } else {
+        sprintf(firstLine,
+                "Press [c] to configure                                     ");
+      }
+      {
+        const char* toggleKeyInstruction =
+          "Press [t] to toggle advanced mode (Currently %s)";
+        sprintf(thirdLine, toggleKeyInstruction,
+                this->AdvancedMode ? "On" : "Off");
+      }
+      sprintf(secondLine, "Press [h] for help           "
+                          "Press [q] to quit without generating");
     }
-    sprintf(secondLine, "Press [h] for help           "
-                        "Press [q] to quit without generating");
-  }
 
-  curses_move(y - 4, 0);
-  char fmt_s[] = "%s";
-  char fmt[512] = "Press [enter] to edit option Press [d] to delete an entry";
-  if (process) {
-    strcpy(fmt, "                           ");
+    curses_move(y - 4, 0);
+    char fmt[512] =
+      "Press [enter] to edit option Press [d] to delete an entry";
+    if (process) {
+      strcpy(fmt, "                           ");
+    }
+    printw(fmt_s, fmt);
+    curses_move(y - 3, 0);
+    printw(fmt_s, firstLine);
+    curses_move(y - 2, 0);
+    printw(fmt_s, secondLine);
+    curses_move(y - 1, 0);
+    printw(fmt_s, thirdLine);
   }
-  printw(fmt_s, fmt);
-  curses_move(y - 3, 0);
-  printw(fmt_s, firstLine);
-  curses_move(y - 2, 0);
-  printw(fmt_s, secondLine);
-  curses_move(y - 1, 0);
-  printw(fmt_s, thirdLine);
 
   if (cw) {
-    sprintf(firstLine, "Page %d of %d", cw->GetPage(), this->NumberOfPages);
-    curses_move(0, 65 - static_cast<unsigned int>(strlen(firstLine)) - 1);
-    printw(fmt_s, firstLine);
+    char pageLine[512] = "";
+    sprintf(pageLine, "Page %d of %d", cw->GetPage(), this->NumberOfPages);
+    curses_move(0, 65 - static_cast<unsigned int>(strlen(pageLine)) - 1);
+    printw(fmt_s, pageLine);
   }
-  //    }
 
   pos_form_cursor(this->Form);
 }
diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx
index eabc642..ff189f0 100644
--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@@ -202,7 +202,9 @@ bool cmCursesStringWidget::PrintKeys()
     printw(fmt_s, firstLine);
 
     curses_move(y - 3, 0);
-    printw(fmt_s, "Editing option, press [enter] to leave edit.");
+    printw(fmt_s, "Editing option, press [enter] to confirm");
+    curses_move(y - 2, 0);
+    printw(fmt_s, "                press [esc] to cancel");
     return true;
   }
   return false;

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9562eac3ee74b3ed396f2900dfae322186e2ebe
commit a9562eac3ee74b3ed396f2900dfae322186e2ebe
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Tue Nov 15 11:12:34 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 15 11:00:58 2016 -0500

    ccmake: Add missing spaces to match the previous text length
    
    There was a "glitch" leaving "it" on the screen

diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index ebd35f3..fd4ecd1 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -370,7 +370,7 @@ void cmCursesMainForm::PrintKeys(int process /* = 0 */)
               "Press [c] to configure       Press [g] to generate and exit");
     } else {
       sprintf(firstLine,
-              "Press [c] to configure                                   ");
+              "Press [c] to configure                                     ");
     }
     {
       const char* toggleKeyInstruction =

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list