Reactivating Mergeback functionality. (#1226)

Reactivated code.
Various fixes.
New documentation.

3 files changed, 7 insertions, 11 deletions

diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index 432613623..a57c797c2 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -1,7 +1,7 @@
 //
 // Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2023 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -2666,17 +2666,14 @@ Fl_Double_Window* make_settings_window() {
           o->labelfont(1);
           o->labelsize(11);
           o->align(Fl_Align(FL_ALIGN_LEFT));
-          o->hide();
         } // Fl_Box* o
-        { // // Matt: disabled
-          w_proj_mergeback = new Fl_Check_Button(100, 283, 220, 20, "generate MergeBack data");
+        { w_proj_mergeback = new Fl_Check_Button(100, 283, 220, 20, "generate MergeBack data");
           w_proj_mergeback->tooltip("MergeBack is a feature under construction that allows changes in code files t"
 "o be merged back into the project file. Checking this option will generate add"
 "itional data in code and project files.");
           w_proj_mergeback->down_box(FL_DOWN_BOX);
           w_proj_mergeback->labelsize(11);
           w_proj_mergeback->callback((Fl_Callback*)cb_w_proj_mergeback);
-          w_proj_mergeback->hide();
         } // Fl_Check_Button* w_proj_mergeback
         { Fl_Box* o = new Fl_Box(100, 530, 220, 10);
           o->hide();
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index 6ea964dc2..dd1f61107 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -34,7 +34,7 @@ snap {
 comment {//
 // Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2023 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -191,7 +191,7 @@ Function {make_settings_window()} {open
 } {
   Fl_Window settings_window {
     label {FLUID Settings} open
-    xywh {392 362 340 580} type Double align 80 resizable size_range {340 580 0 0} visible
+    xywh {504 366 340 580} type Double align 80 resizable size_range {340 580 0 0} visible
   } {
     Fl_Tabs w_settings_tabs {
       callback {propagate_load(o, v);} open
@@ -428,7 +428,7 @@ or just ".ext" to set extension.}
         }
         Fl_Box {} {
           label {Experimental: }
-          xywh {100 283 0 20} labelfont 1 labelsize 11 align 4 hide
+          xywh {100 283 0 20} labelfont 1 labelsize 11 align 4
         }
         Fl_Check_Button w_proj_mergeback {
           label {generate MergeBack data}
@@ -440,8 +440,7 @@ or just ".ext" to set extension.}
     Fluid.proj.write_mergeback_data = o->value();
   }
 }}
-          comment {// Matt: disabled}
-          tooltip {MergeBack is a feature under construction that allows changes in code files to be merged back into the project file. Checking this option will generate additional data in code and project files.} xywh {100 283 220 20} down_box DOWN_BOX labelsize 11 hide
+          tooltip {MergeBack is a feature under construction that allows changes in code files to be merged back into the project file. Checking this option will generate additional data in code and project files.} xywh {100 283 220 20} down_box DOWN_BOX labelsize 11
         }
         Fl_Box {} {
           xywh {100 530 220 10} hide resizable
diff --git a/fluid/panels/settings_panel.h b/fluid/panels/settings_panel.h
index 69482d307..45c1457a6 100644
--- a/fluid/panels/settings_panel.h
+++ b/fluid/panels/settings_panel.h
@@ -1,7 +1,7 @@
 //
 // Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2023 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this