Improvements to the curses interface.

1 files changed, 23 insertions, 11 deletions

diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index d03a874..5bb0ffc 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -10,13 +10,12 @@ class cmCursesCacheEntryComposite;
 class cmCursesMainForm : public cmCursesForm
 {
 public:
-  cmCursesMainForm(const char* whereSource, const char* whereCMake,
-                   bool newCache);
+  cmCursesMainForm(std::vector<string> const& args);
   virtual ~cmCursesMainForm();
   
   // Description:
   // Set the widgets which represent the cache entries.
-  void InitializeUI(WINDOW* w);
+  void InitializeUI();
   
   // Description:
   // Handle user input.
@@ -28,11 +27,6 @@ public:
   virtual void Render(int left, int top, int width, int height);
 
   // Description:
-  // Change the window containing the form.
-  void SetWindow(WINDOW* w)
-    { m_Window = w; }
-
-  // Description:
   // Returns true if an entry with the given key is in the
   // list of current composites.
   bool LookForCacheEntry(const char* key);
@@ -45,26 +39,44 @@ public:
   // Description:
   // This method should normally  called only by the form.
   // The only exception is during a resize.
-  void UpdateStatusBar();
+  virtual void UpdateStatusBar();
 
   // Description:
   // This method should normally  called only by the form.
   // The only exception is during a resize.
   void PrintKeys();
 
+  // Description:
+  // During a CMake run, an error handle should add errors
+  // to be displayed afterwards.
+  virtual void AddError(const char* message, const char* title);
+
+  // Description:
+  // Used to run cmake.
+  void RunCMake(bool generateMakefiles);
+
 protected:
   cmCursesMainForm(const cmCursesMainForm& from);
   void operator=(const cmCursesMainForm&);
 
-  void RunCMake(bool generateMakefiles);
   void FillCacheManagerFromUI();
+  void RePost();
+  void RemoveEntry(const char* value);
 
   std::vector<cmCursesCacheEntryComposite*>* m_Entries;
+  std::vector<std::string> m_Errors;
+  std::vector<std::string> m_Args;
+  std::vector<std::string> m_HelpMessage;
+
+  static const char* s_ConstHelpMessage;
+
   FIELD** m_Fields;
-  WINDOW* m_Window;
   std::string m_WhereSource;
   std::string m_WhereCMake;
   int m_Height;
+  int m_NumberOfVisibleEntries;
+  bool m_AdvancedMode;
+  bool m_OkToGenerate;
 
 };