family name field on svgfonts dialog now properly saves attribute. Should do the...

[inkscape.git] / src / ui / dialog / filedialogimpl-gtkmm.h

diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h
index e5058d0c207f6f2def2584381753bd7ff2b26c94..94067a921ea289659776da7fe91cd75c84454729 100644 (file)
--- a/src/ui/dialog/filedialogimpl-gtkmm.h
+++ b/src/ui/dialog/filedialogimpl-gtkmm.h
@@ -11,8 +11,8 @@
  *
  * Copyright (C) 2004-2007 Bob Jamison
  * Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
+ * Copyright (C) 2007-2008 Joel Holdsworth
  * Copyright (C) 2004-2007 The Inkscape Organization
- * Copyright (C) 2007 Joel Holdsworth
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <set>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
@@ -164,10 +163,10 @@ public:
      *
      */
     FileDialogBaseGtk(Gtk::Window& parentWindow, const Glib::ustring &title,
-               FileDialogType type, gchar const* preferenceBase) :
-        Gtk::FileChooserDialog(parentWindow, title),
+               Gtk::FileChooserAction dialogType, FileDialogType type, gchar const* preferenceBase) :
+        Gtk::FileChooserDialog(parentWindow, title, dialogType),
         preferenceBase(preferenceBase ? preferenceBase : "unknown"),
-        dialogType(type)
+        _dialogType(type)
     {
         internalSetup();
     }
@@ -175,11 +174,11 @@ public:
     /**
      *
      */
-    FileDialogBaseGtk(Gtk::Window& parentWindow, const Glib::ustring &title,
+    FileDialogBaseGtk(Gtk::Window& parentWindow, const char *title,
                    Gtk::FileChooserAction dialogType, FileDialogType type, gchar const* preferenceBase) :
         Gtk::FileChooserDialog(parentWindow, title, dialogType),
         preferenceBase(preferenceBase ? preferenceBase : "unknown"),
-        dialogType(type)
+        _dialogType(type)
     {
         internalSetup();
     }
@@ -197,14 +196,16 @@ protected:
     /**
      * What type of 'open' are we? (open, import, place, etc)
      */
-    FileDialogType dialogType;
+    FileDialogType _dialogType;
 
     /**
      * Our svg preview widget
      */
     SVGPreview svgPreview;
 
-    //# Child widgets
+    /**
+        * Child widgets
+        */
     Gtk::CheckButton previewCheckbox;
 
 private:
@@ -248,7 +249,9 @@ public:
 
     Glib::ustring getFilename();
 
-    std::vector<Glib::ustring> getFilenames ();
+    std::vector<Glib::ustring> getFilenames();
+       
+       Glib::ustring getCurrentDirectory();
 
 private:
 
@@ -267,11 +270,6 @@ private:
      */
     Inkscape::Extension::Extension *extension;
 
-    /**
-     * Filename that was given
-     */
-    Glib::ustring myFilename;
-
 };
 
 
@@ -300,14 +298,13 @@ public:
     Inkscape::Extension::Extension *getSelectionType();
     virtual void setSelectionType( Inkscape::Extension::Extension * key );
 
-    Glib::ustring getFilename();
+       Glib::ustring getCurrentDirectory();
 
-    void change_title(const Glib::ustring& title);
+private:
+    //void change_title(const Glib::ustring& title);
     void change_path(const Glib::ustring& path);
     void updateNameAndExtension();
 
-private:
-
     /**
      * Fix to allow the user to type the file name
      */
@@ -351,16 +348,6 @@ private:
      * Callback for user input into fileNameEntry
      */
     void fileNameEntryChangedCallback();
-
-    /**
-     * Filename that was given
-     */
-    Glib::ustring myFilename;
-
-    /**
-     * List of known file extensions.
-     */
-    std::set<Glib::ustring> knownExtensions;
 };