Testing merge of master 95f0d6 into gtk3 9cf0e5

This commit is contained in:
Morgan Hardwood
2016-12-27 17:14:45 +01:00
parent 9cf0e5c40f
commit e4f6319d1b
42 changed files with 1824 additions and 1523 deletions

View File

@@ -1675,8 +1675,7 @@ void EditorPanel::saveAsPressed ()
fnameOut = saveAsDialog->getFileName ();
options.lastSaveAsPath = saveAsDialog->getDirectory ();
options.saveAsDialogWidth = saveAsDialog->get_width ();
options.saveAsDialogHeight = saveAsDialog->get_height ();
saveAsDialog->get_size(options.saveAsDialogWidth, options.saveAsDialogHeight);
options.autoSuffix = saveAsDialog->getAutoSuffix ();
options.saveMethodNum = saveAsDialog->getSaveMethodNum ();
lastSaveAsFileName = Glib::path_get_basename (removeExtension (fnameOut));
@@ -1745,6 +1744,8 @@ void EditorPanel::saveAsPressed ()
} while (!fnameOK);
saveAsDialog->hide();
delete saveAsDialog;
}
void EditorPanel::queueImgPressed ()