Merge branch 'gtk3' into gtk3-bugfix

This commit is contained in:
Hombre
2016-12-27 23:22:31 +01:00
35 changed files with 1918 additions and 1567 deletions

View File

@@ -1671,8 +1671,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));
@@ -1741,6 +1740,8 @@ void EditorPanel::saveAsPressed ()
} while (!fnameOK);
saveAsDialog->hide();
delete saveAsDialog;
}
void EditorPanel::queueImgPressed ()