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
master
sniperbeamer 15 years ago
parent d5286d34a9
commit 19cd1bbab3
  1. 2
      changelog
  2. BIN
      share/keepassx/icons/keepassx_large.png
  3. 2
      src/dialogs/AboutDlg.cpp
  4. 2
      src/dialogs/AutoTypeDlg.cpp
  5. 2
      src/dialogs/EditEntryDlg.cpp
  6. 5
      src/main.cpp
  7. 4
      src/mainwindow.cpp

@ -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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

@ -24,7 +24,7 @@
AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
{
setupUi(this);
createBanner(&BannerPixmap,getPixmap("keepassx_large"),QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION),width());
createBanner(&BannerPixmap,getPixmap("keepassx"),QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION),width());
labelAppName->setText(APP_DISPLAY_NAME);
labelAppFunc->setText(QString(" - ").append(APP_LONG_FUNC));

@ -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);
}

@ -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);
}

@ -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();

@ -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();