Merge branch 'master' into 'gtk3' to fix modal dialogs without a parent

This commit is contained in:
Adam Reichold
2016-03-28 13:49:56 +02:00
12 changed files with 446 additions and 243 deletions

View File

@@ -338,7 +338,7 @@ void BatchQueuePanel::saveOptions ()
void BatchQueuePanel::pathFolderButtonPressed ()
{
Gtk::FileChooserDialog fc(M("PREFERENCES_OUTDIRFOLDER"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER );
Gtk::FileChooserDialog fc (getToplevelWindow (this), M("PREFERENCES_OUTDIRFOLDER"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER );
fc.add_button( "_Cancel", Gtk::RESPONSE_CANCEL); // STOCKICON WAS THERE
fc.add_button( "_OK", Gtk::RESPONSE_OK); // STOCKICON WAS THERE
fc.set_filename(options.savePathFolder);