From 89b4d6032b98174b5e8740ff8942f00bad0d456d Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Fri, 28 Aug 2009 17:13:34 +0000
Subject: [PATCH] Use small logo as window icon Fix tray icon tooltip when a
 new database hasn't been saved

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@334 b624d157-de02-0410-bad0-e51aec6abb33
---
 share/keepassx/icons/keepassx_small.png | Bin 0 -> 898 bytes
 src/dialogs/AutoTypeDlg.cpp             |   1 -
 src/main.cpp                            |   1 +
 src/mainwindow.cpp                      |   6 +++---
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 share/keepassx/icons/keepassx_small.png

diff --git a/share/keepassx/icons/keepassx_small.png b/share/keepassx/icons/keepassx_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fb73345eed407332ca7fb63d20c830b5261929f
GIT binary patch
literal 898
zcmV-|1AY97P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$T6iGxuR5*=|
zlV504cNE9J=XY;%)0^C+X`;DnW1E`U(uGv3wW}~4V*S$!f)zv<DsIpxH_&ZXpSC$=
z!!aiK=S^WnS09u;?5U0^iim9mt5cY*f1-_l(u#>`ljhze_xNB8>We#Xhr{`tKi_kR
znejd&qIS7L+Tabl=D&z#uA0+@KbZL@0MPpYic9{nVdI>gbGvkh>a&wEUF3UzKF;1e
z`Cw1MC>|C<62I1W1||awJx_?J^PS3TBU|ggY1{Hqg=Y6);_s}Xnku*V%y+hLj~pPP
zMM74DcUjLO|LX6T=%Eh1pNQ7I26*b6I~J^;r^u#*hxYw<=-f|Nt1tBad)P_{tED@l
zc*E{51qrfL;o>T%4_#j`^@P{d^byep08j(=CcjfhdThoT8-B2tnUnFmPY+Ivq)o4@
zlKgsQvoJG--)^0brJS;cDyJXayH>dyx`M|^qOU@&)gG6uA-u3o3N6=vC!%Q8huVS0
zr6I*;R3M+^7%?-5sAXgC+6yh~BN~x_k<aqA!5hW4Wv!B3Rv-i+mp2f*^{`mm6qGbg
z!`NSO<LK_=U&sK!%-7s*_Zq#X`k#59gd8qKqm>=2Bq9O{0ujMwbHm>@OCmv-8lSN)
z_79!6EUW)58HG)3TKsLeFYs}tO-RHf1UPTu#?gn#sdz5!@Y=j2(X+%z>X@0%|H8}#
z`3=dc=X~nhUlrBlH<W}>1k~Aza{p{%2Y>-)o_Q-?O0KQ#@DE0Mg7uO^5CBY%=PWZ_
zU?M`(mY^El7CHgKigyo9CZcetbM~di&AKkx1ppv5nkkGNik(q?%97UJaInIsP}65Y
zRoLj15Y%m1e74+yKkDAsusNU$nab4U?M!}Zd}e22B-Jte^PPAunP&iK+*G4RKd(PS
zM9pP@5G2v7u8|l_o5OqW-g$O?DhuEPW*(ck{$l0O{?T~uxyb-9tJ&iKP*)xylQ15Q
z_C1{>0rBKY>PU9d_^z}UsU-0z5v{)b!|efmai!l#7Aye8^78-BJC}em0IB5Wnb`t>
YmvciX?Q`laPXGV_07*qoM6N<$f+Ga72><{9

literal 0
HcmV?d00001

diff --git a/src/dialogs/AutoTypeDlg.cpp b/src/dialogs/AutoTypeDlg.cpp
index 5405920..5a377a8 100644
--- a/src/dialogs/AutoTypeDlg.cpp
+++ b/src/dialogs/AutoTypeDlg.cpp
@@ -29,7 +29,6 @@ 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"));
 	entryList->setAlternatingRowColors(config->alternatingRowColors());
 	
 	bool hideUsernames = config->hideUsernames();
diff --git a/src/main.cpp b/src/main.cpp
index c825647..e7aa05d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -184,6 +184,7 @@ int main(int argc, char **argv)
 	DetailViewTemplate=config->detailViewTemplate();
 
 	loadImages();
+	QApplication::setWindowIcon(getIcon("keepassx_small"));
 	KpxBookmarks::load();
 	initYarrow(); //init random number generator
 	SecString::generateSessionKey();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c588eff..ba4cf5d 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -235,7 +235,6 @@ void KeepassMainWindow::setupToolbar(){
 }
 
 void KeepassMainWindow::setupIcons(){
-	setWindowIcon(getIcon("keepassx"));
 	FileNewAction->setIcon(getIcon("filenew"));
 	FileOpenAction->setIcon(getIcon("fileopen"));
 	FileSaveAction->setIcon(getIcon("filesave"));
@@ -932,7 +931,7 @@ bool KeepassMainWindow::OnFileSaveAs(){
 		return false;
 	}
 	
-	if (!dbReadOnly && QFile::exists(currentFilePath+".lock")){
+	if (!dbReadOnly && !currentFilePath.isEmpty() && QFile::exists(currentFilePath+".lock")){
 		if (!QFile::remove(currentFilePath+".lock"))
 			QMessageBox::critical(this, tr("Error"), tr("Couldn't remove database lock file."));
 	}
@@ -1470,7 +1469,8 @@ void KeepassMainWindow::updateTrayTooltip() {
 	if (!IsLocked && !FileOpen)
 		SysTray->setToolTip(QString("%1 - %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC));
 	else {
-		QString tooltip = QString("%1 - %2").arg(APP_DISPLAY_NAME, currentFileName);
+		QString tooltip = QString("%1 - %2").arg(APP_DISPLAY_NAME, currentFilePath.isEmpty()
+				? QString("[%1]").arg(tr("new")) : currentFileName);
 		if (IsLocked)
 			tooltip.append( QString(" (%1)").arg(tr("locked")) );
 		SysTray->setToolTip(tooltip);