cherrypicked cf0da4f755b09237572237cab048279603312981
Merge pull request #852 from camptocamp/add_config_options_for_the_main_editing_window

cherrypicked cf0da4f755b09237572237cab048279603312981