Fix indentation of elements (STR #1549)

Update layout of help dialog to look like other help dialogs.

Drop resource fork stuff from fltk-config (no more --post, it is a no-op)

Use a single table for the header on the documentation page.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5643 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 60 insertions, 69 deletions

diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index 9760cd7d7..c55b5fbc6 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -31,57 +31,6 @@
 #include "flstring.h"
 #include <FL/fl_ask.H>
 
-void Fl_Help_Dialog::cb_view__i(Fl_Help_View*, void*) {
-  if (view_->filename())
-{
-  if (view_->changed())
-  {
-    index_ ++;
-
-    if (index_ >= 100)
-    {
-      memmove(line_, line_ + 10, sizeof(line_[0]) * 90);
-      memmove(file_, file_ + 10, sizeof(file_[0]) * 90);
-      index_ -= 10;
-    }
-
-    max_ = index_;
-
-    strlcpy(file_[index_], view_->filename(),sizeof(file_[0]));
-    line_[index_] = view_->topline();
-
-    if (index_ > 0)
-      back_->activate();
-    else
-      back_->deactivate();
-
-    forward_->deactivate();
-    window_->label(view_->title());
-  }
-  else // if ! view_->changed()
-  {
-    strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
-    line_[index_] = view_->topline();
-  }
-} else { // if ! view_->filename()
-  index_ = 0; // hitting an internal page will disable the back/fwd buffer
-  file_[index_][0] = 0; // unnamed internal page
-  line_[index_] = view_->topline();
-  back_->deactivate();
-  forward_->deactivate();
-};
-}
-void Fl_Help_Dialog::cb_view_(Fl_Help_View* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_view__i(o,v);
-}
-
-void Fl_Help_Dialog::cb_Close_i(Fl_Button*, void*) {
-  window_->hide();
-}
-void Fl_Help_Dialog::cb_Close(Fl_Button* o, void* v) {
-  ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_Close_i(o,v);
-}
-
 void Fl_Help_Dialog::cb_back__i(Fl_Button*, void*) {
   if (index_ > 0)
   index_ --;
@@ -153,59 +102,101 @@ void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
   ((Fl_Help_Dialog*)(o->parent()->parent()->parent()->user_data()))->cb_find__i(o,v);
 }
 
+void Fl_Help_Dialog::cb_view__i(Fl_Help_View*, void*) {
+  if (view_->filename())
+{
+  if (view_->changed())
+  {
+    index_ ++;
+
+    if (index_ >= 100)
+    {
+      memmove(line_, line_ + 10, sizeof(line_[0]) * 90);
+      memmove(file_, file_ + 10, sizeof(file_[0]) * 90);
+      index_ -= 10;
+    }
+
+    max_ = index_;
+
+    strlcpy(file_[index_], view_->filename(),sizeof(file_[0]));
+    line_[index_] = view_->topline();
+
+    if (index_ > 0)
+      back_->activate();
+    else
+      back_->deactivate();
+
+    forward_->deactivate();
+    window_->label(view_->title());
+  }
+  else // if ! view_->changed()
+  {
+    strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
+    line_[index_] = view_->topline();
+  }
+} else { // if ! view_->filename()
+  index_ = 0; // hitting an internal page will disable the back/fwd buffer
+  file_[index_][0] = 0; // unnamed internal page
+  line_[index_] = view_->topline();
+  back_->deactivate();
+  forward_->deactivate();
+};
+}
+void Fl_Help_Dialog::cb_view_(Fl_Help_View* o, void* v) {
+  ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_view__i(o,v);
+}
+
 Fl_Help_Dialog::Fl_Help_Dialog() {
   { window_ = new Fl_Double_Window(530, 385, "Help Dialog");
     window_->user_data((void*)(this));
-    { view_ = new Fl_Help_View(10, 10, 510, 330);
-      view_->box(FL_DOWN_BOX);
-      view_->callback((Fl_Callback*)cb_view_);
-      Fl_Group::current()->resizable(view_);
-    } // Fl_Help_View* view_
-    { Fl_Group* o = new Fl_Group(10, 348, 510, 27);
-      { Fl_Button* o = new Fl_Button(456, 350, 64, 25, "Close");
-        o->callback((Fl_Callback*)cb_Close);
-        o->label(fl_close);
-      } // Fl_Button* o
-      { back_ = new Fl_Button(386, 350, 25, 25, "@<-");
+    { Fl_Group* o = new Fl_Group(10, 10, 511, 25);
+      { back_ = new Fl_Button(10, 10, 25, 25, "@<-");
         back_->tooltip("Show the previous help page.");
         back_->shortcut(0xff51);
         back_->labelcolor((Fl_Color)2);
         back_->callback((Fl_Callback*)cb_back_);
       } // Fl_Button* back_
-      { forward_ = new Fl_Button(421, 350, 25, 25, "@->");
+      { forward_ = new Fl_Button(45, 10, 25, 25, "@->");
         forward_->tooltip("Show the next help page.");
         forward_->shortcut(0xff53);
         forward_->labelcolor((Fl_Color)2);
         forward_->callback((Fl_Callback*)cb_forward_);
       } // Fl_Button* forward_
-      { smaller_ = new Fl_Button(316, 350, 25, 25, "F");
+      { smaller_ = new Fl_Button(80, 10, 25, 25, "F");
         smaller_->tooltip("Make the help text smaller.");
         smaller_->labelfont(1);
         smaller_->labelsize(10);
         smaller_->callback((Fl_Callback*)cb_smaller_);
       } // Fl_Button* smaller_
-      { larger_ = new Fl_Button(351, 350, 25, 25, "F");
+      { larger_ = new Fl_Button(115, 10, 25, 25, "F");
         larger_->tooltip("Make the help text larger.");
         larger_->labelfont(1);
         larger_->labelsize(16);
         larger_->callback((Fl_Callback*)cb_larger_);
       } // Fl_Button* larger_
-      { Fl_Group* o = new Fl_Group(10, 350, 296, 25);
+      { Fl_Group* o = new Fl_Group(350, 10, 171, 25);
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
-        { find_ = new Fl_Input(35, 352, 268, 21, "@search");
+        { find_ = new Fl_Input(375, 12, 143, 21, "@search");
           find_->tooltip("find text in document");
           find_->box(FL_FLAT_BOX);
           find_->labelsize(13);
+          find_->textfont(4);
           find_->callback((Fl_Callback*)cb_find_);
           find_->when(FL_WHEN_ENTER_KEY_ALWAYS);
-          Fl_Group::current()->resizable(find_);
         } // Fl_Input* find_
         o->end();
-        Fl_Group::current()->resizable(o);
       } // Fl_Group* o
+      { Fl_Box* o = new Fl_Box(150, 10, 190, 25);
+        Fl_Group::current()->resizable(o);
+      } // Fl_Box* o
       o->end();
     } // Fl_Group* o
+    { view_ = new Fl_Help_View(10, 45, 510, 330);
+      view_->box(FL_DOWN_BOX);
+      view_->callback((Fl_Callback*)cb_view_);
+      Fl_Group::current()->resizable(view_);
+    } // Fl_Help_View* view_
     window_->size_range(260, 150);
     window_->end();
   } // Fl_Double_Window* window_