Close #3075 by merging branch which parents preferences, save-as and partial-paste dialogs.

This commit is contained in:
Adam Reichold
2016-01-11 19:18:10 +01:00
12 changed files with 28 additions and 72 deletions

View File

@@ -1573,11 +1573,12 @@ void EditorPanel::saveAsPressed ()
Glib::ustring fnameOut;
SaveAsDialog* saveAsDialog;
auto toplevel = static_cast<Gtk::Window*> (get_toplevel ());
if (safe_file_test (options.lastSaveAsPath, Glib::FILE_TEST_IS_DIR)) {
saveAsDialog = new SaveAsDialog (options.lastSaveAsPath);
saveAsDialog = new SaveAsDialog (options.lastSaveAsPath, toplevel);
} else {
saveAsDialog = new SaveAsDialog (safe_get_user_picture_dir());
saveAsDialog = new SaveAsDialog (safe_get_user_picture_dir(), toplevel);
}
saveAsDialog->set_default_size (options.saveAsDialogWidth, options.saveAsDialogHeight);