summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Help_Dialog.cxx16
-rw-r--r--src/Fl_Help_Dialog.fl15
-rw-r--r--src/fl_symbols.cxx51
3 files changed, 71 insertions, 11 deletions
diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index aadee5495..5d03cc7fc 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -114,7 +114,7 @@ inline void Fl_Help_Dialog::cb_find__i(Fl_Input*, void*) {
find_pos_ = view_->find(find_->value(), find_pos_);
}
void Fl_Help_Dialog::cb_find_(Fl_Input* o, void* v) {
- ((Fl_Help_Dialog*)(o->parent()->user_data()))->cb_find__i(o,v);
+ ((Fl_Help_Dialog*)(o->parent()->parent()->user_data()))->cb_find__i(o,v);
}
Fl_Help_Dialog::Fl_Help_Dialog() {
@@ -164,9 +164,17 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
o->labelsize(16);
o->callback((Fl_Callback*)cb_larger_);
}
- { Fl_Input* o = find_ = new Fl_Input(10, 350, 265, 25);
- o->callback((Fl_Callback*)cb_find_);
- o->when(FL_WHEN_ENTER_KEY_ALWAYS);
+ { Fl_Group* o = new Fl_Group(10, 350, 265, 25);
+ o->box(FL_DOWN_BOX);
+ o->color(FL_BACKGROUND2_COLOR);
+ { Fl_Input* o = find_ = new Fl_Input(35, 352, 238, 21, "@search");
+ o->tooltip("find text in document");
+ o->box(FL_FLAT_BOX);
+ o->labelsize(13);
+ o->callback((Fl_Callback*)cb_find_);
+ o->when(FL_WHEN_ENTER_KEY_ALWAYS);
+ }
+ o->end();
}
o->end();
}
diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl
index 7647aaab6..4524cbda3 100644
--- a/src/Fl_Help_Dialog.fl
+++ b/src/Fl_Help_Dialog.fl
@@ -17,7 +17,7 @@ class FL_EXPORT Fl_Help_Dialog {open
} {
Fl_Window window_ {
label {Help Dialog} open
- private xywh {398 65 530 385} type Double hide resizable
+ private xywh {398 65 530 385} type Double resizable visible
} {
Fl_Group view_ {
callback {if (view_->changed())
@@ -48,7 +48,7 @@ else if (view_->filename())
{
strlcpy(file_[index_], view_->filename(), sizeof(file_[0]));
line_[index_] = view_->topline();
-}} open selected
+}} open
private xywh {10 10 510 330} box DOWN_BOX selection_color 15 resizable
code0 {\#include <FL/Fl_Help_View.H>}
class Fl_Help_View
@@ -115,9 +115,14 @@ if (view_->textsize() >= 18)
smaller_->activate();}
private tooltip {Make the help text larger.} xywh {320 350 25 25} labelfont 1 labelsize 16
}
- Fl_Input find_ {
- callback {find_pos_ = view_->find(find_->value(), find_pos_);}
- private xywh {10 350 265 25} when 10
+ Fl_Group {} {open
+ xywh {10 350 265 25} box DOWN_BOX color 7
+ } {
+ Fl_Input find_ {
+ label {@search}
+ callback {find_pos_ = view_->find(find_->value(), find_pos_);} selected
+ private tooltip {find text in document} xywh {35 352 238 21} box FLAT_BOX labelsize 13 when 10
+ }
}
}
code {back_->deactivate();
diff --git a/src/fl_symbols.cxx b/src/fl_symbols.cxx
index 1c1456a8e..25e8ee38e 100644
--- a/src/fl_symbols.cxx
+++ b/src/fl_symbols.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fl_symbols.cxx,v 1.8.2.3.2.8 2004/04/11 04:39:00 easysw Exp $"
+// "$Id: fl_symbols.cxx,v 1.8.2.3.2.9 2004/07/04 06:49:33 matthiaswm Exp $"
//
// Symbol drawing code for the Fast Light Tool Kit (FLTK).
//
@@ -171,6 +171,51 @@ static void rectangle(double x,double y,double x2,double y2,Fl_Color col) {
/* The drawing routines */
+static void draw_fltk(Fl_Color col)
+{
+ fl_color(col);
+ // F fill
+ BP; vv(-2.0, -0.5); vv(-1.0, -0.5); vv(-1.0, -0.3); vv(-1.8, -0.3);
+ vv(-1.8, -0.1); vv(-1.2, -0.1); vv(-1.2, 0.1); vv(-1.8, 0.1);
+ vv(-1.8, 0.5); vv(-2.0, 0.5); EP;
+ // L fill
+ BP; vv(-1.0, -0.5); vv(-0.8, -0.5); vv(-0.8, 0.3); vv(0.0, 0.3);
+ vv(0.0, 0.5); vv(-1.0, 0.5); EP;
+ // T outline
+ BP; vv(-0.1, -0.5); vv(1.1, -0.5); vv(1.1, -0.3); vv(0.6, -0.3);
+ vv(0.6, 0.5); vv(0.4, 0.5); vv(0.4, -0.3); vv(-0.1, -0.3); EP;
+ // K outline
+ BP; vv(1.1, -0.5); vv(1.3, -0.5); vv(1.3, -0.15); vv(1.70, -0.5);
+ vv(2.0, -0.5); vv(1.43, 0.0); vv(2.0, 0.5); vv(1.70, 0.5);
+ vv(1.3, 0.15); vv(1.3, 0.5); vv(1.1, 0.5); EP;
+ set_outline_color(col);
+ // F outline
+ BC; vv(-2.0, -0.5); vv(-1.0, -0.5); vv(-1.0, -0.3); vv(-1.8, -0.3);
+ vv(-1.8, -0.1); vv(-1.2, -0.1); vv(-1.2, 0.1); vv(-1.8, 0.1);
+ vv(-1.8, 0.5); vv(-2.0, 0.5); EC;
+ // L outline
+ BC; vv(-1.0, -0.5); vv(-0.8, -0.5); vv(-0.8, 0.3); vv(0.0, 0.3);
+ vv(0.0, 0.5); vv(-1.0, 0.5); EC;
+ // T outline
+ BC; vv(-0.1, -0.5); vv(1.1, -0.5); vv(1.1, -0.3); vv(0.6, -0.3);
+ vv(0.6, 0.5); vv(0.4, 0.5); vv(0.4, -0.3); vv(-0.1, -0.3); EC;
+ // K outline
+ BC; vv(1.1, -0.5); vv(1.3, -0.5); vv(1.3, -0.15); vv(1.70, -0.5);
+ vv(2.0, -0.5); vv(1.43, 0.0); vv(2.0, 0.5); vv(1.70, 0.5);
+ vv(1.3, 0.15); vv(1.3, 0.5); vv(1.1, 0.5); EC;
+}
+
+static void draw_search(Fl_Color col)
+{
+ fl_color(col);
+ BP; vv(.4, .13); vv(1.0, .73); vv(.73, 1.0); vv(.13, .4); EP;
+ set_outline_color(col);
+ fl_line_style(FL_SOLID, 3, 0);
+ BC; fl_circle(-.2, -.2, .8); EC;
+ fl_line_style(FL_SOLID, 1, 0);
+ BC; vv(.4, .13); vv(1.0, .73); vv(.73, 1.0); vv(.13, .4); EC;
+}
+
static void draw_arrow1(Fl_Color col)
{
fl_color(col);
@@ -358,8 +403,10 @@ static void fl_init_symbols(void) {
fl_add_symbol("UpArrow", draw_uparrow, 1);
fl_add_symbol("DnArrow", draw_downarrow, 1);
fl_add_symbol("||", draw_doublebar, 1);
+ fl_add_symbol("search", draw_search, 1);
+ fl_add_symbol("FLTK", draw_fltk, 1);
}
//
-// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.8 2004/04/11 04:39:00 easysw Exp $".
+// End of "$Id: fl_symbols.cxx,v 1.8.2.3.2.9 2004/07/04 06:49:33 matthiaswm Exp $".
//