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

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

Browse Source
This commit is contained in:
Adam Reichold
2016-01-11 19:18:10 +01:00
parent 0d9bb56b42 375ed172e0
commit 1a9121714a
12 changed files with 28 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/filebrowser.cc
View File

@@ -126,7 +126,7 @@ void findOriginalEntries (const std::vector<ThumbBrowserEntryBase*>& entries)
}
FileBrowser::FileBrowser ()
: tbl(NULL), numFiltered(0), partialPasteDlg(M("PARTIALPASTE_DIALOGLABEL"))
: tbl(NULL), numFiltered(0)
{
fbih = new FileBrowserIdleHelper;
@@ -1088,6 +1088,9 @@ void FileBrowser::partPasteProfile ()
return;
}
auto toplevel = static_cast<Gtk::Window*> (get_toplevel ());
PartialPasteDlg partialPasteDlg (M("PARTIALPASTE_DIALOGLABEL"), toplevel);
int i = partialPasteDlg.run ();
if (i == Gtk::RESPONSE_OK) {
@@ -1402,6 +1405,10 @@ void FileBrowser::applyPartialMenuItemActivated (ProfileStoreLabel *label)
const rtengine::procparams::PartialProfile* srcProfiles = profileStore.getProfile (label->entry);
if (srcProfiles->pparams) {
auto toplevel = static_cast<Gtk::Window*> (get_toplevel ());
PartialPasteDlg partialPasteDlg (M("PARTIALPASTE_DIALOGLABEL"), toplevel);
if (partialPasteDlg.run() == Gtk::RESPONSE_OK) {
#if PROTECT_VECTORS