Merge UsePopups and UseModalWindows configuration variables

Currently we have two separate configuration variables, that controls how editing windows should look. I propose to merge them into one variable like this:

EdtingWindowStyle -

{0 - same window, 1 - popup window, 2 - modal window}

Otherwise it's hard to guess, that you have to enable UsePopups first for UseModalWindows can work.