From e2ddb1715c659dac6b8e751c2b5a772e229ebf57 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 16 Jan 2011 18:26:51 +0000
Subject: 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
---
 FL/Fl_File_Chooser.H              |  7 +++++++
 FL/Fl_Native_File_Chooser_FLTK.H  | 12 ++++--------
 FL/Fl_Native_File_Chooser_MAC.H   |  1 +
 FL/Fl_Native_File_Chooser_WIN32.H |  1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'FL')

diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index 3b8777d97..21fa8ddd8 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -123,6 +123,9 @@ private:
   Fl_Return_Button *favOkButton;
   void cb_favOkButton_i(Fl_Return_Button*, void*);
   static void cb_favOkButton(Fl_Return_Button*, void*);
+  Fl_Check_Button *show_hidden;
+  static void show_hidden_cb(Fl_Check_Button*, void*);
+  void remove_hidden_files();
 public:
   ~Fl_File_Chooser();
   void callback(void (*cb)(Fl_File_Chooser *, void *), void *d = 0);
@@ -213,6 +216,10 @@ public:
      [standard text may be customized at run-time]
   */
   static const char *show_label; 
+  /** 
+     [standard text may be customized at run-time]
+ */
+  static const char *hidden_label;
   /**
      the sort function that is used when loading
      the contents of a directory.
diff --git a/FL/Fl_Native_File_Chooser_FLTK.H b/FL/Fl_Native_File_Chooser_FLTK.H
index e97ffb037..5176ab77d 100644
--- a/FL/Fl_Native_File_Chooser_FLTK.H
+++ b/FL/Fl_Native_File_Chooser_FLTK.H
@@ -72,6 +72,8 @@
 
   - Under X windows, it's best if you call Fl_File_Icon::load_system_icons()
     at the start of main(), to enable the nicer looking file browser widgets.
+    Use the static public attributes of class Fl_File_Chooser to localize
+    the browser.
   - Some operating systems support certain OS specific options; see 
     Fl_Native_File_Chooser::options() for a list.
 
@@ -95,6 +97,8 @@ public:
     NEW_FOLDER     = 0x0002,		///< Show 'New Folder' icon (if supported)
     PREVIEW        = 0x0004		///< enable preview mode
   };
+  /** Localizable message */
+  static const char *file_exists_message;
 private:
   int   _btype;			// kind-of browser to show()
   int   _options;		// general options
@@ -106,16 +110,8 @@ private:
   char *_prevvalue;		// Returned filename
   char *_directory;
   char *_errmsg;		// error message
-  char *_old_dir;
   Fl_File_Chooser *_file_chooser;
 
-  // added by MG
-  Fl_File_Browser *my_fileList;
-  Fl_Check_Button *show_hidden;
-  int prev_filtervalue;
-  static void show_hidden_cb(Fl_Check_Button *o, void *data);
-  static void remove_hidden_files(Fl_File_Browser *my_fileList);
-
   // Private methods
   void errmsg(const char *msg);
   int type_fl_file(int);
diff --git a/FL/Fl_Native_File_Chooser_MAC.H b/FL/Fl_Native_File_Chooser_MAC.H
index 0a980e182..b34dcf118 100644
--- a/FL/Fl_Native_File_Chooser_MAC.H
+++ b/FL/Fl_Native_File_Chooser_MAC.H
@@ -49,6 +49,7 @@ public:
     NEW_FOLDER     = 0x0002,		// Show 'New Folder' icon (if supported)
     PREVIEW        = 0x0004 		// enable preview mode
   };
+  static const char *file_exists_message;
 private:
   int             _btype;		// kind-of browser to show()
   int             _options;		// general options
diff --git a/FL/Fl_Native_File_Chooser_WIN32.H b/FL/Fl_Native_File_Chooser_WIN32.H
index 00f64e235..505136e7e 100644
--- a/FL/Fl_Native_File_Chooser_WIN32.H
+++ b/FL/Fl_Native_File_Chooser_WIN32.H
@@ -52,6 +52,7 @@ public:
     NEW_FOLDER     = 0x0002,	// Show 'New Folder' icon (if supported)
     PREVIEW        = 0x0004,	// enable preview mode
   };
+  static const char *file_exists_message;
 private:
   int  _btype;			// kind-of browser to show()
   int  _options;		// general options
-- 
cgit v1.2.3