Fl_File_Chooser: added a "Show hidden files" button. Hidden files aren't shown

by default now. This removes a TODO clause.
Fl_Native_File_Chooser: removed the hack that added the "Show hidden files" button, and
made the "file already exists" warning message localizable.

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

1 files changed, 1 insertions, 43 deletions

diff --git a/src/Fl_Native_File_Chooser_FLTK.cxx b/src/Fl_Native_File_Chooser_FLTK.cxx
index d7bed1bc9..86968c61d 100644
--- a/src/Fl_Native_File_Chooser_FLTK.cxx
+++ b/src/Fl_Native_File_Chooser_FLTK.cxx
@@ -64,16 +64,6 @@ Fl_Native_File_Chooser::Fl_Native_File_Chooser(int val) {
   _file_chooser = new Fl_File_Chooser(NULL, NULL, 0, NULL);
   type(val);			// do this after _file_chooser created
   _nfilters    = 0;
-
-  // Added by MG
-  Fl_Button *b = _file_chooser->previewButton;
-  Fl_Window *w = b->window();
-  Fl_Group::current(w);		// adds a "Show hidden files" check button in _file_chooser's window
-  show_hidden = new Fl_Check_Button(b->x() + b->w() + 10, b->y(), 145, b->h(), "Show hidden files");
-  show_hidden->callback((Fl_Callback*)show_hidden_cb, this);
-  my_fileList = _file_chooser->browser();
-  _old_dir = 0;						// to detect directory changes
-  prev_filtervalue = _file_chooser->filter_value();	// to detect filter changes
 } 
 
 /**
@@ -88,7 +78,6 @@ Fl_Native_File_Chooser::~Fl_Native_File_Chooser() {
   _prevvalue   = strfree(_prevvalue);
   _directory   = strfree(_directory);
   _errmsg      = strfree(_errmsg);
-  _old_dir     = strfree(_old_dir);
 }
 
 // PRIVATE: SET ERROR MESSAGE
@@ -198,14 +187,6 @@ int Fl_Native_File_Chooser::show() {
 
   // BLOCK WHILE BROWSER SHOWN
   while ( _file_chooser->shown() ) {
-    if (_old_dir==0 || strcmp(_old_dir, _file_chooser->directory()) != 0) {
-      _old_dir = strfree(_old_dir);
-      _old_dir = strnew(_file_chooser->directory());
-      if (!show_hidden->value()) remove_hidden_files(my_fileList);
-    } else if (prev_filtervalue != _file_chooser->filter_value() ) {
-      prev_filtervalue = _file_chooser->filter_value();
-      if (!show_hidden->value() ) remove_hidden_files(my_fileList);
-    }
     Fl::wait();
   }
 
@@ -471,32 +452,9 @@ const char* Fl_Native_File_Chooser::preset_file() const {
   return(_preset_file);
 }
 
-void Fl_Native_File_Chooser::show_hidden_cb(Fl_Check_Button *o, void *data)
-{
-  Fl_Native_File_Chooser *mychooser = (Fl_Native_File_Chooser *)data;
-  if (o->value()) {
-    mychooser->my_fileList->load(mychooser->_file_chooser->directory());
-  } else {
-    remove_hidden_files(mychooser->my_fileList);
-    mychooser->my_fileList->redraw();
-  }
-}
-
-// PRIVATE: Don't show hidden files
-void Fl_Native_File_Chooser::remove_hidden_files(Fl_File_Browser *my_fileList)
-{
-  int count = my_fileList->size();
-  for(int num = count; num >= 1; num--) {
-    const char *p = my_fileList->text(num);
-    if (*p == '.' && strcmp(p, "../") != 0) my_fileList->remove(num);
-  }
-  my_fileList->topline(1);
-}
 
-// PRIVATE: Don't show hidden files
 int Fl_Native_File_Chooser::exist_dialog() {
-  return(fl_choice("File exists. Are you sure you want to overwrite?", 
-		   "Cancel", "   OK   ", NULL));
+  return(fl_choice("%s", fl_cancel, fl_ok, NULL, file_exists_message));
 }
 
 //