From 961268a67d65e59a6e1fe63b3e87f7db7cc1279d Mon Sep 17 00:00:00 2001
From: myxelf <myxelf@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Wed, 26 Sep 2007 22:48:38 +0000
Subject: [PATCH] most changes are details

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@147 b624d157-de02-0410-bad0-e51aec6abb33
---
 share/keepass/icons/bookmark.png      | Bin 6161 -> 2025 bytes
 share/keepass/icons/bookmark_add.png  | Bin 2404 -> 2401 bytes
 share/keepass/icons/bookmark_del.png  | Bin 0 -> 2159 bytes
 share/keepass/icons/bookmark_edit.png | Bin 2617 -> 2337 bytes
 share/keepass/icons/bookmark_this.png | Bin 0 -> 2373 bytes
 src/Database.h                        | 109 +++++++++++++-------------
 src/Kdb3Database.cpp                  |  43 +++++++++-
 src/Kdb3Database.h                    |  35 +++++----
 src/dialogs/AboutDlg.cpp              |  14 ++--
 src/dialogs/AboutDlg.h                |   4 +-
 src/dialogs/AddBookmarkDlg.cpp        |  20 ++++-
 src/dialogs/AddBookmarkDlg.h          |  13 ++-
 src/dialogs/CollectEntropyDlg.cpp     |  11 +--
 src/dialogs/CollectEntropyDlg.h       |   7 +-
 src/dialogs/EditEntryDlg.cpp          |  44 +----------
 src/dialogs/ManageBookmarksDlg.cpp    |  98 +++++++++++++----------
 src/dialogs/ManageBookmarksDlg.h      |  13 ++-
 src/forms/AboutDlg.ui                 |  48 ++++++++++--
 src/forms/AddBookmarkDlg.ui           |  47 ++++++++++-
 src/forms/MainWindow.ui               |   2 +-
 src/forms/ManageBookmarksDlg.ui       |  85 ++++++++++++++++++--
 src/main.cpp                          |  16 ++--
 src/main.h                            |  13 ++-
 src/mainwindow.cpp                    |  40 +++++-----
 24 files changed, 434 insertions(+), 228 deletions(-)
 create mode 100755 share/keepass/icons/bookmark_del.png
 create mode 100755 share/keepass/icons/bookmark_this.png

