Right-click leader portrait in diplo ribbon doesn't link to deal screen if at war

[chaorace]

This happens because peace deals are triggered by a different command than regular deals, which means the game rejects our request to open a regular deal screen if we right-click when at war. We can fix this by checking if at war and opening the appropriate deal screen

[ricanuck]

Done.