Merge branch 'master' of gitorious.org:goldendict/goldendict

This commit is contained in:
Konstantin Isakov 2011-05-29 21:56:36 -07:00
commit bed7209275

View file

@ -1176,7 +1176,12 @@ void MainWindow::handleEsc()
return;
if( cfg.preferences.escKeyHidesMainWindow )
on_actionCloseToTray_activated();
{
if( cfg.preferences.enableTrayIcon )
hide();
else
showMinimized();
}
else
focusTranslateLine();
}