Merge branch 'master' into gtk3

This commit is contained in:
Hombre
2017-01-02 02:48:45 +01:00
20 changed files with 444 additions and 219 deletions

View File

@@ -790,15 +790,22 @@ void RTWindow::MoveFileBrowserToEditor()
}
}
void RTWindow::updateProfiles(const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC)
{
epanel->updateProfiles(printerProfile, printerIntent, printerBPC);
for(auto panel : epanels) {
panel.second->updateProfiles(printerProfile, printerIntent, printerBPC);
}
}
void RTWindow::updateTPVScrollbar (bool hide)
{
fpanel->updateTPVScrollbar (hide);
epanel->updateTPVScrollbar (hide);
std::map<Glib::ustring, EditorPanel*>::const_iterator itr;
for(itr = epanels.begin(); itr != epanels.end(); ++itr) {
((*itr).second)->updateTPVScrollbar (hide);
for(auto panel : epanels) {
panel.second->updateTPVScrollbar (hide);
}
}
@@ -807,10 +814,8 @@ void RTWindow::updateTabsUsesIcons (bool useIcons)
fpanel->updateTabsUsesIcons (useIcons);
epanel->updateTabsUsesIcons (useIcons);
std::map<Glib::ustring, EditorPanel*>::const_iterator itr;
for(itr = epanels.begin(); itr != epanels.end(); ++itr) {
((*itr).second)->updateTabsUsesIcons (useIcons);
for(auto panel : epanels) {
panel.second->updateTabsUsesIcons (useIcons);
}
}
@@ -828,10 +833,8 @@ void RTWindow::updateHistogramPosition (int oldPosition, int newPosition)
{
epanel->updateHistogramPosition (oldPosition, newPosition);
std::map<Glib::ustring, EditorPanel*>::const_iterator itr;
for(itr = epanels.begin(); itr != epanels.end(); ++itr) {
((*itr).second)->updateHistogramPosition (oldPosition, newPosition);
for(auto panel : epanels) {
panel.second->updateHistogramPosition (oldPosition, newPosition);
}
}