From f6a1e8ca404dfd3bfc796d457beed17c7d3ccea8 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 8 Sep 2003 17:11:45 +0000 Subject: Leave more space for filename label in file chooser. 1.1.4 release. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3095 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_File_Chooser.cxx | 20 ++++++++++---------- src/Fl_File_Chooser.fl | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index 009717495..d79da30d4 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -1,14 +1,14 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0103 +// generated by Fast Light User Interface Designer (fluid) version 1.0104 #include "../FL/Fl_File_Chooser.H" -inline void Fl_File_Chooser::cb_window_i(Fl_Window*, void*) { +inline void Fl_File_Chooser::cb_window_i(Fl_Double_Window*, void*) { fileName->value(""); fileList->deselect(); Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this); window->hide(); } -void Fl_File_Chooser::cb_window(Fl_Window* o, void* v) { +void Fl_File_Chooser::cb_window(Fl_Double_Window* o, void* v) { ((Fl_File_Chooser*)(o->user_data()))->cb_window_i(o,v); } @@ -131,8 +131,8 @@ void Fl_File_Chooser::cb_favOkButton(Fl_Return_Button* o, void* v) { } Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char *title) { - Fl_Window* w; - { Fl_Window* o = window = new Fl_Window(490, 380, "Choose File"); + Fl_Double_Window* w; + { Fl_Double_Window* o = window = new Fl_Double_Window(490, 380, "Choose File"); w = o; o->callback((Fl_Callback*)cb_window, (void*)(this)); { Fl_Group* o = new Fl_Group(65, 10, 415, 25); @@ -185,22 +185,22 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char } o->end(); } - { Fl_File_Input* o = fileName = new Fl_File_Input(85, 300, 395, 35); + { Fl_File_Input* o = fileName = new Fl_File_Input(115, 300, 365, 35); o->callback((Fl_Callback*)cb_fileName); o->when(FL_WHEN_ENTER_KEY); Fl_Group::current()->resizable(o); fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS); } - { Fl_Box* o = new Fl_Box(0, 310, 85, 25, "Filename:"); + { Fl_Box* o = new Fl_Box(10, 310, 105, 25, "Filename:"); o->align(FL_ALIGN_RIGHT|FL_ALIGN_INSIDE); o->label(filename_label); } { Fl_Group* o = new Fl_Group(10, 345, 470, 25); - { Fl_Return_Button* o = okButton = new Fl_Return_Button(320, 345, 75, 25, "OK"); + { Fl_Return_Button* o = okButton = new Fl_Return_Button(300, 345, 85, 25, "OK"); o->callback((Fl_Callback*)cb_okButton); okButton->label(fl_ok); } - { Fl_Button* o = new Fl_Button(405, 345, 75, 25, "Cancel"); + { Fl_Button* o = new Fl_Button(395, 345, 85, 25, "Cancel"); o->callback((Fl_Callback*)cb_Cancel); o->label(fl_cancel); } @@ -215,7 +215,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char o->set_modal(); o->end(); } - { Fl_Window* o = favWindow = new Fl_Window(355, 150, "Manage Favorites"); + { Fl_Double_Window* o = favWindow = new Fl_Double_Window(355, 150, "Manage Favorites"); w = o; o->user_data((void*)(this)); { Fl_File_Browser* o = favList = new Fl_File_Browser(10, 10, 300, 95); diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 05e715f5a..94437205d 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -1,8 +1,8 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0103 +version 1.0104 header_name {../FL/Fl_File_Chooser.H} code_name {.cxx} -class FL_EXPORT Fl_File_Chooser {open selected +class FL_EXPORT Fl_File_Chooser {open } { decl {enum { SINGLE = 0, MULTI = 1, CREATE = 2, DIRECTORY = 4 };} {public } @@ -30,11 +30,11 @@ class FL_EXPORT Fl_File_Chooser {open selected fileList->deselect(); Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this); window->hide();} open - private xywh {153 80 490 380} hide resizable + private xywh {153 80 490 380} type Double resizable code0 {if (title) window->label(title);} code1 {\#include } code2 {\#include } - code3 {\#include } modal + code3 {\#include } modal visible } { Fl_Group {} { private xywh {65 10 415 25} @@ -89,12 +89,12 @@ window->hide();} open } Fl_File_Input fileName { callback {fileNameCB();} - private xywh {85 300 395 35} when 8 resizable + private xywh {115 300 365 35} when 8 resizable code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);} } Fl_Box {} { label {Filename:} - private xywh {0 310 85 25} align 24 + private xywh {10 310 105 25} align 24 code0 {o->label(filename_label);} } Fl_Group {} {open @@ -106,8 +106,8 @@ window->hide();} open if (callback_) (*callback_)(this, data_); -window->hide();} - private xywh {320 345 75 25} +window->hide();} selected + private xywh {300 345 85 25} code0 {\#include } code1 {okButton->label(fl_ok);} } @@ -117,7 +117,7 @@ window->hide();} fileList->deselect(); Fl::remove_timeout((Fl_Timeout_Handler)previewCB, this); window->hide();} - private xywh {405 345 75 25} + private xywh {395 345 85 25} code0 {o->label(fl_cancel);} } Fl_Box {} { @@ -128,7 +128,7 @@ window->hide();} } Fl_Window favWindow { label {Manage Favorites} - private xywh {580 44 355 150} hide + private xywh {580 44 355 150} type Double hide code0 {favWindow->label(manage_favorites_label);} modal } { Fl_File_Browser favList { -- cgit v1.2.3