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

Merge branch 'master' into softproofing

Browse Source
This commit is contained in:
Hombre
2016-10-16 01:45:52 +02:00
parent 81c5b1ca41 29d5329f3f
commit 50165dab20
159 changed files with 15819 additions and 2723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtgui/editorpanel.cc
View File

@@ -223,7 +223,7 @@ private:
}
public:
ColorManagementToolbar (rtengine::StagedImageProcessor* const& ipc) :
explicit ColorManagementToolbar (rtengine::StagedImageProcessor* const& ipc) :
intentBox (Glib::ustring (), true),
processor (ipc)
{
@@ -392,6 +392,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
iareapanel = new ImageAreaPanel ();
tpc->setEditProvider(iareapanel->imageArea);
tpc->getToolBar()->setLockablePickerToolListener(iareapanel->imageArea);
Gtk::HBox* toolBarPanel = Gtk::manage (new Gtk::HBox ());
toolBarPanel->pack_start (*hidehp, Gtk::PACK_SHRINK, 1);