Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/saveasdlg.h
+++ b/rtgui/saveasdlg.h
@@ -28,6 +28,7 @@ class SaveAsDialog : public Gtk::Dialog, public FormatChangeListener {

  protected:
    Gtk::FileChooserWidget* fchooser;
+    Gtk::CheckButton* autoSuffix;
    SaveFormatPanel* formatOpts;
    Glib::ustring fname;
    Gtk::FileFilter filter_jpg;
@@ -43,6 +44,7 @@ class SaveAsDialog : public Gtk::Dialog, public FormatChangeListener {
    Glib::ustring   getFileName      ();
    Glib::ustring   getDirectory     ();
    SaveFormat      getFormat        ();
+    bool            getAutoSuffix    ();
    bool            getImmediately   ();
    bool            getToHeadOfQueue ();
    bool            getToTailOfQueue ();