From b4b95029e85311580c40b84573acd5e00a78162d Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 6 Apr 2004 19:33:11 +0000 Subject: [PATCH] Added a new_directory_tooltip string pointer to allow localization of the file chooser's new directory button (STR #340) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3306 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 4 ++++ FL/Fl_File_Chooser.H | 3 ++- documentation/Fl_File_Chooser.html | 8 ++++++++ src/Fl_File_Chooser.cxx | 4 ++-- src/Fl_File_Chooser.fl | 7 +++++-- src/Fl_File_Chooser2.cxx | 5 +++-- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 7739d4a91..65298904b 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ CHANGES IN FLTK 1.1.5rc1 - Documentation updates (STR #245, STR #250, STR #277, STR #281, STR #328, STR #338) + - Added a new_directory_tooltip string pointer to allow + localization of the file chooser's new directory + button (STR #340) + - Added Fl_Menu_::find_item() method (STR #316) - The Fl_Widget copy operator definitions were not conditionally compiled properly (STR #329) - FLUID's Layout functionality did not move child diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H index bfdf4e0ba..f36e4f5cc 100644 --- a/FL/Fl_File_Chooser.H +++ b/FL/Fl_File_Chooser.H @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0104 +// generated by Fast Light User Interface Designer (fluid) version 1.0105 #ifndef Fl_File_Chooser_H #define Fl_File_Chooser_H @@ -137,6 +137,7 @@ public: static const char *filesystems_label; static const char *manage_favorites_label; static const char *new_directory_label; + static const char *new_directory_tooltip; static const char *preview_label; static const char *show_label; static Fl_File_Sort_F *sort; diff --git a/documentation/Fl_File_Chooser.html b/documentation/Fl_File_Chooser.html index 42b4a5a10..e1a6b964e 100644 --- a/documentation/Fl_File_Chooser.html +++ b/documentation/Fl_File_Chooser.html @@ -69,6 +69,14 @@ dialogs: manage_favorites_label "Manage Favorites" + + new_directory_label + "New Directory?" + + + new_directory_tooltip + "Create a new directory." + preview_label "Preview" diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index d79da30d4..f769c6bc7 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -1,4 +1,4 @@ -// generated by Fast Light User Interface Designer (fluid) version 1.0104 +// generated by Fast Light User Interface Designer (fluid) version 1.0105 #include "../FL/Fl_File_Chooser.H" @@ -149,10 +149,10 @@ Fl_File_Chooser::Fl_File_Chooser(const char *d, const char *p, int t, const char favoritesButton->label(favorites_label); } { Fl_Button* o = newButton = new Fl_Button(455, 10, 25, 25); - o->tooltip("Create a new directory."); o->image(image_new); o->labelsize(8); o->callback((Fl_Callback*)cb_newButton); + o->tooltip(new_directory_tooltip); } o->end(); } diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 94437205d..7c3744546 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0104 +version 1.0105 header_name {../FL/Fl_File_Chooser.H} code_name {.cxx} class FL_EXPORT Fl_File_Chooser {open @@ -53,8 +53,9 @@ window->hide();} open } {} Fl_Button newButton { callback {newdir();} - tooltip {Create a new directory.} image {new.xbm} xywh {455 10 25 25} labelsize 8 + image {new.xbm} xywh {455 10 25 25} labelsize 8 code0 {\#include } + code1 {o->tooltip(new_directory_tooltip);} } } Fl_Tile {} { @@ -324,6 +325,8 @@ else } decl {static const char *new_directory_label;} {public } + decl {static const char *new_directory_tooltip;} {public + } decl {static const char *preview_label;} {public } decl {static const char *show_label;} {public diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx index 6f1179223..4c8b612d7 100644 --- a/src/Fl_File_Chooser2.cxx +++ b/src/Fl_File_Chooser2.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.33 2003/11/01 01:49:35 easysw Exp $" +// "$Id: Fl_File_Chooser2.cxx,v 1.1.2.34 2004/04/06 19:33:11 easysw Exp $" // // More Fl_File_Chooser routines. // @@ -89,6 +89,7 @@ const char *Fl_File_Chooser::filesystems_label = "File Systems"; #endif // WIN32 const char *Fl_File_Chooser::manage_favorites_label = "Manage Favorites"; const char *Fl_File_Chooser::new_directory_label = "New Directory?"; +const char *Fl_File_Chooser::new_directory_tooltip = "Create a new directory."; const char *Fl_File_Chooser::preview_label = "Preview"; const char *Fl_File_Chooser::show_label = "Show:"; Fl_File_Sort_F *Fl_File_Chooser::sort = fl_numericsort; @@ -1163,5 +1164,5 @@ unquote_pathname(char *dst, // O - Destination string // -// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.33 2003/11/01 01:49:35 easysw Exp $". +// End of "$Id: Fl_File_Chooser2.cxx,v 1.1.2.34 2004/04/06 19:33:11 easysw Exp $". //