FLUID: Improve usability of Declaration Blocks

Decl Blocks can now output code around static code
in source and header files.

1 files changed, 56 insertions, 34 deletions

diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index a83018d27..6e153ded3 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -2,6 +2,11 @@
 version 1.0400
 header_name {.h}
 code_name {.cxx}
+snap {
+  ver 1
+  current_suite FLTK
+  current_preset 1
+}
 comment {//
 // Code dialogs for the Fast Light Tool Kit (FLTK).
 //
@@ -51,7 +56,7 @@ Function {make_function_panel()} {open
 } {
   Fl_Window function_panel {
     label {Function/Method Properties}
-    xywh {540 418 343 232} type Double resizable modal visible
+    xywh {540 418 343 232} type Double align 80 resizable modal visible
   } {
     Fl_Group {} {open
       xywh {10 10 270 20}
@@ -207,55 +212,72 @@ Function {make_codeblock_panel()} {open
 Function {make_declblock_panel()} {open
 } {
   Fl_Window declblock_panel {
-    label {Declaration Block Properties}
-    xywh {806 564 300 135} type Double labelsize 11 hide resizable
-    code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal
+    label {Declaration Block Properties} open
+    xywh {645 452 300 355} type Double labelsize 11 align 80 resizable
+    code0 {o->size_range(o->w(), o->h(), Fl::w(), o->h());} modal size_range {300 355 0 0} visible
   } {
+    Fl_Input declblock_before_input {
+      label {Start Code:}
+      tooltip {\#ifdef or similar conditional declaration block.} xywh {10 23 280 20} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11
+    }
+    Fl_Box {} {
+      label {"\\n...child code...\\n" is inserted here}
+      xywh {10 48 280 20} labelsize 11
+    }
+    Fl_Input declblock_after_input {
+      label {End Code:}
+      tooltip {\#endif or similar declaration code block.} xywh {10 80 280 20} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11
+    }
     Fl_Group {} {open
-      xywh {10 10 280 20}
+      xywh {10 105 280 120}
     } {
-      Fl_Choice declblock_public_choice {open
-        tooltip {Change widget accessibility.} xywh {10 10 140 20} down_box BORDER_BOX labelsize 11 when 0 textsize 11
-      } {
-        MenuItem {} {
-          label {in source code only}
-          user_data 0 user_data_type long
-          xywh {25 25 100 20} labelsize 11
-        }
-        MenuItem {} {
-          label {in header and source}
-          user_data 1 user_data_type long
-          xywh {25 25 100 20} labelsize 11
-        }
+      Fl_Box {} {
+        label {Enclose code generated by children in source file:}
+        xywh {10 105 270 20} labelsize 11 align 20
       }
-      Fl_Light_Button declblock_public_button_x {
-        label public
-        tooltip {Make the declaration publicly accessible.} xywh {10 10 60 20} labelsize 11 when 0 hide
+      Fl_Check_Button declblock_code_source {
+        label implementations
+        xywh {20 125 260 20} down_box DOWN_BOX labelsize 11
+      }
+      Fl_Check_Button declblock_static_source {
+        label {static initializations and callbacks}
+        xywh {20 145 260 20} down_box DOWN_BOX labelsize 11
       }
       Fl_Box {} {
-        xywh {155 10 135 20} resizable
+        label {Enclose code in header file:}
+        xywh {10 165 270 20} labelsize 11 align 20
+      }
+      Fl_Check_Button declblock_code_header {
+        label {forward declarations}
+        xywh {20 185 260 20} down_box DOWN_BOX labelsize 11
+      }
+      Fl_Check_Button declblock_static_header {
+        label {preprecessor and callback declarations}
+        xywh {20 205 260 20} down_box DOWN_BOX labelsize 11
+      }
+      Fl_Box {} {
+        xywh {280 105 10 120} labelsize 11 hide resizable
       }
     }
-    Fl_Input decl_before_input {
-      tooltip {\#ifdef or similar conditional declaration block.} xywh {10 40 280 20} labelsize 11 align 5 when 0 textfont 4 textsize 11 resizable
-    }
-    Fl_Input decl_after_input {
-      label {"\\n...child code...\\n" is inserted here}
-      tooltip {\#endif or similar declaration code block.} xywh {10 75 280 20} labelsize 11 align 5 when 0 textfont 4 textsize 11
+    Fl_Text_Editor declblock_comment_input {
+      label {Comment:}
+      tooltip {Declaration comment in Doxygen format} xywh {10 242 280 65} box DOWN_BOX labelfont 1 labelsize 11 align 5 textfont 4 textsize 11 resizable
+      code0 {declblock_comment_input->buffer(new Fl_Text_Buffer());}
+      code1 {declblock_comment_input->add_key_binding(FL_Tab, 0, use_tab_navigation);}
     }
-    Fl_Group {} {open
-      xywh {10 105 280 20}
+    Fl_Group {} {
+      xywh {10 321 280 20}
     } {
       Fl_Return_Button declblock_panel_ok {
         label OK
-        xywh {160 105 60 20} labelsize 11 hotspot
+        xywh {160 321 60 20} labelsize 11 hotspot
       }
       Fl_Button declblock_panel_cancel {
         label Cancel
-        xywh {230 105 60 20} shortcut 0xff1b labelsize 11
+        xywh {230 321 60 20} shortcut 0xff1b labelsize 11
       }
       Fl_Box {} {
-        xywh {10 105 140 20} resizable
+        xywh {10 321 140 20} resizable
       }
     }
   }
@@ -264,7 +286,7 @@ Function {make_declblock_panel()} {open
 Function {make_decl_panel()} {open
 } {
   Fl_Window decl_panel {
-    label {Declaration Properties} open selected
+    label {Declaration Properties}
     xywh {497 618 343 262} type Double align 80 resizable size_range {343 262 0 0} visible
   } {
     Fl_Group {} {