merge with dev

This commit is contained in:
Desmis
2017-07-06 18:10:25 +02:00
21 changed files with 366 additions and 317 deletions

View File

@@ -2436,18 +2436,8 @@ void Preferences::switchFontTo (const Glib::ustring &newFontFamily, const int ne
void Preferences::workflowUpdate ()
{
if (moptions.tabbedUI != options.tabbedUI) {
parent->MoveFileBrowserToMain();
parent->CloseOpenEditors();
parent->SetMainCurrent();
if (moptions.tabbedUI) {
parent->epanel->hide();
parent->set_title_decorated ("");
} else {
parent->epanel->show_all();
parent->set_title_decorated (parent->epanel->getFileName());
}
if(moptions.tabbedUI != options.tabbedUI) {
parent->setEditorMode(moptions.tabbedUI);
}
if (moptions.hideTPVScrollbar != options.hideTPVScrollbar) {