Remove FLUID chapter form FLTK docs.

MatthiasWM · Apr 11, 2024 · bc6c048 · bc6c048
1 parent 2315877
commit bc6c048
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 62 deletions.
diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox
@@ -252,7 +252,7 @@ and shows OpenGL text.
 \subsection examples_CubeView CubeView
 
 \par
-\c CubeView shows how to create a UI containing OpenGL with Fluid.
+\c CubeView shows how to create a UI containing OpenGL with FLUID.
 
 
 \subsection examples_cursor cursor
@@ -577,7 +577,7 @@ come in handy. They remember any kind of data between program launches.
 \subsection examples_radio radio
 
 \par
-The \c radio tool was created entirely with <i>fluid</i>. It
+The \c radio tool was created entirely with <i>FLUID</i>. It
 shows some of the available button types and tests radio
 button behavior.
 
@@ -658,7 +658,7 @@ The \c table demo shows the features of the Fl_Table widget.
 \subsection examples_tabs tabs
 
 \par
-The \c tabs tool was created with <i>fluid</i>. It tests
+The \c tabs tool was created with <i>FLUID</i>. It tests
 correct hiding and redisplaying of tabs, navigation across tabs,
 resize behavior, and no unneeded redrawing of invisible widgets.
 
@@ -733,13 +733,13 @@ font draws each of the Unicode code points ranging between U+0020 and U+FFFF.
 while the focus stays in the original window.
 
 
-\subsection examples_fluid fluid
+\subsection examples_fluid FLUID
 
 \par
-\c fluid is not only a big test program, but also a very
-useful visual UI designer. Many parts of \c fluid were
-created using \c fluid. See the \link fluid Fluid Tutorial \endlink
-for more details.
+\c FLUID is not only a big test program, but also a very
+useful visual UI designer. Many parts of \c FLUID were
+created using \c FLUID. Check out the FLUID User Manual and
+the tutorials that come with it at https://www.fltk.org/documentation.php .
 
 
 

diff --git a/documentation/src/fltk-options.dox b/documentation/src/fltk-options.dox
@@ -41,8 +41,8 @@ tool called fltk-options.
 `fltk-options` is a hybrid app that is part of FLTK and can be installed on
 the target system. It includes an up-to-date man page.
 
-\image html fluid-edit-global-fltk-settings.png "fltk-options Application"
-\image latex fluid-edit-global-fltk-settings.png "fltk-options Application" width=10cm
+\image html fltk-options.png "fltk-options Application"
+\image latex fltk-options.png "fltk-options Application" width=10cm
 
 When fltk-options is called without any command-line arguments, it opens in
 interactive mode and provides a user interface to view and alter all
@@ -67,9 +67,9 @@ A full list of options can be found in the manual at Fl::Fl_Option.
 <table summary="navigation bar" width="100%" border="0">
 <tr>
   <td width="45%" align="LEFT">
-    <a class="el" href="fluid.html">
+    <a class="el" href="opengl.html">
     [Prev]
-    Programming with FLUID
+    Using OpenGL
     </a>
   </td>
   <td width="10%" align="CENTER">

diff --git a/...n/src/fluid-edit-global-fltk-settings.png → documentation/src/fltk-options.png b/...n/src/fluid-edit-global-fltk-settings.png → documentation/src/fltk-options.png
diff --git a/documentation/src/fluid-catgets.png b/documentation/src/fluid-catgets.png
diff --git a/documentation/src/fluid-edit-gui-settings.png b/documentation/src/fluid-edit-gui-settings.png
diff --git a/documentation/src/fluid-edit-proj-settings.png b/documentation/src/fluid-edit-proj-settings.png
diff --git a/documentation/src/fluid-gettext.png b/documentation/src/fluid-gettext.png
diff --git a/documentation/src/fluid-layout-grid-and-size-settings.png b/documentation/src/fluid-layout-grid-and-size-settings.png
diff --git a/documentation/src/fluid-org.png b/documentation/src/fluid-org.png
diff --git a/documentation/src/fluid-org.xcf b/documentation/src/fluid-org.xcf
diff --git a/documentation/src/fluid.dox b/documentation/src/fluid.dox
diff --git a/documentation/src/fluid3-gui.png b/documentation/src/fluid3-gui.png
diff --git a/documentation/src/fluid3-style.png b/documentation/src/fluid3-style.png
diff --git a/documentation/src/fluid_widget_cxx.png b/documentation/src/fluid_widget_cxx.png
diff --git a/documentation/src/fluid_widget_gui.png b/documentation/src/fluid_widget_gui.png
diff --git a/documentation/src/fluid_widget_style.png b/documentation/src/fluid_widget_style.png
diff --git a/documentation/src/index.dox b/documentation/src/index.dox
@@ -67,11 +67,6 @@
 
     \subpage opengl
 
