thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
sniperbeamer 2009-09-03 16:53:44 +00:00
parent 19cd1bbab3
commit f1d9fcfd60
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dialogs/AutoTypeDlg.cpp
View File

@ -29,6 +29,7 @@ AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers, bool
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) ); setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) );
setWindowIcon(getIcon("keepassx_small"));
entryList->setAlternatingRowColors(config->alternatingRowColors()); entryList->setAlternatingRowColors(config->alternatingRowColors());
bool hideUsernames = config->hideUsernames(); bool hideUsernames = config->hideUsernames();

6
src/main.cpp
View File

@ -184,12 +184,6 @@ int main(int argc, char **argv)
DetailViewTemplate=config->detailViewTemplate(); DetailViewTemplate=config->detailViewTemplate();
loadImages(); 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(); KpxBookmarks::load();
initYarrow(); //init random number generator initYarrow(); //init random number generator
SecString::generateSessionKey(); SecString::generateSessionKey();

1
src/mainwindow.cpp
View File

@ -235,6 +235,7 @@ void KeepassMainWindow::setupToolbar(){
} }
void KeepassMainWindow::setupIcons(){ void KeepassMainWindow::setupIcons(){
setWindowIcon(getIcon("keepassx_small"));
FileNewAction->setIcon(getIcon("filenew")); FileNewAction->setIcon(getIcon("filenew"));
FileOpenAction->setIcon(getIcon("fileopen")); FileOpenAction->setIcon(getIcon("fileopen"));
FileSaveAction->setIcon(getIcon("filesave")); FileSaveAction->setIcon(getIcon("filesave"));