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

Merge branch 'dev' into newlocallab

Browse Source
This commit is contained in:
Ingo Weyrich
2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
rtgui/editorpanel.cc
View File

@@ -23,6 +23,7 @@
#include "../rtengine/imagesource.h"
#include "../rtengine/iccstore.h"
#include "batchqueue.h"
#include "soundman.h"
#include "rtimage.h"
#include "rtwindow.h"
@@ -32,6 +33,9 @@
#include "progressconnector.h"
#include "procparamchangers.h"
#include "placesbrowser.h"
#include "pathutils.h"
#include "thumbnail.h"
#include "toolpanelcoord.h"
using namespace rtengine::procparams;
@@ -889,41 +893,17 @@ EditorPanel::~EditorPanel ()
delete vboxright;
//delete saveAsDialog;
if (catalogPane) {
delete catalogPane;
}
if (iTopPanel_1_Show) {
delete iTopPanel_1_Show;
}
if (iTopPanel_1_Hide) {
delete iTopPanel_1_Hide;
}
if (iHistoryShow) {
delete iHistoryShow;
}
if (iHistoryHide) {
delete iHistoryHide;
}
if (iBeforeLockON) {
delete iBeforeLockON;
}
if (iBeforeLockOFF) {
delete iBeforeLockOFF;
}
if (iRightPanel_1_Show) {
delete iRightPanel_1_Show;
}
if (iRightPanel_1_Hide) {
delete iRightPanel_1_Hide;
}
delete catalogPane;
delete iTopPanel_1_Show;
delete iTopPanel_1_Hide;
delete iHistoryShow;
delete iHistoryHide;
delete iBeforeLockON;
delete iBeforeLockOFF;
delete iRightPanel_1_Show;
delete iRightPanel_1_Hide;
delete iShowHideSidePanels_exit;
delete iShowHideSidePanels;
}
void EditorPanel::leftPaneButtonReleased (GdkEventButton *event)
@@ -1130,7 +1110,7 @@ Glib::ustring EditorPanel::getShortName ()
}
}
Glib::ustring EditorPanel::getFileName ()
Glib::ustring EditorPanel::getFileName () const
{
if (openThm) {
return openThm->getFileName ();
@@ -2040,9 +2020,9 @@ bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *p
if (img) {
// get file name base
Glib::ustring shortname = removeExtension (Glib::path_get_basename (fname));
Glib::ustring dirname = Glib::get_tmp_dir ();
Glib::ustring fname = Glib::build_filename (dirname, shortname);
const Glib::ustring shortname = removeExtension (Glib::path_get_basename (fname));
const Glib::ustring dirname = Glib::get_tmp_dir ();
const Glib::ustring lfname = Glib::build_filename (dirname, shortname);
SaveFormat sf;
sf.format = "tif";
@@ -2051,13 +2031,13 @@ bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *p
sf.tiffUncompressed = true;
sf.saveParams = true;
Glib::ustring fileName = Glib::ustring::compose ("%1.%2", fname, sf.format);
Glib::ustring fileName = Glib::ustring::compose ("%1.%2", lfname, sf.format);
// TODO: Just list all file with a suitable name instead of brute force...
int tries = 1;
while (Glib::file_test (fileName, Glib::FILE_TEST_EXISTS) && tries < 1000) {
fileName = Glib::ustring::compose ("%1-%2.%3", fname, tries, sf.format);
fileName = Glib::ustring::compose ("%1-%2.%3", lfname, tries, sf.format);
tries++;
}