diff --git a/share/keepass/icons/bookmark.png b/share/keepass/icons/bookmark.png
index 0cc8656b373edd545a9d8cf0527b1032a2e02359..972f55024dcb06f77901cdfda1dc59b5f7d2380c 100644
GIT binary patch
literal 2025
zcmWkvdo<Mh7XQw}jK_}|ZxdylUR-2w3XSFwq0UOv<m$OHhB3~~DMk)zGA}teE?u45
zODol-PErQp=wap>NmN*ID#=hWse8&0#=O3F`eX0UT6?X%_h;>A2`fI<-gcQS0Kk50
zTr}H)<Zoh)v*_$&$G%#?CNpktHUM_c-vk9NT=cLQv3%xsCIF4)Lc`9}-#k*{*xLa(
zwi*Dj41gtQ!D#?;C;)uq0I=~K0PaUBlODzZfKS>Q%}mG};c_m6!jHkJT^^x4HW$YL
zJEeK?tv_y}4qr1PU29$t#o#;7SAD^SX4;FdaPdYdByVV+0$Ad!^t7v8&!9R8LZ}^p
z=NpaG$LsNAanEMK0VJkBjAztCXo66&!YJzKoO6#W^J)g@;u5dz$%&C#r^GAuh@v2v
zVl?-YlizkPOY8O6QN9<Tq8*&5p~G+qih|4#3Kk(GoHavH+Z;Ua(4rwnu<bF{<jN@J
zj?+Fp%1sBP6NHr*mD(FYL>-o3DSV2&@zl&NzV&y*krw8|sQN})Ov#g3Hw001fI!^F
zadj@GYVWoxpFc~&9BYbPFer5KDtx*%Wly^vUll^hM4d3ZI-x}ppBckS491xtyZNBh
zFV5aC4UHv+x&{ACp2Edk6GwW>YJBmsi@xr%(re+e_|~&WZ*0kEw^h+Ex6-S{Iy)>h
zgRW{)cz6dzpm^XjZw^&a4{yL_?L3V0Ax|Y6yOp*_*FCwd=sAPJ5>v_p_n)jSsk3+X
zCsbVY4GQvaBNOb1b6UGB?VL7CF3>hM3k1PUO-&(k!CWxKx();ya9N;7qZq?zspJBc
za>nF`QQdTAOoSl{1+@B`0m8)!NT(O18MV`%&)et<cw))42+ziPn@^Y@DQ6~irZ2IU
zhD<K}3cYw~bz@Bv_6Sm@XM~wh?RLd5YPsEeXt1*RoWu|r(fWmczPy4|Alp2#aut?Q
z4obAe6nT@JA~%CNs6G9!2}6>DBQw#Vh@OE)AbDz^mJ%9SV3Z^ePJ8n$X_h|U6Scj_
zP-qh;4St()qFfK-;`58QD40xxEB8YX(Tr`Gu^SScd#EJp?7Qfe@?*|9D<l+_nM%nr
zgN^1e%6m~W7)Ay1v0Tn*25nxSGgFrPljc(B6U#)f?hBW`R!wwYQ1yS2kB-%GYajVN
zTXoHL2s;}wfD&~?IW6-Yl)N)KcM6E6IaiG8#c>3wJ_5GiwZG%#vRdJTT5?a<CY{2F
z-LeHC#>w}b52HFAd#Y(i&KD7-9#@xVLuAMcwe}us7Z(n~g6YqLZ#p+@s~&219r94-
zFMt19!Rix51>z&#YW5e`dav6YU|w?a#rK|39?-d$LU8~-?R%z8(Qd^aQV4%+Br+K;
z>P3*Wfcnb_nmowjQ`xA2SICYag-$e~yqzsV@{fGlcF4ae#E7?2$F8czEdM%>!l(?p
z82C|XG|G3o(PX0y?BSkT$zVG4ve+My>tBQ>w>QUm`e*w^cg0e7u@3))Ee4zWi<Dwc
z-rWEERg?4gylH3kg82RY3~9B5ls;aOON<rX?N!b=q%ZZq7zi16z7w4))qB0?aL`lO
zwA3G?idOGGLNBk%Y@U3EFN$C^f4Rbs5(94cPMQ$i{rJ}W^)a<B=Tpu7mXkGzo&SJz
zk?}}D#b|>AHW`_-OWuib;j{jsMq(T1_bRz2da(3*i`pELfi3OmOmk#_34a?&a-W=M
zXb(C>qG8@GKIh?z+8&YpR$N?U4r)EQelG>-Qp_NfFbM(mt=0L>ZmGDTfO<d{Tf06~
zY<ima_lP`6$B7Q_${FP=#{{g*$=APAGwwoYF+R=4IV^~fOKIr3fjcLiEhozdpSkbj
z%s%NZeJ+b@Ae0=+WHmF{;qrRa+<&<NM7=wOfR1{~jvaAI#nJ2l+PVSLwTF~2?|Od7
zV+?b`{LAux_<43|=;HDTlv|&$m$5)Ep1eGuBYa=!Sgejr9@y=efH^PecMyZlPhcf)
zjU9=}IjG0YuJ^=3bgh7M;D_@RO3yybYkn(Z1Yy548VKuMec=*DRtB7@J&5pU3(JG}
zJ#|g5gH3q-=e0u`I<w<l8i&=$%`^S;tWO*FapUN$)uV$DTh!z*up*K5RyNf{7m?11
zSKp}J*sz>Nwd|Tzg;&E#+j}GxA;!YbNtz^<FcXTB=gO%KbsF_S;gbCy;k@v?pQ6$a
zRmRje$m%>)eQTBVdKCM!$kfZZ(rblWs<_YKRX6TM6B&Q>qHrV{PPQ*d;<N(CLCp|8
z#P3Wl;;Z*~Y`cD7ba(4p-lx7JNS~xvyv0Y=yj$(D?pCCJN<a5Ye_`3thc5YB!o?@4
za-nXnLQ+-5<V<RJRMAYSd8JQRSn4zl)~+u)<>K!Xl<C*g*A4EB@9iu!oX&lte@-Zy
zP8qmw@-9_?lH+`D6Ybt)&#$@M`|#g63HkXXvpHovnV-5*_(?VF+29e+ZMJ-$%&TTl
zo&(+epyKr!bJ(B1@jO|+#F3A@uK!dx)~zAdXb#`hso@X5!9{#ly{Z;vaq*cjMO^GZ
zvsyr}e3$aO)ohF8oD6Fsw~UY<kV6+VnKFGv=SvsM`Cqr{>Y7fLbq$7*f$r#bUq*g_
xVl_w0{m|BAVY>`J!l-qTM?LMl@D896@Sx(anT}_-K3Lu|*t#V?`u1jy^#8gksnq}g

literal 6161
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

diff --git a/share/keepass/icons/bookmark_add.png b/share/keepass/icons/bookmark_add.png
index 3521387f16d2f74f300e880f9ed569ca7d58701a..bbaa71ad80375f5b998846311a0e949d362618f3 100644
GIT binary patch
delta 2390
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

delta 2393
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
LNkvXXu0mjfE|k1}

diff --git a/share/keepass/icons/bookmark_del.png b/share/keepass/icons/bookmark_del.png
new file mode 100755
index 0000000000000000000000000000000000000000..231713fb536fbf0aa59766b27343f0469f5ecf52
GIT binary patch
literal 2159
zcmWkweLU0q9{=v4ZEUk;$tE&Uhf^}sB~jZD>Ru1&yoz*BBcXE~F*!=Ir*i0aSdS*1
zRIk!Wy}C>#J=kiB<f0o%sabi5(`9SJ*!KJ0^~dM)e!V`g*XQB&c`l2OjUwB-*aHB_
zo1!BUY{>jZ1e}fM6&4z8V3!k}lm`Hj_Ki^B+<Cf9h|S=|@BnBiFEVdA^-W`UbV3XO
zh06gDNdcIHHXH{ap9R1KAAogo0G#)o-1RgP0Q|_N2;L6|-lp;|f+G|DX|42tJqf8e
zF4!VD5PNs;`jEa_gw(pCpDF^&mJGb`KZ0!NH^SNL#~?GXc@$u&1DWZUTf3mf4??K#
zfmIEbkmrBHGezxTf}Nzu?w~!Ec?hi#DwkS>El&*2(Z^jI0lKuzH6~?SsNQkgrJE#W
zu|La#bTd;vK66R$pvRRb0aS#8V@N<BoP$C?1VX_qgp^7I3Y!eD%Hhr!GdO{aAuvyd
ztKv?1w5!(dlxQiQ7`4WoL=v{xjP1@~)i=m=TQdmD`a*4y_n~e!Y=|uD{JNM#QnmnJ
z+`1u60joM`bG66ovY>@mN)};I=u$6yCV`dMJddwtvvN>}5hq8qQ0$>Idtxv&iuA^#
zV?NPjpL8^q8nD>^SLP@#vQ`x8F1_N7m!9`_mL98JD~-Kdx&QjctY&*P=i*&XjmSjA
zLIkwdFxIYZVF{FvJf@KVbx3v~E_X{d&VxCcVtJ;r-@m%^ma_dU3QOHx?wfq{YFQnb
zwvtkD-rLV_WfPM^q#E?ZT)jb`TQATzGztX%3Wb7QFEIGC2z9{MjLQY>W6BR0eF(Ey
zt<qV2FzOpLt~Q9IRKf+{n<1R7fE-S7x<x;}<W&<#2@lU%XJKWOJ8~FlQ|U%b)~P64
zK}Kf&1zq=~*L_fE$t2S8d2Wyu)l4jf;cmoXXkK79xr-~bpyy}0GwLfC#nLdXrx%u6
z4$AbUta?Q~s~!P$P=D%#*1XGMA#a;Q2`39pg3Qq!dR9Pau|=Hna@;+`=4Nj4fv~AR
zOR3*BV)j{|AMTWmi#=GnQOV<(ol-yhQ4#DN9kEv+f2yLI$gLb(`Z02vQp}1+LRh&7
zSce3$hJ}rw59OPIP2~?}ZJ3_V*BvkTW$Z#gr>!I69~R9StF_P0sk^7@2S3!MUTyQ~
z@~XA(#eNO$K?z&J9bLR%ia%LsPXtt}!3m@8KSUzc>;p0P$+uk>EmwM==A1M2yJQ&A
z;yeM{GBV8nJZLf{j4I;tr-ZDVxVi&&RBrtdJ(>R9?97j_czp8Z`zL{$YkHfVdg-cz
zZo}`C@h^nozWCseW67mg-B*XLLgpO3@f~MXJ5A2VplB67eGSj9WV<qv!Or;bHZ%p!
z&I=)92K7G+P|%qoSstoqfE4GaGzqn;TX{m#!F_*i{&}T>ZNV?lM0wR<+>FyGjM}`F
ziyxFkpuA%&Ry)0Kd#cQn%X8?6PnaNGn<}y{et&4sd{?sYzDVLMGT}QDL?EoYL?z-M
zFnn359+`gNzM*nn5S!f1mDGqCnL`x?)TpBS9V(qe=3IAw4||AqJ0eXo?>fxqqerpn
zX?w#<mM8Dylvn38j&$Kmg1L=TmomadAhmUCBmvzJel;X6>7PHJT!0UfnI|2++M&3}
z{D*e>Q8%e=dn4N->rF9H){JvlS-eS8cYCL<;;7x{av?<6Y|DIGtC2#NL593aw2?qF
zH1#*NSW^m5>}b4@;>HCHL%D#J#kiZrncdhtY4|&_L>Wh?e^@F_e_q2cDy9*oS#zN{
zw{C!olxZP?@`aSw7WeaK7~JK)c<<!!Rt7^Z4%WV&`{Y_}{`g%0D>M;L<*veR?$BIF
ze^}@GP=z%O)4dRgA*1I{YdJJ^K`sq<SQB4TP>{_kDxQ&xkDmEme4^}xc;TP8v;aBz
zHg%ZJf|^~pz#maKx7{Hnr``rSa`7zNF7&|X?3mE)kVviOL(wNuJ34igBUKD~^F4-K
zE~j^`KG&tom|KL)PLJd(FgqNKq3zfHp+ehvb)#FE=k(_7C4RRSl4@y{Y*t>5^c9*5
zwD}_XN@-oovQsYVL;SO5wL^pJ7Z5*#oq$%#Nm;Qq&4fx504d|NX+V`iG0tj~Jx6f4
zi%Q#!W6t+vR>~RMOgwa8C8R543$cY0OWG3_myQT89b6!P!jLno2#Y$IM4A8E&kT>N
z8cyWJDTasBlyF7waa)cKxbd%dWVadJGvCFP*3c33z|Hd{()aVEe{0xi;tLM*8cR%w
zSC|a$mnzAhV`P2<B7GM)hUTBPS}2?FL&oQX1{bDC7cA-zJNo{(7Vmv;fY~zY%;!_j
zq`Z0fsq4nXT$6Ku@W7bl%YQ32XPC04aI03od2Cm~kP~<wpzUIW-Tqd{Q8L~f-N?I6
z`{5^v6w4IltmBqc@V3TD!ppS8fVGePOTPw$nmgNjdJD5OUpzG#nD=?Q*)xWvK@M53
zUgzjiWj$>gZv;<vi#HBF$Q5fxraui`woO{jI#tAl#|e_(ey<YSCEnMw18#;IKPJ6D
z)=$iSgx|ibi96j^;a6kd?fi6gOWod9SThba8WkOBBdii6(v#$g4Bo071R@pV&OM_V
znDjVUI&L*oD`9a<vV+2Q0&^}SpgbQs`#|Np6-dzQ(|eZ0dsE*|Jl$T%4(r28jDx>8
zL9?*zD@2&(`S;e?I%u`mL(Xr80Y$`Ql%R-ohuac(CBoB1)ccdvDCvAtqb5&q?00V^
zP`USHrRNCY9x?~eU}tjKl_@gfxc_l{TuZRI^;n!)QTd0x8{^kMlM-Jo;fhc|T#4iV
UmA2`Q?KuFOHpWKW3gb)u4>67Io&W#<

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/bookmark_edit.png b/share/keepass/icons/bookmark_edit.png
index d2f72dff121fbb2cb8b83657f944d22bdc5e1ec8..7e635267507ac9a13f8922f23e7a5cd980a2ec71 100644
GIT binary patch
delta 2326
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

delta 2608
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
SyrlmC0000<MNUMnLSTYeJul?|

diff --git a/share/keepass/icons/bookmark_this.png b/share/keepass/icons/bookmark_this.png
new file mode 100755
index 0000000000000000000000000000000000000000..758d9be2024ff4737f7a33df9b9fd26b010c4e82
GIT binary patch
literal 2373
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

literal 0
HcmV?d00001

diff --git a/src/Database.h b/src/Database.h
index a5c109d..d766a60 100644
--- a/src/Database.h
+++ b/src/Database.h
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
- 
+
 #ifndef _DATABASE_H_
 #define _DATABASE_H_
 
@@ -75,7 +75,7 @@ class KpxDateTime:public QDateTime{
 };
 
 //! Entry Data Structure
-/*! This class holds the data of a normal database entry. It is used by some interface functions to process predefined entries and can be used for internal data handling.*/ 
+/*! This class holds the data of a normal database entry. It is used by some interface functions to process predefined entries and can be used for internal data handling.*/
 class CEntry{
 public:
 	CEntry();
@@ -97,7 +97,7 @@ public:
 };
 
 //! Group Data Structure
-/*! This class holds the data of a normal database group. It is used by some interface functions to process predefined groups and can be used for internal data handling.*/ 
+/*! This class holds the data of a normal database group. It is used by some interface functions to process predefined groups and can be used for internal data handling.*/
 class CGroup{
 public:
 	CGroup();
@@ -147,15 +147,16 @@ public:
 	virtual KpxDateTime expire()=0;
 	virtual QByteArray binary()=0;
 	virtual quint32 binarySize()=0;
-	
+    virtual QString friendlySize()=0;
+
 	//! \return the index of the entry amongst the entries of its group. The index of the first entry is 0.
 	virtual int visualIndex()const=0;
-	
+
 	/*! Sets the visual index of an entry. The indices of all other entries in the same group get automaticly readjusted by this function.
 		\param index The new visual index.
 	*/
 	virtual void setVisualIndex(int index)=0;
-	
+
 	/*! Sets the visual index of an entry. The indices of all other entries in the same group need to be adjusted manually!
 		This function is optimal to avoid readjustion overhead when sorting items.
 		\param index The new visual index.
@@ -170,7 +171,7 @@ public:
 };
 
 //! Custom Icon Interface
-/*! 
+/*!
 This class provides an interface for the management of custom icons. The implementation is optional and not necessarily needed.
  */
 class ICustomIcons:public QObject{
@@ -180,12 +181,12 @@ class ICustomIcons:public QObject{
 		\param icon The pixmap which contains the new icon. This function makes a copy of the given pixmap.
 		 */
 		virtual void addIcon(const QPixmap& icon)=0;
-	
+
 		/*! Removes an icon.
 		\param index The index of the icon which should be removed. Built-in icons cannot be removed so make sure that index is not the index of an Built-in icon before calling this function.
-		 */ 
+		 */
 		virtual void removeIcon(int index)=0;
-	
+
 		/*! Replaces one icon with another one.
 		\param index The index of the icon which should be replaced. Built-in icons cannot be replaced so make sure that index is not the index of an Built-in icon before calling this function.
 		\param icon The pixmap which contains the new icon.
@@ -196,43 +197,43 @@ class ICustomIcons:public QObject{
 		That means it is emitted after every call off addIcon(), removeIcon() and replaceIcon().
 		 */
 		void iconsModified();
-		
+
 };
 
 
 //! Handle class interface for accessing groups
 /*!
-The IGroupHandle interface provides access to CGroup data structures without using direct references. Every entry handle class must implement this interface necessarily. 
+The IGroupHandle interface provides access to CGroup data structures without using direct references. Every entry handle class must implement this interface necessarily.
 */
 class IGroupHandle{
 public:
 	virtual void setTitle(const QString& Title)=0;
 	virtual void setImage(const quint32& ImageID)=0;
-	
+
 	virtual QString title()=0;
 	virtual quint32 image()=0;
-	
+
 	//! \return a pointer to the handle of the parent group or NULL if the group has no parent.
 	virtual IGroupHandle* parent()=0;
-	
+
 	//! \return a List of pointers to the handles of all childs of the group and an empty list if the group has no childs. The list is sorted and starts with the first child.
 	virtual QList<IGroupHandle*> childs()=0;
-	
+
 	//! \return the index of the group amongst the childs of its parent. The index of the first child is 0.
 	virtual int index()=0;
-	
+
 	/*! Sets the index of a group amongst the childs of its parent.
 		This function can be used to sort the groups of the database in a specific order.
 		\param index The new index of the group. The indices of the other groups which are affected by this operation will be automatically adjusted.*/
 	virtual void setIndex(int index)=0;
-	
+
 	/*! Tests the validity of the handle.
 		\return TRUE if the handle is valid and FALSE if the handle is invalid e.g. because the associated group was deleted.*/
 	virtual bool isValid()=0;
-	
+
 	/*! \return the level of the group in the group tree. This level is tantamount to the number of parents that the group has. */
 	virtual int level()=0;
-	
+
 	virtual bool expanded()=0;
 	virtual void setExpanded(bool)=0;
 
@@ -240,7 +241,7 @@ public:
 
 //! Common Database Interface.
 /*!
-This is the common base interface for databases. Every database class must implement this interface necessarily. 
+This is the common base interface for databases. Every database class must implement this interface necessarily.
 */
 class IDatabase:public QObject{
 public:
@@ -254,9 +255,9 @@ public:
 	virtual bool load(QString identifier)=0;
 
 	//! Saves the current database.
-   	/*! It is not allowed to call this function if no database is loaded. 
+   	/*! It is not allowed to call this function if no database is loaded.
 		\return TRUE if saving was successfull, otherwise FALSE.
-	*/		
+	*/
 	virtual bool save()=0;
 
 	//! Closes the current database.
@@ -264,33 +265,33 @@ public:
 		It is not allowed to call this function if no database is loaded.
 		Please note: The database will be closed without saving it in before.
 	 *  \return TRUE if closing was successfull, otherwise FALSE.
-	*/	
+	*/
 	virtual bool close()=0;
 
 	//! Creates a new database.
    	/*! It is not allowed to call this function if a database is already loaded.
 		\return TRUE if saving was successfull, otherwise FALSE.
-	*/		
+	*/
 	virtual void create()=0;
-	
-	
+
+
 	virtual bool changeFile(const QString& filename)=0;
-	
+
 	virtual QFile* file()=0;
 
 	//! \return a list with the pointers to the handles of all entries of the database. The list contains only valid handles. The list is not sorted.
 	virtual QList<IEntryHandle*> entries()=0;
-	
+
 	//! \param Group The group which contains the wanted entries.
 	//! \return a list of pointers to the handles of all entries which belong to the given group. The list contains only valid handles and is sorted in an ascending order regarding to the entry indices.
 	virtual QList<IEntryHandle*> entries(IGroupHandle* Group)=0;
-	
+
 	//! \return a list with the pointers to the handles of all expired entries of the database. The list contains only valid handles. The list is not sorted.
 	virtual QList<IEntryHandle*> expiredEntries()=0;
-		
+
 	//! \return a list with the pointers to the handles of all entries of the database. The list contains only valid handles and is not sorted.
 	virtual QList<IGroupHandle*> groups()=0;
-	
+
 	/*!
 		This function might be slower than groups() - denpending on the implementation.
 		\return a list with the pointers to the handles of all entries of the database. The list ist sorted and contains only valid handles.*/
@@ -298,7 +299,7 @@ public:
 
 
 	/*! \return the last error message or an empty QString() object if no error occured.*/
-	virtual QString getError()=0;	
+	virtual QString getError()=0;
 
 	/*! Creates a clone of a given entry.
 		All attributes besides the UUID are copied, even the creation date.
@@ -311,13 +312,13 @@ public:
 		\param entry The handle of the entry which should be deleted.
 	*/
 	virtual void deleteEntry(IEntryHandle* entry)=0;
-	
-	
+
+
 	/*! Deletes the last added entry.
 		This function should only be called immediately after an addEntry() call, otherwise the behavior is undefined. Immediately means that there are no other add/move/delete operations between the two function calls.*/
 	virtual void deleteLastEntry()=0;
-	
-	
+
+
 	/*! Deletes multiple given entries.
 		Calling this function can be faster then calling deleteEntry(..) several times - depending on the implementation.
 		Important: All entries must belong to the same group!
@@ -328,7 +329,7 @@ public:
 	/*! Creates a new blank entry.
 		\param Group The group to which the entry should be added.
 		\return the handle of the new entry.
-	*/ 
+	*/
  	virtual IEntryHandle* newEntry(IGroupHandle* Group)=0;
 
 	/*! Adds a Entry object to the database.
@@ -337,7 +338,7 @@ public:
 		\return a pointer to the handle of the added entry.
 	*/
 	virtual IEntryHandle* addEntry(const CEntry* NewEntry, IGroupHandle* Group)=0;
-	
+
 	/*! Moves an entry to another group.
 		\param entry The entry which should be moved.
 		\param group The new group of the entry.*/
@@ -348,25 +349,25 @@ public:
 		Deletes the group, all it's entries and child groups and their entries as well.
 		\param group The group which should be deleted.*/
 	virtual void deleteGroup(IGroupHandle* group)=0;
-	
+
 	/*! Adds a group to the database.
 		\param Group A pointer to a CGroup object. Id and ParentId of the object are ignored.
 		\param Parent A pointer to the handle of parent of the group. Can be NULL if the group is a top-level group.
 		\return a pointer to the handle of the added group.*/
 	virtual IGroupHandle* addGroup(const CGroup* Group,IGroupHandle* Parent)=0;
-	
+
 	/*! Moves a group.
 		\param Group The group which should be moved.
 		\param NewParent The new parent of the group.
 		\param Position The position of the group amongst it's new siblings. If Position is 0 the group will be prepended if it is -1 the group will be appended.*/
 	virtual void moveGroup(IGroupHandle* Group,IGroupHandle* NewParent,int Position)=0;
-	
+
 	/*! Checks two given groups if one is the parent of the other.
 		\param Child The child group.
 		\param Parent The parent group.
 		\return TRUE if Parent is the parent of child, otherwise FALSE.*/
 	virtual bool isParent(IGroupHandle* parent, IGroupHandle* child)=0;
-	
+
 	/*! \param index Index of the requested icon.
 		\return a reference to the pixmap of the requested icon.
 	*/
@@ -377,18 +378,18 @@ public:
 	/*! Deletes all old invalid handles of the database.
 		Make sure that there are no pointers to those handles which are still in use before calling this function.*/
 	virtual void cleanUpHandles()=0;
-	
+
 	/*! \return the number of groups in the database.*/
 	virtual int numGroups()=0;
-	
+
 	/*! \return the number of entires in the database.*/
-	virtual int numEntries()=0;	
-	
+	virtual int numEntries()=0;
+
 	/*! \return the number of built-in icons of the database. Each database must contain at least one built-in icon. */
 	virtual int builtinIcons()=0;
-	
+
 	/*! Searches in the database for a string or regular expression.
-		\param Group The group where the search should be performed in. If Group is NULL the search will be performed in the whole database. 
+		\param Group The group where the search should be performed in. If Group is NULL the search will be performed in the whole database.
 		\param SearchString The searched string or a regular expression.
 		\param CaseSensitvie If this parameter is true the search will be case sensitive.
 		\param RegExp The SearchString parameter will be handled as regular expression if this parameter is true.
@@ -396,16 +397,16 @@ public:
 		\param Fields A pointer to a six element bool array. It defines which fields are included into the search. The order is: title, username, url, password, comment, attachment description. The pointer can also be NULL, than the default pattern is used instead.
 		\return the search results as a list of pointers to the entry handles.*/
 	virtual QList<IEntryHandle*> search(IGroupHandle* Group,const QString& SearchString, bool CaseSensitve, bool RegExp,bool Recursive,bool* Fields)=0;
-	
+
 	//! Moves an entry to the recycle bin.
 	virtual void moveToTrash(IEntryHandle* entry)=0;
-	
+
 	//! \returns all entries of the recycle bin.
 	virtual QList<IEntryHandle*> trashEntries()=0;
-	
+
 	//! Empty the recycle bin.
 	virtual void emptyTrash()=0;
-	
+
 };
 
 
@@ -430,7 +431,7 @@ class IKdbSettings{
 		virtual void setCryptAlgorithm(CryptAlgorithm algo)=0;
 		virtual CryptAlgorithm cryptAlgorithm()=0;
 		virtual unsigned int keyTransfRounds()=0;
-		virtual void setKeyTransfRounds(unsigned int rounds)=0;	
+		virtual void setKeyTransfRounds(unsigned int rounds)=0;
 };
 
 #endif
diff --git a/src/Kdb3Database.cpp b/src/Kdb3Database.cpp
index 2062af4..9cf254e 100644
--- a/src/Kdb3Database.cpp
+++ b/src/Kdb3Database.cpp
@@ -843,7 +843,7 @@ QList<IEntryHandle*> Kdb3Database::entries(IGroupHandle* group){
 			handles.append(&EntryHandles[i]);
 	}
 	qSort(handles.begin(),handles.end(),EntryHandleLessThan);
-	
+
 	return handles;
 }
 
@@ -962,6 +962,43 @@ KpxDateTime	Kdb3Database::EntryHandle::lastAccess(){return Entry->LastAccess;}
 KpxDateTime	Kdb3Database::EntryHandle::expire(){return Entry->Expire;}
 QByteArray Kdb3Database::EntryHandle::binary(){return Entry->Binary;}
 quint32 Kdb3Database::EntryHandle::binarySize(){return Entry->Binary.size();}
+
+QString Kdb3Database::EntryHandle::friendlySize()
+{
+    quint32 binsize = binarySize();
+    QString unit;
+    uint    faktor;
+    int     prec;
+
+    if (binsize < 1024)
+    {
+        unit = tr("Bytes");
+        faktor = 1;
+        prec = 0;
+    }
+    else
+    {
+        if (binsize < 1048576)
+        {
+            unit = tr("KiB");
+            faktor = 1024;
+        }
+        else
+            if (binsize < 1073741824)
+            {
+                unit = tr("MiB");
+                faktor = 1048576;
+            }
+            else
+            {
+                unit = tr("GiB");
+                faktor = 1073741824;
+            }
+        prec = 1;
+    }
+    return (QString::number((float)binsize / (float)faktor, 'f', prec) + " " + unit);
+}
+
 int Kdb3Database::EntryHandle::visualIndex()const{return Entry->Index;}
 void Kdb3Database::EntryHandle::setVisualIndexDirectly(int i){Entry->Index=i;}
 bool Kdb3Database::EntryHandle::isValid()const{return valid;}
@@ -1637,7 +1674,7 @@ bool Kdb3Database::createKeyFile(const QString& filename,int length, bool Hex){
 
 
 void Kdb3Database::moveGroup(IGroupHandle* groupHandle,IGroupHandle* NewParent,int Pos){
-	StdGroup* Parent;	
+	StdGroup* Parent;
 	StdGroup* Group=((GroupHandle*)groupHandle)->Group;
 	if(NewParent)
 		Parent=((GroupHandle*)NewParent)->Group;
@@ -1686,7 +1723,7 @@ void Kdb3Database::moveToTrash(IEntryHandle* entry){
 	TrashEntries.append(trash);
 	TrashHandles.append(EntryHandle(this));
 	TrashHandles.back().Entry=&TrashEntries.back();
-	TrashEntries.back().Handle=&TrashHandles.back();	
+	TrashEntries.back().Handle=&TrashHandles.back();
 }
 
 void Kdb3Database::emptyTrash(){
diff --git a/src/Kdb3Database.h b/src/Kdb3Database.h
index f2154d9..8e3e29c 100644
--- a/src/Kdb3Database.h
+++ b/src/Kdb3Database.h
@@ -16,7 +16,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
- 
+
 #ifndef _STD_DATABASE_H_
 #define _STD_DATABASE_H_
 
@@ -55,7 +55,7 @@ public:
 	class StdGroup;
 	class StdEntry;
 	class EntryHandle:public IEntryHandle{
-		
+
 		friend class Kdb3Database;
 		public:
 			EntryHandle(Kdb3Database* db);
@@ -91,6 +91,7 @@ public:
 			virtual KpxDateTime expire();
 			virtual QByteArray binary();
 			virtual quint32 binarySize();
+            virtual QString friendlySize();
 			virtual bool isValid() const;
 		private:
 			void invalidate(){valid=false;}
@@ -99,14 +100,14 @@ public:
 			Kdb3Database* pDB;
 			StdEntry* Entry;
 	};
-	
+
 	class GroupHandle:public IGroupHandle{
 		friend class Kdb3Database;
 		GroupHandle(Kdb3Database* db);
 		public:
 			virtual void setTitle(const QString& Title);
 			virtual void setImage(const quint32& ImageId);
-			void setOldImage(const quint32& ImageId);	
+			void setOldImage(const quint32& ImageId);
 			virtual QString title();
 			virtual quint32 image();
 			quint32 oldImage();
@@ -124,10 +125,10 @@ public:
 			StdGroup* Group;
 			Kdb3Database* pDB;
 	};
-	
+
 	friend class EntryHandle;
 	friend class GroupHandle;
-	
+
 	class StdEntry:public CEntry{
 		public:
 				quint32 OldImage;
@@ -135,7 +136,7 @@ public:
 				EntryHandle* Handle;
 				StdGroup* Group;
 	};
-	
+
 	class StdGroup:public CGroup{
 		public:
 			StdGroup():CGroup(){};
@@ -147,12 +148,12 @@ public:
 			QList<StdGroup*> Childs;
 			QList<StdEntry*> Entries;
 	};
-	
+
 	class TrashEntry: public StdEntry{
 		public:
-			QStringList GroupPath;					
+			QStringList GroupPath;
 	};
-	
+
 	virtual ~Kdb3Database(){};
 	virtual bool load(QString identifier);
 	virtual bool save();
@@ -179,12 +180,12 @@ public:
 	virtual void setCryptAlgorithm(CryptAlgorithm algo){Algorithm=algo;}
 	virtual CryptAlgorithm cryptAlgorithm(){return Algorithm;}
 	virtual unsigned int keyTransfRounds(){return KeyTransfRounds;}
-	virtual void setKeyTransfRounds(unsigned int rounds){KeyTransfRounds=rounds;}	
-	
+	virtual void setKeyTransfRounds(unsigned int rounds){KeyTransfRounds=rounds;}
+
 	virtual QList<IEntryHandle*> entries();
 	virtual QList<IEntryHandle*> entries(IGroupHandle* Group);
 	virtual QList<IEntryHandle*> expiredEntries();
-		
+
 	virtual IEntryHandle* cloneEntry(const IEntryHandle* entry);
 	virtual void deleteEntry(IEntryHandle* entry);
 	virtual void deleteEntries(QList<IEntryHandle*> entries);
@@ -196,7 +197,7 @@ public:
 	virtual QList<IEntryHandle*> trashEntries();
 	virtual void emptyTrash();
 
-	
+
 	virtual QList<IGroupHandle*> groups();
 	virtual QList<IGroupHandle*> sortedGroups();
 	virtual void deleteGroup(IGroupHandle* group);
@@ -204,9 +205,9 @@ public:
 	virtual IGroupHandle* addGroup(const CGroup* Group,IGroupHandle* Parent);
 	virtual bool isParent(IGroupHandle* parent, IGroupHandle* child);
 
-	
 
-	
+
+
 private:
 	QDateTime dateFromPackedStruct5(const unsigned char* pBytes);
 	void dateToPackedStruct5(const QDateTime& datetime, unsigned char* dst);
@@ -239,7 +240,7 @@ private:
 	StdEntry* getEntry(EntryHandle* handle);
 	int getEntryListIndex(EntryHandle* handle);
 	EntryHandle* getHandle(StdEntry* entry);
-	
+
 	StdGroup* getGroup(quint32 Id);
 	void deleteGroup(StdGroup* group);
 
diff --git a/src/dialogs/AboutDlg.cpp b/src/dialogs/AboutDlg.cpp
index 95be523..9fbb016 100755
--- a/src/dialogs/AboutDlg.cpp
+++ b/src/dialogs/AboutDlg.cpp
@@ -18,20 +18,20 @@
  ***************************************************************************/
 
 #include <qmessagebox.h>
-#include <qlabel.h>
-#include <qdialog.h>
-#include <qfile.h>
 #include <QPainter>
 
-#include "main.h"
 #include "AboutDlg.h"
 
+
 AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
 {
 	setupUi(this);
-	createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("KeePassX %1").arg(KEEPASS_VERSION),width());
+	createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION),width());
 	loadLicFromFile();
 
+    labelAppName->setText(tr(APP_DISPLAY_NAME));
+    labelAppFunc->setText(tr(" -  %1").arg(APP_LONG_FUNC));
+
 	QString AboutTr=tr("<b>Current Translation: None</b><br><br>","Please replace 'None' with the language of your translation");
 	if(TrActive){
 		AboutTr+=tr("<b>Author:</b> %1<br>").arg(tr("$TRANSLATION_AUTHOR"));
@@ -51,9 +51,9 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
 	str+="<br>";
 	str+="<u>"+tr("Eugen Gorschenin")+"</u><br>"+tr("Web Designer")+"<br>"+tr("geugen@users.sf.de")+"<br>";
 	str+="<br>";
-	str+="<u>"+tr("Jota Jota")+"</u><br>"+tr("Developer")+"<br>"+tr("myxself@users.sf.de")+"<br>";
+	str+="<u>"+tr("Juan J Gonz&aacute;lez C&aacute;rdenas [Jota Jota]")+"</u><br>"+tr("Developer")+"<br>"+tr("myxelf@users.sf.net")+"<br>";
 	str+="</div><br><div style='margin-left:0px;'>";
-	str+="<b>"+tr("Thanks To")+"</b>";
+    str+="<b>"+tr("Thanks To")+"</b><br>";
 	str+="</div><div style='margin-left:10px;'>";
 	str+="<u>"+tr("Matthias Miller")+"</u><br>"+tr("Patches for better MacOS X support")+"<br>"+tr("www.outofhanwell.com")+"<br></div>";
 	str+="<br>";
diff --git a/src/dialogs/AboutDlg.h b/src/dialogs/AboutDlg.h
index bd96c1e..4ef153b 100755
--- a/src/dialogs/AboutDlg.h
+++ b/src/dialogs/AboutDlg.h
@@ -21,9 +21,9 @@
 #define _ABOUTDIALOG_H_
 
 #include <QPaintEvent>
-#include <QPixmap>
 #include "ui_AboutDlg.h"
 #include "lib/UrlLabel.h"
+
 #include "main.h"
 
 
@@ -42,7 +42,7 @@ public slots:
 private:
 	QPixmap BannerPixmap;
 	inline void loadLicFromFile();
-	virtual void paintEvent(QPaintEvent*); 
+	virtual void paintEvent(QPaintEvent*);
 };
 
 #endif
diff --git a/src/dialogs/AddBookmarkDlg.cpp b/src/dialogs/AddBookmarkDlg.cpp
index 3238e55..4bc797e 100644
--- a/src/dialogs/AddBookmarkDlg.cpp
+++ b/src/dialogs/AddBookmarkDlg.cpp
@@ -18,10 +18,13 @@
  ***************************************************************************/
 
 #include <QFileInfo>
-#include "AddBookmarkDlg.h"
+#include <QPainter>
 #include "lib/FileDialogs.h"
 #include "lib/bookmarks.h"
 
+#include "AddBookmarkDlg.h"
+
+
 AddBookmarkDlg::AddBookmarkDlg(QWidget* parent, QString DefaultFilename, int _ItemID):QDialog(parent)
 {
 	setupUi(this);
@@ -30,18 +33,29 @@ AddBookmarkDlg::AddBookmarkDlg(QWidget* parent, QString DefaultFilename, int _It
 	connect(buttonBox->button(QDialogButtonBox::Ok),SIGNAL(clicked()),this,SLOT(OnButtonOk()));
 	connect(buttonBox->button(QDialogButtonBox::Cancel),SIGNAL(clicked()),this,SLOT(reject()));
 	if(ItemID==-1){
+        createBanner(&BannerPixmap,getPixmap("bookmark_add"),tr("Add Bookmark"),width());
+
 		if(DefaultFilename==QString())
 			OnButtonBrowse();
 		else
 			Edit_Filename->setText(DefaultFilename);
 	}
 	else {
-		Edit_Title->setText(KpxBookmarks::title(ItemID));
+        createBanner(&BannerPixmap,getPixmap("bookmark_edit"),tr("Edit Bookmark"),width());
+
+        Edit_Title->setText(KpxBookmarks::title(ItemID));
 		Edit_Filename->setText(KpxBookmarks::path(ItemID));
 		setWindowTitle(tr("Edit Bookmark"));
 	}
 }
 
+void AddBookmarkDlg::paintEvent(QPaintEvent *event){
+    QDialog::paintEvent(event);
+    QPainter painter(this);
+    painter.setClipRegion(event->region());
+    painter.drawPixmap(QPoint(0,0),BannerPixmap);
+}
+
 void AddBookmarkDlg::OnButtonBrowse(){
 	QString path=KpxFileDialogs::openExistingFile(this,"AddBookmarkDlg", tr("Add Bookmark"),
 									              QStringList() << tr("KeePass Databases (*.kdb)") << tr("All Files (*)"));
@@ -54,5 +68,5 @@ void AddBookmarkDlg::OnButtonOk(){
 		ItemID=KpxBookmarks::add(Edit_Title->text(),Edit_Filename->text());
 	else
 		KpxBookmarks::edit(Edit_Title->text(),Edit_Filename->text(),ItemID);
-	accept();	
+	accept();
 }
\ No newline at end of file
diff --git a/src/dialogs/AddBookmarkDlg.h b/src/dialogs/AddBookmarkDlg.h
index 363ace2..d7f2541 100644
--- a/src/dialogs/AddBookmarkDlg.h
+++ b/src/dialogs/AddBookmarkDlg.h
@@ -21,8 +21,11 @@
 #define _ADDBOOKMARKDLG_H_
 
 #include <QDialog>
+#include <QPaintEvent>
 #include "ui_AddBookmarkDlg.h"
 
+#include "main.h"
+
 class AddBookmarkDlg : public QDialog, private Ui::AddBookmarkDlg
 {
 	Q_OBJECT
@@ -30,11 +33,15 @@ class AddBookmarkDlg : public QDialog, private Ui::AddBookmarkDlg
 	public:
 		AddBookmarkDlg (QWidget* parent=0, QString DefaultFilename=QString(), int ItemID=-1);
 		int ItemID;
-	
-	private slots:
+
+    private:
+        QPixmap BannerPixmap;
+        virtual void paintEvent(QPaintEvent*);
+
+    private slots:
 		void OnButtonOk();
 		void OnButtonBrowse();
-	
+
 };
 
 #endif
diff --git a/src/dialogs/CollectEntropyDlg.cpp b/src/dialogs/CollectEntropyDlg.cpp
index f64aa3e..841f243 100644
--- a/src/dialogs/CollectEntropyDlg.cpp
+++ b/src/dialogs/CollectEntropyDlg.cpp
@@ -21,8 +21,9 @@
 #include <QPainter>
 #include <QCursor>
 #include "crypto/yarrow.h"
+
 #include "CollectEntropyDlg.h"
-#include "main.h"
+
 
 CollectEntropyDlg::CollectEntropyDlg(QWidget* parent):QDialog(parent){
 	setupUi(this);
@@ -81,12 +82,12 @@ void CollectEntropyDlg::updateProgress(){
 		stackedWidget->setCurrentIndex(1);
 	}
 	else
-		progressBar->setValue(4*KeyCounter+4*MouseCounter);	
-	
+		progressBar->setValue(4*KeyCounter+4*MouseCounter);
+
 }
 
 void CollectEntropyDlg::showEvent(QShowEvent* event){
 	if(!event->spontaneous()){
-		Animation->start();	
-	}	
+		Animation->start();
+	}
 }
diff --git a/src/dialogs/CollectEntropyDlg.h b/src/dialogs/CollectEntropyDlg.h
index c68b9cb..e2c5cbb 100644
--- a/src/dialogs/CollectEntropyDlg.h
+++ b/src/dialogs/CollectEntropyDlg.h
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-  
+
 #ifndef _COLLECT_ENTROPY_DLG_H_
 #define _COLLECT_ENTROPY_DLG_H_
 
@@ -26,12 +26,15 @@
 #include <QPaintEvent>
 #include <QShowEvent>
 
+#include "main.h"
+
+
 class CollectEntropyDlg: public QDialog, public Ui_CollectEntropyDlg{
 	Q_OBJECT
 	public:
 		CollectEntropyDlg(QWidget* parent);
 		~CollectEntropyDlg();
-		
+
 	private:
 		QPixmap BannerPixmap;
 		virtual void paintEvent(QPaintEvent* event);
diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 75aefc3..61201ee 100755
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -131,16 +131,9 @@ CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* paren
 		ButtonDeleteAttachment->setDisabled(true);
 		Label_AttachmentSize->setText("");
 	}
-	else{
-		QString unit;
-		int faktor;
-		int prec;
-		if(entry->binarySize()<1000){unit=" Byte";faktor=1;prec=0;}
-		else
-			if(entry->binarySize()<1000000){unit=" kB";faktor=1000;prec=1;}
-		else{unit=" MB";faktor=1000000;prec=1;}
-		Label_AttachmentSize->setText(QString::number((float)entry->binarySize()/(float)faktor,'f',prec)+unit);
-	}
+	else
+        Label_AttachmentSize->setText(entry->friendlySize());
+
 	if(entry->expire()==Date_Never){
 		DateTime_Expire->setDisabled(true);
 		CheckBox_ExpiresNever->setChecked(true);
@@ -344,36 +337,7 @@ void CEditEntryDlg::OnNewAttachment()
 	QFileInfo info(filename);
 	entry->setBinaryDesc(info.fileName());
 	Edit_Attachment->setText(entry->binaryDesc());
-	QString unit;
-	uint faktor;
-	int prec;
-	if (entry->binarySize() < 1024)
-    {
-        unit = tr("Bytes");
-        faktor = 1;
-        prec = 0;
-    }
-    else
-    {
-        if (entry->binarySize() < pow(2,20))
-        {
-            unit = tr("kiB");
-            faktor = 1024;
-        }
-        else
-            if (entry->binarySize() < pow(2,30))
-            {
-                unit = tr("MiB");
-                faktor = pow(2,20);
-            }
-            else
-            {
-                unit = tr("GiB");
-                faktor = pow(2,30);
-            }
-        prec = 1;
-    }
-	Label_AttachmentSize->setText(QString::number((float)entry->binarySize()/(float)faktor,'f',prec) + " " + unit);
+	Label_AttachmentSize->setText(entry->friendlySize());
 	ButtonOpenAttachment->setEnabled(true);
 	ButtonSaveAttachment->setEnabled(true);
 	ButtonDeleteAttachment->setEnabled(true);
diff --git a/src/dialogs/ManageBookmarksDlg.cpp b/src/dialogs/ManageBookmarksDlg.cpp
index c1045b0..d132371 100644
--- a/src/dialogs/ManageBookmarksDlg.cpp
+++ b/src/dialogs/ManageBookmarksDlg.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <QListWidget>
-#include "main.h"
+#include <QPainter>
 #include "ManageBookmarksDlg.h"
 #include "lib/bookmarks.h"
 #include "dialogs/AddBookmarkDlg.h"
@@ -26,24 +26,65 @@
 ManageBookmarksDlg::ManageBookmarksDlg(QWidget* parent):QDialog(parent)
 {
 	setupUi(this);
+    createBanner(&BannerPixmap,getPixmap("bookmark"),tr("Manage Bookmarks"),width());
+
 	for(int i=0;i<KpxBookmarks::count();i++){
 		QListWidgetItem* item=new QListWidgetItem(ListWidget);
 		item->setData(Qt::UserRole,i);
-		item->setText(KpxBookmarks::title(i));	
+		item->setText(KpxBookmarks::title(i));
 	}
-	connect(Button_Up,SIGNAL(clicked()),this,SLOT(OnButtonUp()));
+    connect(Button_Add,SIGNAL(clicked()),this,SLOT(OnButtonAdd()));
+    connect(Button_Edit,SIGNAL(clicked()),this,SLOT(OnButtonEdit()));
+    connect(Button_Delete,SIGNAL(clicked()),this,SLOT(OnButtonDelete()));
+    connect(Button_Up,SIGNAL(clicked()),this,SLOT(OnButtonUp()));
 	connect(Button_Down,SIGNAL(clicked()),this,SLOT(OnButtonDown()));
-	connect(Button_Delete,SIGNAL(clicked()),this,SLOT(OnButtonDelete()));
-	connect(Button_Add,SIGNAL(clicked()),this,SLOT(OnButtonAdd()));
-	connect(Button_Edit,SIGNAL(clicked()),this,SLOT(OnButtonEdit()));
 	connect(ListWidget,SIGNAL(itemDoubleClicked(QListWidgetItem*)),this,SLOT(edit(QListWidgetItem*)));
 	connect(buttonBox->button(QDialogButtonBox::Close),SIGNAL(clicked()),this,SLOT(close()));
-	
-	Button_Up->setIcon(getIcon("up"));
-	Button_Down->setIcon(getIcon("down"));
-	Button_Delete->setIcon(getIcon("delete"));
+
+    Button_Add->setIcon(getIcon("bookmark_add"));
 	Button_Edit->setIcon(getIcon("bookmark_edit"));
-	Button_Add->setIcon(getIcon("bookmark_add"));
+    Button_Delete->setIcon(getIcon("bookmark_del"));
+    Button_Up->setIcon(getIcon("up"));
+    Button_Down->setIcon(getIcon("down"));
+}
+
+void ManageBookmarksDlg::paintEvent(QPaintEvent *event){
+    QDialog::paintEvent(event);
+    QPainter painter(this);
+    painter.setClipRegion(event->region());
+    painter.drawPixmap(QPoint(0,0),BannerPixmap);
+}
+
+
+
+void ManageBookmarksDlg::OnButtonAdd(){
+    AddBookmarkDlg dlg(this);
+    if(dlg.exec()){
+        int i=dlg.ItemID;
+        QListWidgetItem* item=new QListWidgetItem(ListWidget);
+        item->setData(Qt::UserRole,i);
+        item->setText(KpxBookmarks::title(i));
+    }
+    return;
+}
+
+void ManageBookmarksDlg::OnButtonEdit(){
+    QListWidgetItem* item=ListWidget->currentItem();
+    if(!item)return;
+    edit(item);
+}
+
+void ManageBookmarksDlg::OnButtonDelete(){
+    QListWidgetItem* item=ListWidget->currentItem();
+    if(!item)return;
+    int index=item->data(Qt::UserRole).toInt();
+    KpxBookmarks::remove(index);
+    delete item;
+    for(int i=0;i<ListWidget->count();i++){
+        int itemindex=ListWidget->item(i)->data(Qt::UserRole).toInt();
+        if(itemindex>index)
+            ListWidget->item(i)->setData(Qt::UserRole,itemindex-1);
+    }
 }
 
 
@@ -66,44 +107,17 @@ void ManageBookmarksDlg::OnButtonDown(){
 	ListWidget->insertItem(row,item);
 	ListWidget->setCurrentRow(row);
 }
-		
-void ManageBookmarksDlg::OnButtonDelete(){
-	QListWidgetItem* item=ListWidget->currentItem();
-	if(!item)return;
-	int index=item->data(Qt::UserRole).toInt();
-	KpxBookmarks::remove(index);
-	delete item;
-	for(int i=0;i<ListWidget->count();i++){
-		int itemindex=ListWidget->item(i)->data(Qt::UserRole).toInt();
-		if(itemindex>index)
-			ListWidget->item(i)->setData(Qt::UserRole,itemindex-1);
-	}
-}
 
-void ManageBookmarksDlg::OnButtonEdit(){
-	QListWidgetItem* item=ListWidget->currentItem();
-	if(!item)return;
-	edit(item);	
-}
+
 
 void ManageBookmarksDlg::edit(QListWidgetItem* item){
 	int i=item->data(Qt::UserRole).toInt();
 	AddBookmarkDlg dlg(this,QString(),i);
-	dlg.exec();	
-	item->setText(KpxBookmarks::title(i));	
+	dlg.exec();
+	item->setText(KpxBookmarks::title(i));
 }
 
 
-void ManageBookmarksDlg::OnButtonAdd(){
-		AddBookmarkDlg dlg(this);
-		if(dlg.exec()){
-			int i=dlg.ItemID;
-			QListWidgetItem* item=new QListWidgetItem(ListWidget);
-			item->setData(Qt::UserRole,i);
-			item->setText(KpxBookmarks::title(i));	
-		}
-		return;
-}
 
 void ManageBookmarksDlg::closeEvent(QCloseEvent * event){
 	QList<int> Order;
@@ -112,6 +126,6 @@ void ManageBookmarksDlg::closeEvent(QCloseEvent * event){
 	for(int i=0;i<KpxBookmarks::count();i++){
 		Order<<ListWidget->item(i)->data(Qt::UserRole).toInt();
 	}
-	KpxBookmarks::resort(Order);	
+	KpxBookmarks::resort(Order);
 	event->accept();
 }
\ No newline at end of file
diff --git a/src/dialogs/ManageBookmarksDlg.h b/src/dialogs/ManageBookmarksDlg.h
index 4501a5c..25ac7ce 100644
--- a/src/dialogs/ManageBookmarksDlg.h
+++ b/src/dialogs/ManageBookmarksDlg.h
@@ -22,21 +22,26 @@
 
 #include <QDialog>
 #include <QCloseEvent>
+#include <QPaintEvent>
 #include "ui_ManageBookmarksDlg.h"
 
+#include "main.h"
+
 class ManageBookmarksDlg : public QDialog, private Ui::ManageBookmarksDlg
 {
   	Q_OBJECT
 	public:
 		ManageBookmarksDlg(QWidget* parent=0);
 	private:
+        QPixmap BannerPixmap;
+        virtual void paintEvent(QPaintEvent*);
 		virtual void closeEvent(QCloseEvent* event);
 	private slots:
-		void OnButtonUp();
+        void OnButtonAdd();
+        void OnButtonEdit();
+        void OnButtonDelete();
+        void OnButtonUp();
 		void OnButtonDown();
-		void OnButtonDelete();
-		void OnButtonAdd();
-		void OnButtonEdit();
 		void edit(QListWidgetItem*);
 };
 
diff --git a/src/forms/AboutDlg.ui b/src/forms/AboutDlg.ui
index 2883a64..3bc6bf6 100644
--- a/src/forms/AboutDlg.ui
+++ b/src/forms/AboutDlg.ui
@@ -88,11 +88,49 @@
         <number>9</number>
        </property>
        <item>
-        <widget class="QLabel" name="label" >
-         <property name="text" >
-          <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:12pt; font-weight:600;">KeePassX&lt;/span> - Cross Platform Password Manager&lt;/p>&lt;/body>&lt;/html></string>
-         </property>
-        </widget>
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="labelAppName" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font" >
+            <font>
+             <pointsize>12</pointsize>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text" >
+            <string>AppName</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="labelAppFunc" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font" >
+            <font>
+             <pointsize>9</pointsize>
+            </font>
+           </property>
+           <property name="text" >
+            <string>AppFunc</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" >
diff --git a/src/forms/AddBookmarkDlg.ui b/src/forms/AddBookmarkDlg.ui
index e2897f6..7bc7594 100644
--- a/src/forms/AddBookmarkDlg.ui
+++ b/src/forms/AddBookmarkDlg.ui
@@ -1,18 +1,53 @@
 <ui version="4.0" >
+ <author>Tarek Saidi</author>
  <class>AddBookmarkDlg</class>
  <widget class="QWidget" name="AddBookmarkDlg" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>497</width>
-    <height>148</height>
+    <width>500</width>
+    <height>180</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize" >
+   <size>
+    <width>500</width>
+    <height>180</height>
+   </size>
+  </property>
+  <property name="maximumSize" >
+   <size>
+    <width>500</width>
+    <height>180</height>
+   </size>
+  </property>
   <property name="windowTitle" >
    <string>Add Bookmark</string>
   </property>
   <layout class="QVBoxLayout" >
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>50</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <layout class="QGridLayout" >
      <item row="0" column="0" >
@@ -44,6 +79,13 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="Line" name="line" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="standardButtons" >
@@ -53,6 +95,7 @@
    </item>
   </layout>
  </widget>
+ <includes/>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui
index 9871057..4b9c64c 100644
--- a/src/forms/MainWindow.ui
+++ b/src/forms/MainWindow.ui
@@ -285,7 +285,7 @@
   </action>
   <action name="FileExitAction" >
    <property name="text" >
-    <string>E&amp;xit</string>
+    <string>Q&amp;uit</string>
    </property>
   </action>
   <action name="EditNewGroupAction" >
diff --git a/src/forms/ManageBookmarksDlg.ui b/src/forms/ManageBookmarksDlg.ui
index fa81c67..1c45508 100644
--- a/src/forms/ManageBookmarksDlg.ui
+++ b/src/forms/ManageBookmarksDlg.ui
@@ -5,14 +5,36 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>452</width>
+    <width>280</width>
     <height>360</height>
    </rect>
   </property>
+  <property name="minimumSize" >
+   <size>
+    <width>280</width>
+    <height>300</height>
+   </size>
+  </property>
   <property name="windowTitle" >
    <string>Manage Bookmarks</string>
   </property>
   <layout class="QVBoxLayout" >
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>50</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <layout class="QHBoxLayout" >
      <item>
@@ -21,19 +43,70 @@
      <item>
       <layout class="QVBoxLayout" >
        <item>
-        <widget class="QToolButton" name="Button_Add" />
+        <widget class="QToolButton" name="Button_Add" >
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="Button_Delete" />
+        <widget class="QToolButton" name="Button_Edit" >
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="Button_Edit" />
+        <widget class="QToolButton" name="Button_Delete" >
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="Button_Up" />
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>10</height>
+          </size>
+         </property>
+        </spacer>
        </item>
        <item>
-        <widget class="QToolButton" name="Button_Down" />
+        <widget class="QToolButton" name="Button_Up" >
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="Button_Down" >
+         <property name="iconSize" >
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
        </item>
        <item>
         <spacer>
diff --git a/src/main.cpp b/src/main.cpp
index 3be4dcd..ff2dd5c 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -93,9 +93,9 @@ void test_getAllWindowTitles(){
 			qDebug("%i %i: %s",i,p,XGetAtomName(pDisplay,atom[p]));
 		}
 		XFree(atom);
-		
+
 	}
-	#endif	
+	#endif
 }
 
 int main(int argc, char **_argv)
@@ -138,12 +138,12 @@ int main(int argc, char **_argv)
 				qWarning("Could not load desktop integration plugin:");
 				qWarning(CSTR(PluginLoadError));
 			}
-			else{	
+			else{
 				QObject *plugininstance=plugin.instance();
 				IFileDialog* fdlg=qobject_cast<IFileDialog*>(plugininstance);
 				IconLoader=qobject_cast<IIconTheme*>(plugininstance);
 				if(IconLoader==NULL){
-					qWarning("Error: Integration Plugin: Could not initialize IconTheme interface."); 
+					qWarning("Error: Integration Plugin: Could not initialize IconTheme interface.");
 				}
 				KpxFileDialogs::setPlugin(fdlg);
 				if(config->integrPlugin()==KpxConfig::KDE){
@@ -365,7 +365,7 @@ const QIcon& getIcon(const QString& name){
 		NewIcon=new QIcon(IconLoader->getIcon(name));
 		if(NewIcon->isNull()){
 			delete NewIcon;
-			NewIcon=NULL;	
+			NewIcon=NULL;
 		}
 		else
 			IconCache.insert(name,NewIcon);
@@ -379,7 +379,7 @@ const QIcon& getIcon(const QString& name){
 		}
 		NewIcon=new QIcon(AppDir+"/../share/keepass/icons/"+name+".png");
 		IconCache.insert(name,NewIcon);
-	} 
+	}
 	return *NewIcon;
 }
 
@@ -423,7 +423,7 @@ int i=1;
 		i++; }
 	for(i; i<argc;i++){
 		if(QString(argv[i])=="-help"){
-			cout << "KeePassX" << KEEPASS_VERSION << endl;
+			cout << "KeePassX" << APP_VERSION << endl;
 			cout << "Usage: keepass [Filename] [Options]" << endl;
 			cout << "  -help             This Help" << endl;
 			cout << "  -cfg <CONFIG>     Use specified file for loading/saving the configuration." << endl;
@@ -485,7 +485,7 @@ QString makePathRelative(const QString& AbsDir,const QString& CurDir){
 
 QString applicationDirPath(){
 	QString filepath=applicationFilePath();
-	filepath.truncate(filepath.lastIndexOf("/"));	
+	filepath.truncate(filepath.lastIndexOf("/"));
 	return filepath;
 }
 
diff --git a/src/main.h b/src/main.h
index b66d943..8475a51 100644
--- a/src/main.h
+++ b/src/main.h
@@ -16,7 +16,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
- 
+
 #ifndef _MAIN_H_
 #define _MAIN_H_
 
@@ -27,9 +27,14 @@
 #include <QIcon>
 #include <QFile>
 
-#define APP_NAME "KeePassX"
-#define APP_FUNC "Password Manager"
-#define KEEPASS_VERSION "0.2.3"
+#define APP_DISPLAY_NAME    "KeePassX"
+#define APP_CODE_NAME       "keepassx"
+
+#define APP_SHORT_FUNC      "Password Manager"
+#define APP_LONG_FUNC       "Cross Platform Password Manager"
+
+#define APP_VERSION         "0.2.3"
+
 #define BUILTIN_ICONS 65
 
 typedef enum tKeyType {PASSWORD=0,KEYFILE=1,BOTH=2};
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4e299e6..d94a3a6 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -115,7 +115,7 @@ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,QWidget *parent, Qt:
 	}
 	HelpBrowser = new QAssistantClient(QString(),this);
 	HelpBrowser->setArguments(QStringList()<< "-profile" << "/home/tarek/Documents/KeePassX/share/keepass/doc/keepassx.adp");
-	
+
 	createBookmarkActions();
 }
 
@@ -240,9 +240,9 @@ void KeepassMainWindow::setupIcons(){
 	HelpHandbookAction->setIcon(getIcon("manual"));
 	HelpAboutAction->setIcon(getIcon("help"));
 	menuBookmarks->menuAction()->setIcon(getIcon("bookmark_folder"));
-	AddThisAsBookmarkAction->setIcon(getIcon("bookmark"));
+	AddThisAsBookmarkAction->setIcon(getIcon("bookmark_this"));
 	AddBookmarkAction->setIcon(getIcon("bookmark_add"));
-	ManageBookmarksAction->setIcon(getIcon("bookmark_edit"));
+	ManageBookmarksAction->setIcon(getIcon("bookmark"));
 	SysTray->setIcon(getIcon("keepassx_large"));
 	if(config->showSysTrayIcon())
 		SysTray->show();
@@ -294,12 +294,12 @@ void KeepassMainWindow::setupMenus(){
 		case 28: ViewToolButtonSize28Action->setChecked(true); break;
 	}
 
-	SysTrayMenu = new QMenu(tr("KeePassX"),this);
+	SysTrayMenu = new QMenu(tr(APP_DISPLAY_NAME),this);
     SysTrayMenu->addAction(FileUnLockWorkspaceAction);
     SysTrayMenu->addSeparator();
 	SysTrayMenu->addAction(FileExitAction);
 	SysTray->setContextMenu(SysTrayMenu);
-    SysTray->setToolTip(tr("%1 %2").arg(APP_NAME, APP_FUNC) + " - " + tr((IsLocked) ? "Locked" : "Unlocked"));
+    SysTray->setToolTip(tr("%1 %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC) + " - " + tr((IsLocked) ? "Locked" : "Unlocked"));
 
 	#define _add_import(name){\
 	QAction* import=new QAction(this);\
@@ -323,7 +323,7 @@ void KeepassMainWindow::setupMenus(){
 	FileOpenAction->setShortcut(tr("Ctrl+O"));
 	FileSaveAction->setShortcut(tr("Ctrl+S"));
     FileUnLockWorkspaceAction->setShortcut(tr("Ctrl+L"));
-    FileExitAction->setShortcut(tr("Ctrl+X"));
+    FileExitAction->setShortcut(tr("Ctrl+Q"));
     EditNewGroupAction->setShortcut(tr("Ctrl+G"));
 	EditPasswordToClipboardAction->setShortcut(tr("Ctrl+C"));
 	EditUsernameToClipboardAction->setShortcut(tr("Ctrl+B"));
@@ -1011,7 +1011,7 @@ void KeepassMainWindow::OnUnLockWorkspace(){
 		setCentralWidget(NormalCentralWidget);
 		NormalCentralWidget->setVisible(true);
         SysTray->setIcon(getIcon("keepassx_large"));
-        SysTray->setToolTip(tr("%1 %2").arg(APP_NAME, APP_FUNC) + " - " + tr("Unlocked"));
+        SysTray->setToolTip(tr("%1 %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC) + " - " + tr("Unlocked"));
         FileUnLockWorkspaceAction->setText(tr("&Lock Workspace"));
 		IsLocked=false;
 	} else {
@@ -1020,7 +1020,7 @@ void KeepassMainWindow::OnUnLockWorkspace(){
 		setCentralWidget(LockedCentralWidget);
 		LockedCentralWidget->setVisible(true);
         SysTray->setIcon(getIcon("keepassx_locked"));
-        SysTray->setToolTip(tr("%1 %2").arg(APP_NAME, APP_FUNC) + " - " + tr("Locked"));
+        SysTray->setToolTip(tr("%1 %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC) + " - " + tr("Locked"));
         FileUnLockWorkspaceAction->setText(tr("Un&lock Workspace"));
 		IsLocked=true;
 	}
@@ -1030,38 +1030,38 @@ void KeepassMainWindow::OnBookmarkTriggered(QAction* action){
 	if(action==AddBookmarkAction){
 		AddBookmarkDlg dlg(this);
 		if(dlg.exec()){
-			int id=dlg.ItemID;	
+			int id=dlg.ItemID;
 			QAction* action=new QAction(this);
 			action->setData(id);
 			action->setText(KpxBookmarks::title(id));
 			action->setIcon(getIcon("document"));
-			menuBookmarks->addAction(action);	
+			menuBookmarks->addAction(action);
 		}
 		return;
 	}
-	
+
 	if(action==ManageBookmarksAction){
 		ManageBookmarksDlg dlg(this);
 		dlg.exec();
 		menuBookmarks->clear();
 		createBookmarkActions();
-		return;			
+		return;
 	}
-	
+
 	if(action==AddThisAsBookmarkAction){
 		AddBookmarkDlg dlg(this,db->file()->fileName());
 		if(dlg.exec()){
-			int id=dlg.ItemID;	
+			int id=dlg.ItemID;
 			QAction* action=new QAction(this);
 			action->setData(id);
 			action->setText(KpxBookmarks::title(id));
 			action->setIcon(getIcon("document"));
-			menuBookmarks->addAction(action);	
-		}	
+			menuBookmarks->addAction(action);
+		}
 		return;
-	}	
+	}
 	openDatabase(KpxBookmarks::path(action->data().toInt()));
-	
+
 }
 
 void KeepassMainWindow::createBookmarkActions(){
@@ -1074,6 +1074,6 @@ void KeepassMainWindow::createBookmarkActions(){
 		action->setData(i);
 		action->setText(KpxBookmarks::title(i));
 		action->setIcon(getIcon("document"));
-		menuBookmarks->addAction(action);		
-	}	
+		menuBookmarks->addAction(action);
+	}
 }