-    \subpage fluid
-        - \ref fluid_widget_attributes
-        - \ref fluid_selecting_moving
-        - \ref fluid_images
-
     \subpage fltk-options
 
     \subpage advanced

diff --git a/documentation/src/intro.dox b/documentation/src/intro.dox
@@ -142,6 +142,17 @@ the toolkit, which was already in use by several people, Bill
 came up with "FLTK", including a bogus excuse that it
 stands for "The Fast Light Toolkit".
 
+\section intro_fluid FLUID
+
+FLTK comes bundled with FLUID. FLUID, short for Fast Light User Interface
+Designer, is a graphical editor capable of generating C++ source code and
+header files ready for compilation. These files ultimately create the graphical
+user interface for an application.
+
+The FLUID User Handbook is available at https://www.fltk.org/documentation.php .
+It can also be compiled from the FLTK source repository using the `fluid_docs`
+target in the CMake build environment.
+
 \section intro_cmake Building and Installing FLTK with CMake
 
 Starting with version 1.4, the recommended FLTK building system

diff --git a/documentation/src/opengl.dox b/documentation/src/opengl.dox
@@ -164,9 +164,7 @@ loading functions by doing:
 Your main program can now create one of your windows by doing
 <tt>new MyWindow(...)</tt>.
 
-You can also use your new window class in
-\ref fluid "FLUID"
-by:
+You can also use your new window class in FLUID by:
 
 -# Putting your class definition in a \p MyWindow.H file.
 -# Creating a Fl_Box widget in FLUID.
@@ -670,8 +668,8 @@ Link with libGLEW.so (with X11 or Wayland), libglew32.a (with MinGW) or glew32.l
     <a class="el" href="index.html">[Index]</a>
   </td>
   <td width="45%" align="RIGHT">
-    <a class="el" href="fluid.html">
-    Programming with FLUID
+    <a class="el" href="fltk-options.html">
+    FLTK Runtime Options
     [Next]
     </a>
   </td>

diff --git a/documentation/src/osissues.dox b/documentation/src/osissues.dox
@@ -968,7 +968,7 @@ internally in the same way.
 
 \subsection osissues_mac_files Mac File System Specifics
 
-\par Resource Forks
+\par Resource Forks (OS X pre 10.6)
 
 FLTK does not access the resource fork of an application.
 However, a minimal resource fork must be created for OS X

diff --git a/documentation/src/preface.dox b/documentation/src/preface.dox
@@ -31,7 +31,6 @@ This manual is organized into the following chapters and appendices:
 \li \ref events
 \li \ref subclassing
 \li \ref opengl
-\li \ref fluid
 \li \ref fltk-options
 \li \ref advanced
 \li \ref unicode

diff --git a/documentation/src/subclassing.dox b/documentation/src/subclassing.dox
@@ -40,9 +40,7 @@ The constructor should have the following arguments:
 MyClass(int x, int y, int w, int h, const char *label = 0);
 \endcode
 
-This will allow the class to be used in
-\ref fluid "FLUID"
-without problems.
+This will allow the class to be used in FLUID without problems.
 
 The constructor must call the constructor for the base class and
 pass the same arguments:

diff --git a/fluid/documentation/src/page_introduction.dox b/fluid/documentation/src/page_introduction.dox
@@ -8,13 +8,16 @@
 
  FLUID, short for Fast Light User Interface Designer, is a graphical editor
  capable of generating C++ source code and header files ready for compilation.
- These files ultimately create the graphical user interface for an application.
-
+ These files ultimately create an FLTK based graphical user interface
+ for an application.
+
  This manual provides instructions on launching FLUID as a command line tool
  and integrating `.fl` project files into the application build process.
  FLTK utilizes `cmake`, but other build systems and IDEs capable of running
  external tools can also build applications based on FLUID.
 
+ The FLTK programming manual is available at https://www.fltk.org/documentation.php .
+
  The majority of the manual focuses on using FLUID as an interactive GUI
  design tool. It covers an overview of windows, menu items, and dialog boxes,
  detailing how to create visually appealing and consistent user experiences