Fluid Fl_Widget::image() path fixes. (#536)

* Adding strings and design file to source view panel

* Fluid: Fixed source dir recursion, fixed relative image reading path.

* Renaming source_dir to designfile_dir in some functions.

1 files changed, 34 insertions, 10 deletions

diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index f096d323a..6631035e7 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -476,9 +476,10 @@ Function {make_class_panel()} {open
   }
 }
 
-Function {make_comment_panel()} {} {
+Function {make_comment_panel()} {open
+} {
   Fl_Window comment_panel {
-    label {Comment Properties} open
+    label {Comment Properties}
     xywh {780 296 550 280} type Double labelsize 11 hide resizable
     code0 {o->size_range(320, 180);} modal
   } {
@@ -528,7 +529,7 @@ Function {make_comment_panel()} {} {
   }
 }
 
-Function {type_make_cb(Fl_Widget*,void*d)} {open return_type void
+Function {type_make_cb(Fl_Widget*,void*d)} {return_type void
 } {
   code {const char *type_name = (const char*)d;
 if (Fl_Type::current && Fl_Type::current->is_group())
@@ -544,7 +545,7 @@ Function {make_widgetbin()} {open
     callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape)
   exit_cb((Fl_Widget*)o, v);
 else
-  toggle_widgetbin_cb((Fl_Widget*)o, v);} open
+  toggle_widgetbin_cb((Fl_Widget*)o, v);}
     xywh {449 206 600 102} type Single align 80 non_modal visible
   } {
     Fl_Group {} {
@@ -647,7 +648,7 @@ else
       }
       Fl_Button {} {
         user_data {"Fl_Flex"}
-        callback type_make_cb selected
+        callback type_make_cb
         tooltip Flex xywh {139 46 24 24} box THIN_UP_BOX
         code0 {o->image(pixmap[56]);}
         class Widget_Bin_Button
@@ -973,18 +974,19 @@ else
   }
 }
 
-Function {make_sourceview()} {} {
+Function {make_sourceview()} {open
+} {
   Fl_Window sourceview_panel {
     label {Code View}
-    callback toggle_sourceview_cb
-    xywh {430 273 520 490} type Double align 80 hide resizable size_range {384 120 0 0}
+    callback toggle_sourceview_cb open
+    xywh {464 265 520 490} type Double align 80 resizable size_range {384 120 0 0} visible
   } {
     Fl_Tabs sv_tab {
-      callback update_sourceview_position_cb
+      callback update_sourceview_position_cb open
       xywh {10 10 500 440} selection_color 4 labelcolor 7 resizable
     } {
       Fl_Group {} {
-        label Source open
+        label Source open selected
         xywh {10 35 500 415} labelsize 13 resizable
       } {
         Fl_Text_Editor sv_source {
@@ -1007,6 +1009,28 @@ Function {make_sourceview()} {} {
           class CodeViewer
         }
       }
+      Fl_Group {} {
+        label Strings open
+        xywh {10 35 500 415} labelsize 13 hide
+      } {
+        Fl_Text_Display sv_strings {
+          xywh {20 50 480 390} textfont 4 textsize 11 resizable
+          code1 {o->linenumber_width(60);}
+          code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
+          class DesignViewer
+        }
+      }
+      Fl_Group {} {
+        label Design open
+        xywh {10 35 500 415} labelsize 13 hide
+      } {
+        Fl_Text_Display sv_design {
+          xywh {20 50 480 390} textfont 4 textsize 11 resizable
+          code1 {o->linenumber_width(60);}
+          code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
+          class DesignViewer
+        }
+      }
     }
     Fl_Group {} {
       xywh {10 460 500 20}