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

merge with Dev

Browse Source
This commit is contained in:
Desmis
2017-10-22 13:27:59 +02:00
parent ab7b8042ec 8c328cafd1
commit 15ff66fb4c
9 changed files with 86 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rtgui/profilepanel.cc
View File

@@ -26,12 +26,12 @@
using namespace rtengine;
using namespace rtengine::procparams;
PartialPasteDlg* ProfilePanel::partialProfileDlg;
PartialPasteDlg* ProfilePanel::partialProfileDlg = nullptr;
Gtk::Window* ProfilePanel::parent;
void ProfilePanel::init (Gtk::Window* parent)
void ProfilePanel::init (Gtk::Window* parentWindow)
{
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
parent = parentWindow;
}
void ProfilePanel::cleanup ()
@@ -336,6 +336,9 @@ void ProfilePanel::save_clicked (GdkEventButton* event)
if (toSave) {
if (event->state & Gdk::CONTROL_MASK) {
// opening the partial paste dialog window
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->set_title(M("PROFILEPANEL_SAVEPPASTE"));
int i = partialProfileDlg->run();
partialProfileDlg->hide();
@@ -407,6 +410,9 @@ void ProfilePanel::copy_clicked (GdkEventButton* event)
if (toSave) {
if (event->state & Gdk::CONTROL_MASK) {
// opening the partial paste dialog window
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->set_title(M("PROFILEPANEL_COPYPPASTE"));
int i = partialProfileDlg->run();
partialProfileDlg->hide();
@@ -475,6 +481,9 @@ void ProfilePanel::load_clicked (GdkEventButton* event)
printf("fname=%s\n", fname.c_str());
if (event->state & Gdk::CONTROL_MASK) {
// opening the partial paste dialog window
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->set_title(M("PROFILEPANEL_LOADPPASTE"));
int i = partialProfileDlg->run();
partialProfileDlg->hide();
@@ -514,6 +523,9 @@ void ProfilePanel::load_clicked (GdkEventButton* event)
if (event->state & Gdk::CONTROL_MASK)
// custom.pparams = loadedFile.pparams filtered by ( loadedFile.pedited & partialPaste.pedited )
{
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->applyPaste (custom->pparams, !fillMode->get_active() ? custom->pedited : nullptr, &pp, &pe);
} else {
// custom.pparams = loadedFile.pparams filtered by ( loadedFile.pedited )
@@ -551,6 +563,9 @@ void ProfilePanel::paste_clicked (GdkEventButton* event)
}
if (event->state & Gdk::CONTROL_MASK) {
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->set_title(M("PROFILEPANEL_PASTEPPASTE"));
int i = partialProfileDlg->run();
partialProfileDlg->hide();
@@ -613,6 +628,9 @@ void ProfilePanel::paste_clicked (GdkEventButton* event)
if (event->state & Gdk::CONTROL_MASK)
// custom.pparams = clipboard.pparams filtered by ( clipboard.pedited & partialPaste.pedited )
{
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->applyPaste (custom->pparams, !fillMode->get_active() ? custom->pedited : nullptr, &pp, &pe);
} else {
// custom.pparams = clipboard.pparams filtered by ( clipboard.pedited )
@@ -626,6 +644,9 @@ void ProfilePanel::paste_clicked (GdkEventButton* event)
if (event->state & Gdk::CONTROL_MASK)
// custom.pparams = clipboard.pparams filtered by ( partialPaste.pedited )
{
if(!partialProfileDlg) {
partialProfileDlg = new PartialPasteDlg (Glib::ustring (), parent);
}
partialProfileDlg->applyPaste (custom->pparams, nullptr, &pp, nullptr);
} else {
// custom.pparams = clipboard.pparams non filtered