Finally restore old Mac OS X dock icon
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@338 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
parent
19cd1bbab3
commit
f1d9fcfd60
|
@ -29,6 +29,7 @@ AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers, bool
|
|||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
|
||||
setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) );
|
||||
setWindowIcon(getIcon("keepassx_small"));
|
||||
entryList->setAlternatingRowColors(config->alternatingRowColors());
|
||||
|
||||
bool hideUsernames = config->hideUsernames();
|
||||
|
|
|
@ -184,12 +184,6 @@ int main(int argc, char **argv)
|
|||
DetailViewTemplate=config->detailViewTemplate();
|
||||
|
||||
loadImages();
|
||||
#ifdef Q_WS_MAC
|
||||
// use large icon for Mac OS dock
|
||||
QApplication::setWindowIcon(getIcon("keepassx_large"));
|
||||
#else
|
||||
QApplication::setWindowIcon(getIcon("keepassx_small"));
|
||||
#endif
|
||||
KpxBookmarks::load();
|
||||
initYarrow(); //init random number generator
|
||||
SecString::generateSessionKey();
|
||||
|
|
|
@ -235,6 +235,7 @@ void KeepassMainWindow::setupToolbar(){
|
|||
}
|
||||
|
||||
void KeepassMainWindow::setupIcons(){
|
||||
setWindowIcon(getIcon("keepassx_small"));
|
||||
FileNewAction->setIcon(getIcon("filenew"));
|
||||
FileOpenAction->setIcon(getIcon("fileopen"));
|
||||
FileSaveAction->setIcon(getIcon("filesave"));
|
||||
|
|
Loading…
Reference in New Issue