From 19cd1bbab38f27c6e943f6cff3135ec611aff852 Mon Sep 17 00:00:00 2001 From: sniperbeamer Date: Mon, 31 Aug 2009 16:44:21 +0000 Subject: [PATCH] Use large icon for Mac OS X dock git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@337 b624d157-de02-0410-bad0-e51aec6abb33 --- changelog | 2 +- share/keepassx/icons/keepassx_large.png | Bin 2685 -> 5712 bytes src/dialogs/AboutDlg.cpp | 2 +- src/dialogs/AutoTypeDlg.cpp | 2 +- src/dialogs/EditEntryDlg.cpp | 2 +- src/main.cpp | 5 +++++ src/mainwindow.cpp | 4 ++-- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index 7ea46a6..d8bb1c4 100644 --- a/changelog +++ b/changelog @@ -1,7 +1,7 @@ ---------------------------- 0.4.1 (2009-08-XX) ---------------------------- -- Added initial documentation +- Added initial documentation (by Jussi Sainio) - Added and improved many translations - Seperate columns settings between normal and search results view - Interrupt auto-type if the focused window changed meanwhile diff --git a/share/keepassx/icons/keepassx_large.png b/share/keepassx/icons/keepassx_large.png index 33234c89c8125e48778831edac9ede0ce225d9b4..24c2c4bba2b5fbc383733ae0e496afe83d6e22dd 100644 GIT binary patch literal 5712 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 labelAppFunc->setText(QString(" - ").append(APP_LONG_FUNC)); diff --git a/src/dialogs/AutoTypeDlg.cpp b/src/dialogs/AutoTypeDlg.cpp index 5a377a8..f65eb47 100644 --- a/src/dialogs/AutoTypeDlg.cpp +++ b/src/dialogs/AutoTypeDlg.cpp @@ -89,7 +89,7 @@ void AutoTypeDlg::paintEvent(QPaintEvent* event){ } void AutoTypeDlg::resizeEvent(QResizeEvent* event){ - createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width()); + createBanner(&BannerPixmap,getPixmap("keepassx"),tr("Auto-Type"),width()); QWidget::resizeEvent(event); } diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp index 3f7d061..803a5e5 100644 --- a/src/dialogs/EditEntryDlg.cpp +++ b/src/dialogs/EditEntryDlg.cpp @@ -144,7 +144,7 @@ CEditEntryDlg::~CEditEntryDlg(){ } void CEditEntryDlg::resizeEvent(QResizeEvent *event){ - createBanner(&BannerPixmap,getPixmap("keepassx_large"),pNewEntry?tr("New Entry"):tr("Edit Entry"),width()); + createBanner(&BannerPixmap,getPixmap("keepassx"),pNewEntry?tr("New Entry"):tr("Edit Entry"),width()); QDialog::resizeEvent(event); } diff --git a/src/main.cpp b/src/main.cpp index e7aa05d..b4c78f7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -184,7 +184,12 @@ 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(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ba4cf5d..8f1a81c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -273,7 +273,7 @@ void KeepassMainWindow::setupIcons(){ AddThisAsBookmarkAction->setIcon(getIcon("bookmark_this")); AddBookmarkAction->setIcon(getIcon("bookmark_add")); ManageBookmarksAction->setIcon(getIcon("bookmark")); - SysTray->setIcon(getIcon("keepassx_large")); + SysTray->setIcon(getIcon("keepassx")); if(config->showSysTrayIcon()) SysTray->show(); } @@ -1344,7 +1344,7 @@ void KeepassMainWindow::resetLock(){ LockedCentralWidget->setParent(NULL); setCentralWidget(NormalCentralWidget); NormalCentralWidget->setVisible(true); - SysTray->setIcon(getIcon("keepassx_large")); + SysTray->setIcon(getIcon("keepassx")); FileUnLockWorkspaceAction->setText(tr("&Lock Workspace")); IsLocked=false; updateTrayTooltip();