Merge branch 'master' into gtk3

This commit is contained in:
Hombre
2016-01-11 00:54:25 +01:00
69 changed files with 1940 additions and 1001 deletions

View File

@@ -423,7 +423,7 @@ Glib::ustring CurveEditorSubGroup::outputFile ()
{
Gtk::FileChooserDialog dialog(M("CURVEEDITOR_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE);
FileChooserLastFolderPersister persister(&dialog, curveDir);
bindCurrentFolder (dialog, curveDir);
dialog.set_current_name (lastFilename);
dialog.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);
@@ -468,7 +468,7 @@ Glib::ustring CurveEditorSubGroup::inputFile ()
{
Gtk::FileChooserDialog dialog(M("CURVEEDITOR_LOADDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN);
FileChooserLastFolderPersister persister(&dialog, curveDir);
bindCurrentFolder (dialog, curveDir);
dialog.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);
dialog.add_button(M("GENERAL_APPLY"), Gtk::RESPONSE_APPLY);