Added new functionality to Fluid: the 'binary data' type can now include text files as well as binary files into the source code. There is an additional check box in the dialog. Terminology is now "inlined data" instead of "binary data". Texts were modified to reflect the changes.

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

1 files changed, 17 insertions, 13 deletions

diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index 8f9199ae7..3c1ed41c1 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0400
+version 1.0304
 header_name {.h}
 code_name {.cxx}
 comment {//
@@ -333,16 +333,17 @@ Function {make_decl_panel()} {} {
   }
 }
 
-Function {make_data_panel()} {} {
+Function {make_data_panel()} {open
+} {
   Fl_Window data_panel {
-    label {Binary Data Properties} open
-    xywh {595 352 343 237} type Double align 80 hide resizable size_range {343 237 0 0}
+    label {Inline Data Properties} open
+    xywh {472 191 343 237} type Double align 80 resizable size_range {343 237 0 0} visible
   } {
     Fl_Group {} {open
-      xywh {10 10 270 20}
+      xywh {10 10 320 20}
     } {
       Fl_Box {} {
-        xywh {200 10 80 20} resizable
+        xywh {288 10 42 20} resizable
       }
       Fl_Choice data_choice {open
         xywh {10 10 185 20} down_box BORDER_BOX labelsize 11 textsize 11
@@ -380,14 +381,18 @@ Function {make_data_panel()} {} {
           xywh {10 10 100 20} labelsize 11
         }
       }
+      Fl_Check_Button data_mode {
+        label {text mode}
+        tooltip {When text mode is seleted, the returned type is "const char[]" and a trailing NUL will be appended to the data.} xywh {200 10 78 20} down_box DOWN_BOX labelsize 11
+      }
     }
     Fl_Input data_input {
-      label {Variable Name:}
-      tooltip {Binary Data variables are declared "const unsigned char []".} xywh {10 52 320 20} labelfont 1 labelsize 11 align 133 when 0 textfont 4 textsize 11
+      label {Variable Name:} selected
+      tooltip {Inline Data variables are declared "const unsigned char []" in binary mode and "const char[]" in text mode.} xywh {10 52 320 20} labelfont 1 labelsize 11 align 133 when 0 textfont 4 textsize 11
     }
     Fl_Input data_filename {
       label {Filename:}
-      tooltip {Name and path of binary file that will be included.} xywh {10 90 280 20} labelfont 1 labelsize 11 align 133 when 0 textfont 4 textsize 11
+      tooltip {Name and path of file that will be inlined.} xywh {10 90 280 20} labelfont 1 labelsize 11 align 133 when 0 textfont 4 textsize 11
     }
     Fl_Button data_filebrowser {
       label {@fileopen}
@@ -417,8 +422,7 @@ Function {make_data_panel()} {} {
   }
 }
 
-Function {make_class_panel()} {open
-} {
+Function {make_class_panel()} {} {
   Fl_Window class_panel {
     label {Class Properties} open
     xywh {497 585 342 196} type Double labelsize 11 hide resizable modal size_range {343 188 0 0}
@@ -443,7 +447,7 @@ Function {make_class_panel()} {open
       tooltip {Name of subclass.} xywh {10 55 320 20} labelfont 1 labelsize 11 align 5 when 0 textfont 4 textsize 11
     }
     Fl_Text_Editor c_comment_input {
-      label {Comment:} selected
+      label {Comment:}
       tooltip {Class comment in Doxygen format} xywh {10 90 320 65} box DOWN_BOX labelfont 1 labelsize 11 align 5 textfont 4 textsize 11 resizable
       code0 {c_comment_input->buffer(new Fl_Text_Buffer());}
       code1 {c_comment_input->add_key_binding(FL_Tab, 0, use_tab_navigation);}
@@ -595,7 +599,7 @@ else
       Fl_Button {} {
         user_data {"data"}
         callback type_make_cb
-        tooltip {Binary Data} xywh {55 55 24 24} box THIN_UP_BOX
+        tooltip {Inline Data} xywh {55 55 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[49]);}
       }
     }