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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
rtgui/editorpanel.cc
View File

@@ -305,7 +305,7 @@ public:
};
EditorPanel::EditorPanel (FilePanel* filePanel)
: realized (false), iHistoryShow (NULL), iHistoryHide (NULL), iTopPanel_1_Show (NULL), iTopPanel_1_Hide (NULL), iRightPanel_1_Show (NULL), iRightPanel_1_Hide (NULL), iBeforeLockON (NULL), iBeforeLockOFF (NULL), beforePreviewHandler (NULL), beforeIarea (NULL), beforeBox (NULL), afterBox (NULL), afterHeaderBox (NULL), parent (NULL), openThm (NULL), ipc (NULL), beforeIpc (NULL), isProcessing (false), catalogPane (NULL)
: realized(false), iHistoryShow(nullptr), iHistoryHide(nullptr), iTopPanel_1_Show(nullptr), iTopPanel_1_Hide(nullptr), iRightPanel_1_Show(nullptr), iRightPanel_1_Hide(nullptr), iBeforeLockON(nullptr), iBeforeLockOFF(nullptr), beforePreviewHandler(nullptr), beforeIarea(nullptr), beforeBox(nullptr), afterBox(nullptr), afterHeaderBox(nullptr), parent(nullptr), openThm(nullptr), ipc(nullptr), beforeIpc(nullptr), isProcessing(false), catalogPane(nullptr)
{
epih = new EditorPanelIdleHelper;
@@ -325,7 +325,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
leftbox = new Gtk::VBox ();
leftbox->set_size_request (230, 250);
histogramPanel = NULL;
histogramPanel = nullptr;
profilep = Gtk::manage (new ProfilePanel ());
ppframe = new Gtk::Frame ();
@@ -380,7 +380,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
hidehp->set_image (*iHistoryShow);
}
tbTopPanel_1 = NULL;
tbTopPanel_1 = nullptr;
if (!simpleEditor && filePanel) {
tbTopPanel_1 = new Gtk::ToggleButton ();
@@ -497,7 +497,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
tbShowHideSidePanels->set_image (*iShowHideSidePanels);
setExpandAlignProperties (tbShowHideSidePanels, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
navPrev = navNext = navSync = NULL;
navPrev = navNext = navSync = nullptr;
if (!simpleEditor && !options.tabbedUI) {
// Navigation buttons
@@ -654,31 +654,31 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
EditorPanel::~EditorPanel ()
{
history->setHistoryBeforeLineListener (NULL);
history->setHistoryBeforeLineListener (nullptr);
// the order is important!
iareapanel->setBeforeAfterViews (NULL, iareapanel);
iareapanel->setBeforeAfterViews (nullptr, iareapanel);
delete iareapanel;
iareapanel = NULL;
iareapanel = nullptr;
if (beforeIpc) {
beforeIpc->stopProcessing ();
}
delete beforeIarea;
beforeIarea = NULL;
beforeIarea = nullptr;
if (beforeIpc) {
beforeIpc->setPreviewImageListener (NULL);
beforeIpc->setPreviewImageListener (nullptr);
}
delete beforePreviewHandler;
beforePreviewHandler = NULL;
beforePreviewHandler = nullptr;
if (beforeIpc) {
rtengine::StagedImageProcessor::destroy (beforeIpc);
}
beforeIpc = NULL;
beforeIpc = nullptr;
close ();
@@ -874,28 +874,28 @@ void EditorPanel::close ()
tpc->closeImage (); // this call stops image processing
tpc->writeOptions ();
rtengine::ImageSource* is = isrc->getImageSource();
is->setProgressListener ( NULL );
is->setProgressListener( nullptr );
if (ipc) {
ipc->setPreviewImageListener (NULL);
ipc->setPreviewImageListener (nullptr);
}
if (beforeIpc) {
beforeIpc->setPreviewImageListener (NULL);
beforeIpc->setPreviewImageListener (nullptr);
}
delete previewHandler;
previewHandler = NULL;
previewHandler = nullptr;
if (iareapanel) {
iareapanel->imageArea->setPreviewHandler (NULL);
iareapanel->imageArea->setImProcCoordinator (NULL);
if(iareapanel) {
iareapanel->imageArea->setPreviewHandler (nullptr);
iareapanel->imageArea->setImProcCoordinator (nullptr);
iareapanel->imageArea->unsubscribe();
}
rtengine::StagedImageProcessor::destroy (ipc);
ipc = NULL;
navigator->previewWindow->setPreviewHandler (NULL);
ipc = nullptr;
navigator->previewWindow->setPreviewHandler (nullptr);
// If the file was deleted somewhere, the openThm.descreaseRef delete the object, but we don't know here
if (Glib::file_test(fname, Glib::FILE_TEST_EXISTS)) {
@@ -917,7 +917,7 @@ void EditorPanel::saveProfile ()
ipc->getParams (&params);
// Will call updateCache, which will update both the cached and sidecar files if necessary
openThm->setProcParams (params, NULL, EDITOR);
openThm->setProcParams (params, nullptr, EDITOR);
}
}
@@ -1046,7 +1046,7 @@ void EditorPanel::refreshProcessingState (bool inProcessingP)
if (inProcessingP) {
if (processingStartedTime == 0) {
processingStartedTime = ::time (NULL);
processingStartedTime = ::time(nullptr);
}
s->str = "PROGRESSBAR_PROCESSING";
@@ -1056,12 +1056,12 @@ void EditorPanel::refreshProcessingState (bool inProcessingP)
if (ipc && openThm && tpc->getChangedState()) {
rtengine::procparams::ProcParams pparams;
ipc->getParams (&pparams);
openThm->setProcParams (pparams, NULL, EDITOR, false);
openThm->setProcParams (pparams, nullptr, EDITOR, false);
}
// Ring a sound if it was a long event
if (processingStartedTime != 0) {
time_t curTime = ::time (NULL);
time_t curTime = ::time(nullptr);
if (::difftime (curTime, processingStartedTime) > options.sndLngEditProcDoneSecs) {
SoundManager::playSoundAsync (options.sndLngEditProcDone);
@@ -1098,7 +1098,7 @@ struct errparams {
void EditorPanel::displayError (Glib::ustring title, Glib::ustring descr)
{
GtkWidget* msgd = gtk_message_dialog_new_with_markup (NULL,
GtkWidget* msgd = gtk_message_dialog_new_with_markup (nullptr,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
@@ -1901,29 +1901,29 @@ void EditorPanel::beforeAfterToggled ()
beforeIpc->stopProcessing ();
}
iareapanel->setBeforeAfterViews (NULL, iareapanel);
iareapanel->imageArea->iLinkedImageArea = NULL;
iareapanel->setBeforeAfterViews (nullptr, iareapanel);
iareapanel->imageArea->iLinkedImageArea = nullptr;
delete beforeIarea;
beforeIarea = NULL;
beforeIarea = nullptr;
if (beforeIpc) {
beforeIpc->setPreviewImageListener (NULL);
beforeIpc->setPreviewImageListener (nullptr);
}
delete beforePreviewHandler;
beforePreviewHandler = NULL;
beforePreviewHandler = nullptr;
if (beforeIpc) {
rtengine::StagedImageProcessor::destroy (beforeIpc);
}
beforeIpc = NULL;
beforeIpc = nullptr;
}
if (beforeAfter->get_active ()) {
int errorCode = 0;
rtengine::InitialImage *beforeImg = rtengine::InitialImage::load ( isrc->getImageSource ()->getFileName(), openThm->getType() == FT_Raw , &errorCode, NULL);
rtengine::InitialImage *beforeImg = rtengine::InitialImage::load ( isrc->getImageSource ()->getFileName(), openThm->getType() == FT_Raw , &errorCode, nullptr);
if ( !beforeImg || errorCode ) {
return;
@@ -2005,19 +2005,12 @@ void EditorPanel::histogramChanged (LUTu & histRed, LUTu & histGreen, LUTu & his
bool EditorPanel::CheckSidePanelsVisibility()
{
if (tbTopPanel_1) {
if (tbTopPanel_1->get_active() == false && tbRightPanel_1->get_active() == false && hidehp->get_active() == false) {
return false;
}
return true;
return tbTopPanel_1->get_active() || tbRightPanel_1->get_active() || hidehp->get_active();
}
if (tbRightPanel_1->get_active() == false && hidehp->get_active() == false) {
return false;
}
return true;
return tbRightPanel_1->get_active() || hidehp->get_active();
}
void EditorPanel::toggleSidePanels()
{
// Maximize preview panel:
@@ -2033,7 +2026,7 @@ void EditorPanel::toggleSidePanels()
tbRightPanel_1->set_active (!bAllSidePanelsVisible);
hidehp->set_active (!bAllSidePanelsVisible);
if (bAllSidePanelsVisible == false) {
if (!bAllSidePanelsVisible) {
tbShowHideSidePanels->set_image (*iShowHideSidePanels);
} else {
tbShowHideSidePanels->set_image (*iShowHideSidePanels_exit);
@@ -2086,7 +2079,7 @@ void EditorPanel::updateHistogramPosition (int oldPosition, int newPosition)
}
delete histogramPanel;
histogramPanel = NULL;
histogramPanel = nullptr;
}
// else no need to create it