liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Reichold
2016-03-28 13:49:56 +02:00
parent a51cfcacbb 4b9bc5be88
commit f0611fe9ba
12 changed files with 446 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/curveeditorgroup.cc
View File

@@ -446,7 +446,7 @@ void CurveEditorSubGroup::updateEditButton(CurveEditor* curve, Gtk::ToggleButton
Glib::ustring CurveEditorSubGroup::outputFile ()
{
Gtk::FileChooserDialog dialog(M("CURVEEDITOR_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE);
Gtk::FileChooserDialog dialog (getToplevelWindow (parent), M("CURVEEDITOR_SAVEDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_SAVE);
bindCurrentFolder (dialog, curveDir);
dialog.set_current_name (lastFilename);
@@ -491,7 +491,7 @@ Glib::ustring CurveEditorSubGroup::outputFile ()
Glib::ustring CurveEditorSubGroup::inputFile ()
{
Gtk::FileChooserDialog dialog(M("CURVEEDITOR_LOADDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN);
Gtk::FileChooserDialog dialog (getToplevelWindow (parent), M("CURVEEDITOR_LOADDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN);
bindCurrentFolder (dialog, curveDir);
dialog.add_button(M("GENERAL_CANCEL"), Gtk::RESPONSE_CANCEL);