From 65e5da464934711f209a6465f5582731e0128f9a Mon Sep 17 00:00:00 2001
From: tarek_saidi <tarek_saidi@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Thu, 16 Aug 2007 20:43:48 +0000
Subject: [PATCH] Bookmarks

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@146 b624d157-de02-0410-bad0-e51aec6abb33
---
 share/keepass/icons/bookmark.png        | Bin 0 -> 6161 bytes
 share/keepass/icons/bookmark_add.png    | Bin 0 -> 2404 bytes
 share/keepass/icons/bookmark_edit.png   | Bin 0 -> 2617 bytes
 share/keepass/icons/bookmark_folder.png | Bin 0 -> 2353 bytes
 share/keepass/icons/document.png        | Bin 0 -> 1443 bytes
 share/keepass/icons/down.png            | Bin 0 -> 1748 bytes
 share/keepass/icons/up.png              | Bin 0 -> 1849 bytes
 src/Kdb3Database.cpp                    |   5 +-
 src/KpxConfig.h                         |   4 +-
 src/crypto/arcfour.cpp                  |   1 -
 src/dialogs/AboutDlg.cpp                |  11 +-
 src/dialogs/AddBookmarkDlg.cpp          |  58 +++
 src/dialogs/AddBookmarkDlg.h            |  41 ++
 src/dialogs/EditEntryDlg.cpp            |  17 +-
 src/dialogs/ManageBookmarksDlg.cpp      | 117 ++++++
 src/dialogs/ManageBookmarksDlg.h        |  44 ++
 src/dialogs/PasswordDlg.cpp             |  85 +++-
 src/dialogs/PasswordDlg.h               |   9 +-
 src/dialogs/SettingsDlg.cpp             |   7 +-
 src/forms/AboutDlg.ui                   | 113 +++--
 src/forms/AddBookmarkDlg.ui             |  58 +++
 src/forms/MainWindow.ui                 |  21 +
 src/forms/ManageBookmarksDlg.ui         |  69 +++
 src/forms/PasswordDlg.ui                | 538 +++++++++++++-----------
 src/forms/SettingsDlg.ui                |   2 +-
 src/lib/EntryView.cpp                   |   1 -
 src/lib/bookmarks.cpp                   | 127 ++++++
 src/lib/bookmarks.h                     |  49 +++
 src/main.cpp                            |   2 +
 src/mainwindow.cpp                      |  96 +++--
 src/mainwindow.h                        |   2 +
 src/src.pro                             |  27 +-
 32 files changed, 1157 insertions(+), 347 deletions(-)
 create mode 100644 share/keepass/icons/bookmark.png
 create mode 100644 share/keepass/icons/bookmark_add.png
 create mode 100644 share/keepass/icons/bookmark_edit.png
 create mode 100644 share/keepass/icons/bookmark_folder.png
 create mode 100644 share/keepass/icons/document.png
 create mode 100644 share/keepass/icons/down.png
 create mode 100644 share/keepass/icons/up.png
 create mode 100644 src/dialogs/AddBookmarkDlg.cpp
 create mode 100644 src/dialogs/AddBookmarkDlg.h
 create mode 100644 src/dialogs/ManageBookmarksDlg.cpp
 create mode 100644 src/dialogs/ManageBookmarksDlg.h
 create mode 100644 src/forms/AddBookmarkDlg.ui
 create mode 100644 src/forms/ManageBookmarksDlg.ui
 create mode 100644 src/lib/bookmarks.cpp
 create mode 100644 src/lib/bookmarks.h

diff --git a/share/keepass/icons/bookmark.png b/share/keepass/icons/bookmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cc8656b373edd545a9d8cf0527b1032a2e02359
GIT binary patch
literal 6161
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

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/bookmark_add.png b/share/keepass/icons/bookmark_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..3521387f16d2f74f300e880f9ed569ca7d58701a
GIT binary patch
literal 2404
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
W?=r~0hT0zh0000<MNUMnLSTXrTec?v

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/bookmark_edit.png b/share/keepass/icons/bookmark_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2f72dff121fbb2cb8b83657f944d22bdc5e1ec8
GIT binary patch
literal 2617
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
bKZp50x%O)-3%sQN00000NkvXXu0mjfB1|bF

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/bookmark_folder.png b/share/keepass/icons/bookmark_folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1b319c4a592f497d4701a48a9898a5ed5d045be
GIT binary patch
literal 2353
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
X?^qym*MMWc00000NkvXXu0mjfSs+hS

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/document.png b/share/keepass/icons/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b6057785515719d431bbd45b272fbfa5513f16c
GIT binary patch
literal 1443
zcmX9;2~bm46n#HCOF}>mTYwJ&28|d&L@H`NM3y2<K!G?~_(=#lQ9&Y=8c}`{fq)MF
zB4DakqT)g;H8SE>1__IaE8@b4m4Yl5HEjV!vB=Qh>6^Ll%$<32?>*<9d1d0HSf;&)
zJph0iA16v75dJS1G~(W+R(~LXvIR**0Jvlgr<T7Va`*hTlKl0#+4%)hl>#7HxiSSD
zzeBo3k)n`h?a8~Nhy;Kd7B50JeD^~3Wp;K=yO4wdnP#cYW~)j~P2EyoU%zo?X8MzB
z*kWl`Ru(Fg$-Yd!bA5kVZeelP>~EeJvK&4tJV|H3G&a<hmzQ@iv!(EJZ4cVtvTrtZ
z!-gKHFM!nO3S$GlM&is545VexPJeQ;DczX6{2N!Oo@%Dxu|K+eO8RdVwNGMGCN?US
zN>RC7E)WRNfsv7CB>P3sxF-f8lM#D@?IMxw_3Ugt-3iIra6a)`*=VLw=Q%}7pZ73k
zuJgn@`AqYp)N1vu91*4aeoS^{bU{IIdEuvQi)%I)>d<;;!qG_Z{+WNmB%zJb*Kgb~
zEBAkyf<Ai1c?mL*)iS)MhBloN7sv3HMMg&MbTUWT^&Wu%TgV?ZGaQt5c6Qh0LKYGZ
z0$HJsw@ajkuksK5<wi&rRRARH(V?!|HK8wC_8ouK_iF)KYu5g#(~-GXT!S}*QVK6a
zI)2C&nxBwY22t2OY~cQJX1buH)X68LaB58RYJA8taGgpG;<1n#ZHKUh7Qvd^f8xXm
z$B>W^|6&RQP}mOY=GM8`U|L3oH-Gp0*NHp7=v<zhi9OuPA*9ztlj>Mit-@0!4_vm_
z_?0df0x1*1mk2kyoO7=7MmbxRO6>?zh<l3}7#Fgim!-SB$Nsn+ko43|cMmAM3@dp0
z@87THpK5y!$6`~0Fe6WtUTR}!EhPw=Ieg<3U9l4H6818O-3-}c86{%uw`;irTR}Zk
zOymEo<vLW-&(4z!QWfhzY}G&*Xgfy36QXfn*u!1tSX@uOqvO*fTmqd`;Nn<RSKBBH
zFyO#pv=qWGp;Sj+4ze9L8y^8Fu7N%LD;~Tu;-DMe!}d(`mmlO1<#={TC498KJVh+l
zPOP>H@cBqDvnl|QnQZnc<V6)oGFi2Z@1@u4jde~R-ul3p=^P{xv==h({cVD&5iEb!
z9I_Nw<L<_MjcpS?gibQ9R<dEtU^)v)IONYXj-QFbkhODZyZHCTxWY6_sjf72FpgMi
zm=H;Cx2X+K!}$h;qkRrLASK#i^er+7JD?k#>o^_s2(C!?R9CK&c(idy06O4I6&%%S
z-P1U&Z|Rc!*76L=$<kud#SCnOWysB|uKeFuH^7TR?E-;#A<doEU@@N}senFa2_kj#
zFWtP;?BdIx_A3R%Dyzr>pSJQeu@_i02W{|`G!HK9L*LLg`dn?KQ2>dtEg0(zyVwmq
zp-ey*xmah={bUnQ8^Q2rsdyLon(Dgek3ESp4G!p^E5$rapl9C8u|8XT-`8|OH{xiB
zj9a2I$rH%L+)ccaVw#FPC#}(3o-G-L&wELt=W>dzoHOA$Qb35BW-(m>k12Ok1esbc
zMMbfu3oMvR5HA*U@#c4)Ij<hBS$32B-%O0wMp*rOXHPRJAVm_TtER)2_DJkyMhB;l
zXv8HQvQ`Q*;qWIW!Z$V4rqf87>#$g|mn701%Y(t`?rm$?ghx1aB8$Eup_p4VS|O}R
z7c1#u572=5R%mqb4oOeU!`lF&6aZ7#ZknE%xNco5m3=e!^0O?fl6bUy(yCPN-HSBY
z7T~pr3_u<FVb2Iu(3B7#{{yL0_-#i~lvh#;;QfRpcTlz`-lE4m2sA$OGp=$X2=qem
t*KB>N#&Eo3l?v~w1><sKUlAZVf^U+Oiu!}*93XyK5WhA_^h*?~{TCg7ID`NI

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/down.png b/share/keepass/icons/down.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cbe6bb695a743c56bcffa0d9f198bea9e58222d
GIT binary patch
literal 1748
zcmV;_1}piAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&W=TXrRCwBA
z{Qv(y!$1On0AgYoU;q$61MUET02*)y00a;VGKbM*7A|$F4F4HcGW`Cl0%ZRJi-3|2
zBMviJnBFlkF(v`o2e2vle<lsi1_&S)qMZ5jkAtENzhP&wB?A`+GteFXAr4^p4@HoK
z%m{Q43o{c#+q?_>$4@=;VBlarK*(r-03yx-fBrKH@vt%kIw}G!K=$^3R1C^dj4TXG
zw%uVk{`=p526kplvlvl>4IqGsa{wd5|9?R9zI^}1Ai%}SaO}x{hWFq9GcW=z{QKuG
z!*3vFVfe>jCe6Sg#?Qv^>-Rsf9?TSn8D{_i#6nVv1?v9?v~=xFCWfo885vmq{bu<6
z>mS4S?|&G0nEo(m`LZ%dF#gA_84CaiAd(ya3gLhM{xPruy~q6jF9S2s0ssH~Vqp3I
z2gv^ebQ}{nJz#hqhvgsu5I{sb;6L0EpkV*a@b~9mplg0H{Q30<h=F|OKMeo>umT<Q
zAJuw1mV*F501@keKd?LpN(+B}{{>nK%#HsbmV+_#UtkEJq?^BlEC&IA077>FFT>w|
zx(t8+vmkl;JHxNP>L5!&aR7_~paVd04+{Q2VEXq@AZGo`@b~Xua1{Od161_uuPhK7
z1NC#Ega!-KO(5$POb8%=&>Zl8h9Dn%6f2PR_aCC9`NPJ{Ajr$cz{K<)8Ula77#spX
z$AIzwe+>Wr{sX&Okeii(Uw|{7m4`JR#dM%?Z@>Nql?{$CF@OL<b-?$(qGlH23{xs>
zfLZGg*fNlb|A2<GvobTV0v+%Z825kwK!P6RfWN;$7?=itJ_o7${{1&YRkAKaW|%rK
z%L5$@47k5Qhlz`DGITGw&M<rVH4$Vh0Rjls0UXTD`;R`dy7TZOw}-VX(EQ)vAZG>|
z1S|-Emj7m80wu!Vkf3LPMF9u{Ee91lzkq6hMFE3=C>z7~ACPF_<>p{``RNbCrrr1d
z0)5eoY$ZSdv7lv_!@qv~?ayyJRI_)!KZCR|8^hywzZvG8{loC<*Ix!kkcB|YAHDg-
z!1VVwBq~4-0fxv|U`RBreagVf_!k^XU%&ohNOcouFjnDZ_|L?`kk@mP;pMAu>lk=g
zmm*sU5I{^Ad5x2$<JPUWCmLs*0Xm3<L4xN$13xf<ZM*t|Ved^KzW$Bj{imM{|DmA(
z$_@X3Y2Z7sl-zge9mCesZy44cd<OLS9|m=4E(Re%E{1tq?lBxV^!O<Q7fTt?j^D^u
z0t67Y>i8=IAA9z^l~>;^-FlmWlZS&L-jJEWLK+zVKug$xIr9JC-%!hcgUf;6zagQ)
z&iD_^SC(LBs0o*6kOap2xjUa2I%i+}1GGF3m?$2gTLut7OgM_obN?6_drG>GF<iU<
zi9uA5jUn5bok57>AH(Ob(833n`k@#U3g5o{WMBeDQ#H_X4H<5RZ-1E>3VTm8eEj%p
zAu#UOVY3P#fS7O=dmJniU%vdhKBeve!@Dnk8Pp|M8OofwfyM71phdsHzK1115c|iE
z-(c~wAXx@yeIW)`E)IsODd!n3TzGXJ81GdKII0MM0K(TI`oX}%o^|~AlS?&I&oZz9
z4YX6`V90gi1IPCdV0QZpErvn4<K4&a3@NUX4ABk}3<84O46`@gV_358)*GPZNyr5c
zIsgbD0!_02FM#PGe)^ItZzis|&cMaX$q;D7%aH9N#PH?oPq0HkrQo~w-x*@;#TasZ
zWq^r}n_<tn*9?u5&;JG{=nP=IU%+PrKmaijQ3qdOU}G*U?>@n>e9t2WK_PC21Un&y
z5?={$+<yY*h-5cOhN>_H1_@DahKmnAGo&{jW%&N<Pb;w4T}#M#fB+({GGb#|^5^GY
z;k24VeZT9inIc_e8R8v885D$Bz=_gPUywmegqz{yjgJh;wMQ7<y!$Z;nChDti0E<v
z1P}|+bul~h#BV?TvSl?L?fU%9lp)qbfx+911yWqIFf;5u|Arx}^#sGKmtSW9<GqC8
zKLb%c9)JL1MD7{kX%)k&SO$jQ|3Vpl{hQ=!D<hE<q{_evtf*G)dcd%3+ug6gR#`33
zq5TB?gVZVp2q4lNfB;$y-+t!+<JggriIMgH&%dXDK|TYR;0_TLphyk?2q4CR?i&IG
q(17=h00L;h9RLtO1MUET00RK0LGDGwoB4(S0000<MNUMnLSTXzNg@IO

literal 0
HcmV?d00001

diff --git a/share/keepass/icons/up.png b/share/keepass/icons/up.png
new file mode 100644
index 0000000000000000000000000000000000000000..899ad4fc9ea98e0968886a3ace5ca5aa3e59d7bb
GIT binary patch
literal 1849
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

literal 0
HcmV?d00001

diff --git a/src/Kdb3Database.cpp b/src/Kdb3Database.cpp
index 9af0f06..2062af4 100644
--- a/src/Kdb3Database.cpp
+++ b/src/Kdb3Database.cpp
@@ -103,7 +103,7 @@ int Kdb3Database::numIcons(){
 
 bool Kdb3Database::parseMetaStream(const StdEntry& entry){
 
-	qDebug("%s",entry.Comment.toUtf8().data());
+	qDebug("Found Metastream: %s",entry.Comment.toUtf8().data());
 
 	if(entry.Comment=="KPX_GROUP_TREE_STATE"){
 		parseGroupTreeStateMetaStream(entry.Binary);
@@ -843,8 +843,7 @@ QList<IEntryHandle*> Kdb3Database::entries(IGroupHandle* group){
 			handles.append(&EntryHandles[i]);
 	}
 	qSort(handles.begin(),handles.end(),EntryHandleLessThan);
-	foreach(IEntryHandle* h,handles){qDebug("+ %s (%i)",h->title().toUtf8().data(),(int)h->isValid());}
-
+	
 	return handles;
 }
 
diff --git a/src/KpxConfig.h b/src/KpxConfig.h
index ce7df09..1632057 100644
--- a/src/KpxConfig.h
+++ b/src/KpxConfig.h
@@ -56,7 +56,6 @@ public:
 	QBitArray columns(){return stringToBitArray(settings.value("UI/Columns","11111000000").toString(),11);}
 	QList<int> columnOrder(){return stringToIntArray(settings.value("UI/ColumnOrder","100,100,100,100,100,100,100,100,100,100,100").toString(),11);}
 	QList<int> columnSizes(){return stringToIntArray(settings.value("UI/ColumnSizes","15,10,10,10,10,10,10,10,10,10,10").toString(),11);}
-	bool enableBookmarkMenu(){return settings.value("Options/EnableBookmarkMenu",true).toBool();}
 	QStringList fileDlgHistory(unsigned index){return settings.value(QString("FileDlgHistory/ENTRY%1").arg(index)).toStringList();}
 	GrpTreeState groupTreeState(){return stringToGrpTreeState(settings.value("Options/GroupTreeState").toString());}
 	bool hidePasswords(){return settings.value("UI/HidePasswords",true).toBool();}
@@ -90,6 +89,7 @@ public:
 	bool askBeforeDelete(){return settings.value("Options/AskBeforeDelete",true).toBool();}
 	int autoTypePreGap(){return settings.value("Options/AutoTypePreGap",500).toInt();}
 	int autoTypeKeyStrokeDelay(){return settings.value("Options/AutoTypeKeyStrokeDelay",0).toInt();}
+	bool featureBookmarks(){return settings.value("Features/Bookmarks",true).toBool();}
 	
 	void setAlternatingRowColors(bool value){settings.setValue("Options/AlternatingRowColors",value);}
 	void setBannerColor1(const QColor& value){settings.setValue("Options/BannerColor1",colorToString(value));}
@@ -99,7 +99,6 @@ public:
 	void setColumns(const QBitArray& value){settings.setValue("UI/Columns",bitArrayToString(value));}
 	void setColumnOrder(const QList<int>& value){settings.setValue("UI/ColumnOrder",intArrayToString(value));}
 	void setColumnSizes(const QList<int>& value){settings.setValue("UI/ColumnSizes",intArrayToString(value));}
-	void setEnableBookmarkMenu(bool value){settings.setValue("Options/EnableBookmarkMenu",value);}
 	void setFileDlgHistory(unsigned index,const QStringList& value){settings.setValue(QString("FileDlgHistory/ENTRY%1").arg(index), value);}
 	void setGroupTreeState(GrpTreeState value){settings.setValue("Options/GroupTreeState",grpTreeStateToString(value));}
 	void setHidePasswords(bool value){settings.setValue("UI/HidePasswords",value);}
@@ -133,6 +132,7 @@ public:
 	void setAskBeforeDelete(bool value){settings.setValue("Options/AskBeforeDelete",value);}
 	void setAutoTypePreGap(int value){settings.setValue("Options/AutoTypePreGap",value);}
 	void setAutoTypeKeyStrokeDelay(int value){settings.setValue("Options/AutoTypeKeyStrokeDelay",value);}
+	void setFeatureBookmarks(bool value){settings.setValue("Features/Bookmarks",value);}
 
 	unsigned fileDlgHistorySize();
 	void clearFileDlgHistory(){settings.remove("FileDlgHistory");};
diff --git a/src/crypto/arcfour.cpp b/src/crypto/arcfour.cpp
index 3d0c923..0df7980 100644
--- a/src/crypto/arcfour.cpp
+++ b/src/crypto/arcfour.cpp
@@ -58,7 +58,6 @@ void CArcFour::prepareKey(){
 }
 
 void CArcFour::encrypt(const byte* src, byte* dst,int length){
-//qDebug("Key:%s",RawKey.data());
 		prepareKey();
         unsigned char x;
         unsigned char y;
diff --git a/src/dialogs/AboutDlg.cpp b/src/dialogs/AboutDlg.cpp
index cd182ae..95be523 100755
--- a/src/dialogs/AboutDlg.cpp
+++ b/src/dialogs/AboutDlg.cpp
@@ -1,11 +1,10 @@
 /***************************************************************************
- *   Copyright (C) 2005-2006 by Tarek Saidi                                *
+ *   Copyright (C) 2005-2007 by Tarek Saidi                                *
  *   tarek.saidi@arcor.de                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; version 2 of the License.               *
-
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -48,18 +47,18 @@ AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
 	QString str;
 	str+="<b>"+tr("Team")+"</b><br>";
 	str+="<div style='margin-left:10px;'>";
-	str+="<u>"+tr("Tarek Saidi")+"</u><br>"+tr("Developer, Project Admin")+"<br>"+tr("tariq@users.berlios.de")+"<br>";
+	str+="<u>"+tr("Tarek Saidi")+"</u><br>"+tr("Developer, Project Admin")+"<br>"+tr("tarek_saidi@users.sf.net")+"<br>";
+	str+="<br>";
+	str+="<u>"+tr("Eugen Gorschenin")+"</u><br>"+tr("Web Designer")+"<br>"+tr("geugen@users.sf.de")+"<br>";
 	str+="<br>";
-	str+="<u>"+tr("Eugen Gorschenin")+"</u><br>"+tr("Web Designer")+"<br>"+tr("geugen@users.berlios.de")+"<br>";
+	str+="<u>"+tr("Jota Jota")+"</u><br>"+tr("Developer")+"<br>"+tr("myxself@users.sf.de")+"<br>";
 	str+="</div><br><div style='margin-left:0px;'>";
 	str+="<b>"+tr("Thanks To")+"</b>";
 	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>";
-	str+="</div><div style='margin-left:10px;'>";
 	str+="<u>"+tr("James Nicholls")+"</u><br>"+tr("Main Application Icon")/*+"<br>"+tr("mailto:???")*/+"<br></div>";
 	str+="<br>";
-	str+="</div><div style='margin-left:10px;'>";
 	str+="<u>"+tr("Constantin Makshin")+"</u><br>"+tr("Various fixes and improvements")+"<br>"+tr("dinosaur-rus@users.sourceforge.net")+"<br></div>";
 	Edit_Thanks->setHtml(str);
 }
diff --git a/src/dialogs/AddBookmarkDlg.cpp b/src/dialogs/AddBookmarkDlg.cpp
new file mode 100644
index 0000000..3238e55
--- /dev/null
+++ b/src/dialogs/AddBookmarkDlg.cpp
@@ -0,0 +1,58 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Tarek Saidi                                     *
+ *   tarek.saidi@arcor.de                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License.               *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QFileInfo>
+#include "AddBookmarkDlg.h"
+#include "lib/FileDialogs.h"
+#include "lib/bookmarks.h"
+
+AddBookmarkDlg::AddBookmarkDlg(QWidget* parent, QString DefaultFilename, int _ItemID):QDialog(parent)
+{
+	setupUi(this);
+	ItemID=_ItemID;
+	connect(Button_Browse,SIGNAL(clicked()),this,SLOT(OnButtonBrowse()));
+	connect(buttonBox->button(QDialogButtonBox::Ok),SIGNAL(clicked()),this,SLOT(OnButtonOk()));
+	connect(buttonBox->button(QDialogButtonBox::Cancel),SIGNAL(clicked()),this,SLOT(reject()));
+	if(ItemID==-1){
+		if(DefaultFilename==QString())
+			OnButtonBrowse();
+		else
+			Edit_Filename->setText(DefaultFilename);
+	}
+	else {
+		Edit_Title->setText(KpxBookmarks::title(ItemID));
+		Edit_Filename->setText(KpxBookmarks::path(ItemID));
+		setWindowTitle(tr("Edit Bookmark"));
+	}
+}
+
+void AddBookmarkDlg::OnButtonBrowse(){
+	QString path=KpxFileDialogs::openExistingFile(this,"AddBookmarkDlg", tr("Add Bookmark"),
+									              QStringList() << tr("KeePass Databases (*.kdb)") << tr("All Files (*)"));
+	if(path!=QString())
+		Edit_Filename->setText(path);
+}
+
+void AddBookmarkDlg::OnButtonOk(){
+	if(ItemID==-1)
+		ItemID=KpxBookmarks::add(Edit_Title->text(),Edit_Filename->text());
+	else
+		KpxBookmarks::edit(Edit_Title->text(),Edit_Filename->text(),ItemID);
+	accept();	
+}
\ No newline at end of file
diff --git a/src/dialogs/AddBookmarkDlg.h b/src/dialogs/AddBookmarkDlg.h
new file mode 100644
index 0000000..363ace2
--- /dev/null
+++ b/src/dialogs/AddBookmarkDlg.h
@@ -0,0 +1,41 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Tarek Saidi                                     *
+ *   tarek.saidi@arcor.de                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License.               *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef _ADDBOOKMARKDLG_H_
+#define _ADDBOOKMARKDLG_H_
+
+#include <QDialog>
+#include "ui_AddBookmarkDlg.h"
+
+class AddBookmarkDlg : public QDialog, private Ui::AddBookmarkDlg
+{
+	Q_OBJECT
+
+	public:
+		AddBookmarkDlg (QWidget* parent=0, QString DefaultFilename=QString(), int ItemID=-1);
+		int ItemID;
+	
+	private slots:
+		void OnButtonOk();
+		void OnButtonBrowse();
+	
+};
+
+#endif
+
diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 06448c8..75aefc3 100755
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -37,6 +37,7 @@
 #include <qtoolbutton.h>
 #include <QShowEvent>
 #include <QResizeEvent>
+#include <math.h>
 
 #include "SelectIconDlg.h"
 #include "PasswordGenDlg.h"
@@ -348,27 +349,27 @@ void CEditEntryDlg::OnNewAttachment()
 	int prec;
 	if (entry->binarySize() < 1024)
     {
-        unit = "Bytes";
+        unit = tr("Bytes");
         faktor = 1;
         prec = 0;
     }
     else
     {
-        if (entry->binarySize() < 1048576)
+        if (entry->binarySize() < pow(2,20))
         {
-            unit = "kB";
+            unit = tr("kiB");
             faktor = 1024;
         }
         else
-            if (entry->binarySize() < 1073741824)
+            if (entry->binarySize() < pow(2,30))
             {
-                unit = "MB";
-                faktor = 1048576;
+                unit = tr("MiB");
+                faktor = pow(2,20);
             }
             else
             {
-                unit = "GB";
-                faktor = 1073741824;
+                unit = tr("GiB");
+                faktor = pow(2,30);
             }
         prec = 1;
     }
diff --git a/src/dialogs/ManageBookmarksDlg.cpp b/src/dialogs/ManageBookmarksDlg.cpp
new file mode 100644
index 0000000..c1045b0
--- /dev/null
+++ b/src/dialogs/ManageBookmarksDlg.cpp
@@ -0,0 +1,117 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Tarek Saidi                                     *
+ *   tarek.saidi@arcor.de                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License.               *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QListWidget>
+#include "main.h"
+#include "ManageBookmarksDlg.h"
+#include "lib/bookmarks.h"
+#include "dialogs/AddBookmarkDlg.h"
+
+ManageBookmarksDlg::ManageBookmarksDlg(QWidget* parent):QDialog(parent)
+{
+	setupUi(this);
+	for(int i=0;i<KpxBookmarks::count();i++){
+		QListWidgetItem* item=new QListWidgetItem(ListWidget);
+		item->setData(Qt::UserRole,i);
+		item->setText(KpxBookmarks::title(i));	
+	}
+	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_Edit->setIcon(getIcon("bookmark_edit"));
+	Button_Add->setIcon(getIcon("bookmark_add"));
+}
+
+
+void ManageBookmarksDlg::OnButtonUp(){
+	int row=ListWidget->currentRow();
+	QListWidgetItem* item=ListWidget->currentItem();
+	if(row==-1 || !item || row==0)return;
+	ListWidget->takeItem(row);
+	row--;
+	ListWidget->insertItem(row,item);
+	ListWidget->setCurrentRow(row);
+}
+
+void ManageBookmarksDlg::OnButtonDown(){
+	int row=ListWidget->currentRow();
+	QListWidgetItem* item=ListWidget->currentItem();
+	if(row==-1 || !item || row==ListWidget->count()-1)return;
+	ListWidget->takeItem(row);
+	row++;
+	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));	
+}
+
+
+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;
+	// Creating a list with the new indices
+	// Order[OldIndex]==NewIndex
+	for(int i=0;i<KpxBookmarks::count();i++){
+		Order<<ListWidget->item(i)->data(Qt::UserRole).toInt();
+	}
+	KpxBookmarks::resort(Order);	
+	event->accept();
+}
\ No newline at end of file
diff --git a/src/dialogs/ManageBookmarksDlg.h b/src/dialogs/ManageBookmarksDlg.h
new file mode 100644
index 0000000..4501a5c
--- /dev/null
+++ b/src/dialogs/ManageBookmarksDlg.h
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Tarek Saidi                                     *
+ *   tarek.saidi@arcor.de                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License.               *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#ifndef MANAGEBOOKMARKSDLG_H
+#define MANAGEBOOKMARKSDLG_H
+
+#include <QDialog>
+#include <QCloseEvent>
+#include "ui_ManageBookmarksDlg.h"
+
+class ManageBookmarksDlg : public QDialog, private Ui::ManageBookmarksDlg
+{
+  	Q_OBJECT
+	public:
+		ManageBookmarksDlg(QWidget* parent=0);
+	private:
+		virtual void closeEvent(QCloseEvent* event);
+	private slots:
+		void OnButtonUp();
+		void OnButtonDown();
+		void OnButtonDelete();
+		void OnButtonAdd();
+		void OnButtonEdit();
+		void edit(QListWidgetItem*);
+};
+
+#endif
+
diff --git a/src/dialogs/PasswordDlg.cpp b/src/dialogs/PasswordDlg.cpp
index ee9d0e2..143f3f3 100755
--- a/src/dialogs/PasswordDlg.cpp
+++ b/src/dialogs/PasswordDlg.cpp
@@ -1,11 +1,10 @@
 /***************************************************************************
- *   Copyright (C) 2005-2006 by Tarek Saidi                                *
+ *   Copyright (C) 2005-2007 by Tarek Saidi                                *
  *   tarek.saidi@arcor.de                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; version 2 of the License.               *
-
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -27,26 +26,31 @@
 #include <QPushButton>
 #include <QMessageBox>
 #include <QStringList>
+#include <QPainter>
+#include <QPalette>
+#include <QMenu>
 
 #include "main.h"
 #include "KpxConfig.h"
 #include "PasswordDlg.h"
 #include "lib/FileDialogs.h"
+#include "lib/bookmarks.h"
 
 
-CPasswordDialog::CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButton,bool ChangeKeyMode)
+CPasswordDialog::CPasswordDialog(QWidget* parent,QString filename,IDatabase* DB,bool IsAuto,bool ChangeKeyMode)
 : QDialog(parent)
 {
 	setupUi(this);
-	createBanner(Banner,getPixmap("key"),tr("Database Key"));
+	createBanner(&BannerPixmap,getPixmap("key"),tr("Database Key"),width());
+	Button_Bookmarks->setIcon(getIcon("bookmark"));
 	db=DB;
+	LastFile=filename;
+	setWindowTitle(LastFile);
 	QString mountDir=config->mountDir();
 	QDir media(mountDir);
 	if(media.exists()){
 		QStringList Paths;
-		Paths=media.entryList(QStringList()<<"*",QDir::Dirs);
-		Paths.erase(Paths.begin()); // delete "."
-		Paths.erase(Paths.begin()); // delete ".."
+		Paths=media.entryList(QStringList()<<"*",QDir::Dirs | QDir::NoDotAndDotDot);
 		for(int i=0;i<Paths.count();i++)
 			Combo_Dirs->addItem(mountDir+Paths[i]);
 	}
@@ -66,17 +70,47 @@ CPasswordDialog::CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButt
 		}
 		// if(LastKeyType==Password){... is not required because it is already the default state.
 	}
-
-	connect( Combo_Dirs, SIGNAL( editTextChanged(const QString&) ),this, SLOT( OnComboTextChanged(const QString&)));
-	connect( ButtonCancel, SIGNAL( clicked() ), this, SLOT( OnCancel() ) );
-	connect( Edit_Password, SIGNAL( textChanged(const QString&) ), this, SLOT( OnPasswordChanged(const QString&) ) );
-	connect( CheckBox_Both, SIGNAL( stateChanged(int) ), this, SLOT( OnCheckBox_BothChanged(int) ) );
-	connect( ButtonChangeEchoMode, SIGNAL( clicked() ), this, SLOT( ChangeEchoModeDatabaseKey() ) );
-	connect( Edit_Password, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
-	connect( Edit_PasswordRep, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
-	connect( ButtonExit, SIGNAL( clicked()),this,SLOT(OnButtonExit()));
-
-	ButtonExit->setVisible(ShowExitButton);
+	
+	// Bookmarks //
+	QPalette palette=Button_Bookmarks->palette();
+	palette.setColor(QPalette::Active,QPalette::Button,config->bannerColor1());
+	palette.setColor(QPalette::Active,QPalette::Window,config->bannerColor2());
+	Button_Bookmarks->setPalette(palette);
+	palette=Label_Bookmark->palette();
+	palette.setColor(QPalette::Active,QPalette::WindowText,config->bannerTextColor());
+	Label_Bookmark->setPalette(palette);
+	
+	QMenu* BookmarkMenu=new QMenu(this);
+	QAction* action=new QAction(this);
+	action->setData(QString());
+	action->setText(tr("Last File"));
+	action->setIcon(getIcon("document"));
+	BookmarkMenu->addAction(action);
+	BookmarkMenu->addSeparator();	
+	for(int i=0;i<KpxBookmarks::count();i++){
+		QAction* action=new QAction(this);
+		action->setData(KpxBookmarks::path(i));
+		action->setText(KpxBookmarks::title(i));
+		action->setIcon(getIcon("document"));
+		BookmarkMenu->addAction(action);		
+	}
+	Button_Bookmarks->setMenu(BookmarkMenu);
+	if(!IsAuto || !config->featureBookmarks()){
+		Button_Bookmarks->hide();
+		Label_Bookmark->hide();
+	}
+			
+	connect(Combo_Dirs, SIGNAL( editTextChanged(const QString&) ),this, SLOT( OnComboTextChanged(const QString&)));
+	connect(ButtonCancel, SIGNAL( clicked() ), this, SLOT( OnCancel() ) );
+	connect(Edit_Password, SIGNAL( textChanged(const QString&) ), this, SLOT( OnPasswordChanged(const QString&) ) );
+	connect(CheckBox_Both, SIGNAL( stateChanged(int) ), this, SLOT( OnCheckBox_BothChanged(int) ) );
+	connect(ButtonChangeEchoMode, SIGNAL( clicked() ), this, SLOT( ChangeEchoModeDatabaseKey() ) );
+	connect(Edit_Password, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
+	connect(Edit_PasswordRep, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
+	connect(ButtonExit, SIGNAL( clicked()),this,SLOT(OnButtonExit()));
+	connect(BookmarkMenu,SIGNAL(triggered(QAction*)),this,SLOT(OnBookmarkTriggered(QAction*)));
+
+	ButtonExit->setVisible(IsAuto);
 	Mode_Set=ChangeKeyMode;
 	if(!ChangeKeyMode){
 		Edit_PasswordRep->hide();
@@ -342,3 +376,18 @@ void CPasswordDialog::OnButtonExit(){
 	done(2);
 }
 
+void CPasswordDialog::paintEvent(QPaintEvent* event){
+	QDialog::paintEvent(event);
+	QPainter painter(this);
+	painter.setClipRegion(event->region());
+	painter.drawPixmap(QPoint(0,0),BannerPixmap);	
+}
+
+void CPasswordDialog::OnBookmarkTriggered(QAction* action){
+	BookmarkFilename=action->data().toString();
+	if(action->data().toString()==QString())
+		setWindowTitle(LastFile);
+	else
+		setWindowTitle(action->data().toString());
+	Label_Bookmark->setText(action->text());
+}
diff --git a/src/dialogs/PasswordDlg.h b/src/dialogs/PasswordDlg.h
index fef9f8f..d3e723a 100755
--- a/src/dialogs/PasswordDlg.h
+++ b/src/dialogs/PasswordDlg.h
@@ -23,6 +23,8 @@
 #include "main.h"
 #include "lib/UrlLabel.h"
 #include "Database.h"
+#include <QPixmap>
+#include <QPaintEvent>
 
 
 class CPasswordDialog : public QDialog, public Ui_PasswordDlg
@@ -32,17 +34,21 @@ class CPasswordDialog : public QDialog, public Ui_PasswordDlg
 	private:
 		bool Mode_Set; //true = Set, false = Get
 		IDatabase* db;
+		QPixmap BannerPixmap;
 		void setStatePasswordOnly();
 		void setStateKeyFileOnly();
 		void setStateBoth();
 		bool doAuth();
+		virtual void paintEvent(QPaintEvent*);
+		QString LastFile;
 	
 	public:
 		QString keyfile;
 		QString password;
+		QString BookmarkFilename;
 		tKeyType KeyType;
 		bool OverwriteKeyFile;	
-		CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButton = false, bool KeyMode_Set=false);
+		CPasswordDialog(QWidget* parent,QString filename,IDatabase* DB,bool ShowExitButton = false, bool KeyMode_Set=false);
 	
 	public slots:
 	    void OnOK();
@@ -55,6 +61,7 @@ class CPasswordDialog : public QDialog, public Ui_PasswordDlg
 	    void OnCheckBox_BothChanged(int state);
 	    void ChangeEchoModeDatabaseKey();
 	    void OnComboTextChanged(const QString&);
+		void OnBookmarkTriggered(QAction* action);
 };
 
 #endif
diff --git a/src/dialogs/SettingsDlg.cpp b/src/dialogs/SettingsDlg.cpp
index fe30da4..376e4e4 100755
--- a/src/dialogs/SettingsDlg.cpp
+++ b/src/dialogs/SettingsDlg.cpp
@@ -103,6 +103,9 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
 	SpinBox_ClipboardTime->setValue(config->clipboardTimeOut());
 	CheckBox_ShowPasswords->setChecked(config->showPasswords());
 	CheckBox_ShowPasswords_PasswordDlg->setChecked(config->showPasswordsPasswordDlg());
+	
+	//Features
+	CheckBox_FeatureBookmarks->setChecked(config->featureBookmarks());
 
 
 	//Desktop Integration
@@ -186,7 +189,6 @@ void CSettingsDlg::apply(){
 	config->setShowSysTrayIcon(checkBox_ShowSysTrayIcon->isChecked());
 	config->setMinimizeToTray(checkBox_MinimizeToTray->isChecked());
 	config->setSaveFileDlgHistory(checkBox_SaveFileDlgHistory->isChecked());
-	config->setEnableBookmarkMenu(checkBox_EnableBookmarkMenu->isChecked());
 	if(Radio_GroupTreeRestore->isChecked())config->setGroupTreeState(KpxConfig::RestoreLast);
 	else if(Radio_GroupTreeExpand->isChecked())config->setGroupTreeState(KpxConfig::ExpandAll);
 	else config->setGroupTreeState(KpxConfig::DoNothing);
@@ -204,6 +206,9 @@ void CSettingsDlg::apply(){
 	config->setClipboardTimeOut(SpinBox_ClipboardTime->value());
 	config->setShowPasswords(CheckBox_ShowPasswords->isChecked());
 	config->setShowPasswordsPasswordDlg(CheckBox_ShowPasswords_PasswordDlg->isChecked());
+	
+	//Features
+	config->setFeatureBookmarks(CheckBox_FeatureBookmarks->isChecked());
 
 	//Desktop Integration
 	PluginsModified=Label_IntPlugin_Info->isVisible();
diff --git a/src/forms/AboutDlg.ui b/src/forms/AboutDlg.ui
index 2ce6d81..2883a64 100644
--- a/src/forms/AboutDlg.ui
+++ b/src/forms/AboutDlg.ui
@@ -10,9 +10,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -33,12 +31,21 @@
    <string>About</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing" >
     <number>6</number>
    </property>
+   <property name="leftMargin" >
+    <number>9</number>
+   </property>
+   <property name="topMargin" >
+    <number>9</number>
+   </property>
+   <property name="rightMargin" >
+    <number>9</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>9</number>
+   </property>
    <item>
     <spacer>
      <property name="orientation" >
@@ -65,12 +72,21 @@
        <string>About</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>9</number>
+       </property>
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
        <item>
         <widget class="QLabel" name="label" >
          <property name="text" >
@@ -80,12 +96,21 @@
        </item>
        <item>
         <layout class="QHBoxLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
          <property name="spacing" >
           <number>6</number>
          </property>
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
+         </property>
+         <property name="rightMargin" >
+          <number>0</number>
+         </property>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
          <item>
           <spacer>
            <property name="orientation" >
@@ -104,12 +129,21 @@
          </item>
          <item>
           <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>0</number>
-           </property>
            <property name="spacing" >
             <number>12</number>
            </property>
+           <property name="leftMargin" >
+            <number>0</number>
+           </property>
+           <property name="topMargin" >
+            <number>0</number>
+           </property>
+           <property name="rightMargin" >
+            <number>0</number>
+           </property>
+           <property name="bottomMargin" >
+            <number>0</number>
+           </property>
            <item>
             <widget class="LinkLabel" name="label_2" >
              <property name="text" >
@@ -130,9 +164,9 @@
            <item>
             <widget class="QLabel" name="label_4" >
              <property name="text" >
-              <string>Copyright (C) 2005 - 2006 Tarek Saidi 
+              <string>Copyright (C) 2005 - 2007 KeePassX Team 
 KeePassX is distributed under the terms of the 
-General Public License (GPL) version 2 or later.</string>
+General Public License (GPL) version 2.</string>
              </property>
             </widget>
            </item>
@@ -147,12 +181,21 @@ General Public License (GPL) version 2 or later.</string>
        <string>Credits</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>9</number>
+       </property>
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
        <item>
         <widget class="QTextEdit" name="Edit_Thanks" >
          <property name="readOnly" >
@@ -167,12 +210,21 @@ General Public License (GPL) version 2 or later.</string>
        <string>Translation</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>9</number>
+       </property>
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
        <item>
         <widget class="QTextEdit" name="Edit_Translation" >
          <property name="readOnly" >
@@ -187,12 +239,21 @@ General Public License (GPL) version 2 or later.</string>
        <string>License</string>
       </attribute>
       <layout class="QVBoxLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>9</number>
+       </property>
+       <property name="topMargin" >
+        <number>9</number>
+       </property>
+       <property name="rightMargin" >
+        <number>9</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>9</number>
+       </property>
        <item>
         <widget class="QTextEdit" name="Edit_License" >
          <property name="readOnly" >
diff --git a/src/forms/AddBookmarkDlg.ui b/src/forms/AddBookmarkDlg.ui
new file mode 100644
index 0000000..e2897f6
--- /dev/null
+++ b/src/forms/AddBookmarkDlg.ui
@@ -0,0 +1,58 @@
+<ui version="4.0" >
+ <class>AddBookmarkDlg</class>
+ <widget class="QWidget" name="AddBookmarkDlg" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>497</width>
+    <height>148</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Add Bookmark</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QGridLayout" >
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Title:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1" >
+      <widget class="QLineEdit" name="Edit_Title" />
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>File:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QLineEdit" name="Edit_Filename" />
+     </item>
+     <item row="1" column="2" >
+      <widget class="QPushButton" name="Button_Browse" >
+       <property name="text" >
+        <string>Browse...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui
index 4d30a94..9871057 100644
--- a/src/forms/MainWindow.ui
+++ b/src/forms/MainWindow.ui
@@ -143,9 +143,15 @@
      <property name="title" >
       <string>&amp;Import from...</string>
      </property>
+    </widget>
+	<widget class="QMenu" name="menuBookmarks" >
+     <property name="title" >
+      <string>Bookmarks</string>
+     </property>
     </widget>
     <addaction name="FileNewAction" />
     <addaction name="FileOpenAction" />
+	<addaction name="menuBookmarks" />
     <addaction name="FileCloseAction" />
     <addaction name="separator" />
     <addaction name="FileSaveAction" />
@@ -237,6 +243,11 @@
    <addaction name="menuExtras" />
    <addaction name="menuHilfe" />
   </widget>
+  <action name="ManageBookmarksAction" >
+   <property name="text" >
+    <string>Manage Bookmarks...</string>
+   </property>
+  </action>
   <action name="FileOpenAction" >
    <property name="text" >
     <string>&amp;Open Database...</string>
@@ -544,6 +555,16 @@
     <string>Recycle Bin...</string>
    </property>
   </action>
+  <action name="AddBookmarkAction" >
+   <property name="text" >
+    <string>Add Bookmark...</string>
+   </property>
+  </action>
+  <action name="AddThisAsBookmarkAction" >
+   <property name="text" >
+    <string>Bookmark this Database...</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/forms/ManageBookmarksDlg.ui b/src/forms/ManageBookmarksDlg.ui
new file mode 100644
index 0000000..fa81c67
--- /dev/null
+++ b/src/forms/ManageBookmarksDlg.ui
@@ -0,0 +1,69 @@
+<ui version="4.0" >
+ <class>ManageBookmarksDlg</class>
+ <widget class="QDialog" name="ManageBookmarksDlg" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>452</width>
+    <height>360</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Manage Bookmarks</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QListWidget" name="ListWidget" />
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QToolButton" name="Button_Add" />
+       </item>
+       <item>
+        <widget class="QToolButton" name="Button_Delete" />
+       </item>
+       <item>
+        <widget class="QToolButton" name="Button_Edit" />
+       </item>
+       <item>
+        <widget class="QToolButton" name="Button_Up" />
+       </item>
+       <item>
+        <widget class="QToolButton" name="Button_Down" />
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>161</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/forms/PasswordDlg.ui b/src/forms/PasswordDlg.ui
index 97ed2b1..a8f6dc8 100644
--- a/src/forms/PasswordDlg.ui
+++ b/src/forms/PasswordDlg.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>PasswordDlg</class>
  <widget class="QDialog" name="PasswordDlg" >
   <property name="geometry" >
@@ -13,9 +10,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -41,293 +36,342 @@
   <property name="modal" >
    <bool>true</bool>
   </property>
-  <widget class="QLabel" name="Banner" >
-   <property name="geometry" >
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>578</width>
-     <height>50</height>
-    </rect>
-   </property>
-   <property name="sizePolicy" >
-    <sizepolicy>
-     <hsizetype>5</hsizetype>
-     <vsizetype>5</vsizetype>
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="text" >
-    <string>TextLabel</string>
-   </property>
-  </widget>
-  <widget class="QWidget" name="layoutWidget" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>240</y>
-     <width>561</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" >
-    <property name="margin" >
-     <number>0</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" >
-       <size>
-        <width>351</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QPushButton" name="ButtonOK" >
-      <property name="text" >
-       <string>OK</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="ButtonCancel" >
-      <property name="text" >
-       <string>Cancel</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="ButtonExit" >
-      <property name="text" >
-       <string>Exit</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QGroupBox" name="groupframe" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>80</y>
-     <width>561</width>
-     <height>151</height>
-    </rect>
-   </property>
-   <property name="sizePolicy" >
-    <sizepolicy>
-     <hsizetype>7</hsizetype>
-     <vsizetype>7</vsizetype>
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="title" >
-    <string>Key</string>
-   </property>
-   <widget class="QWidget" name="layoutWidget" >
-    <property name="geometry" >
-     <rect>
-      <x>10</x>
-      <y>20</y>
-      <width>541</width>
-      <height>123</height>
-     </rect>
-    </property>
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <layout class="QHBoxLayout" >
      <item>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>0</number>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Vertical</enum>
        </property>
-       <property name="spacing" >
-        <number>6</number>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>20</width>
+         <height>50</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
        </property>
-       <item row="1" column="0" >
-        <widget class="QLabel" name="Label_PasswordRep" >
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" >
+       <item>
+        <widget class="QLabel" name="Label_Bookmark" >
          <property name="text" >
-          <string>Password Repet.:</string>
+          <string>Last File</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QLineEdit" name="Edit_Password" />
-       </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="Label_Password" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>5</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item>
+        <widget class="QToolButton" name="Button_Bookmarks" >
+         <property name="popupMode" >
+          <enum>QToolButton::InstantPopup</enum>
          </property>
-         <property name="text" >
-          <string>Password:</string>
+         <property name="arrowType" >
+          <enum>Qt::NoArrow</enum>
          </property>
         </widget>
        </item>
-       <item row="0" column="2" >
-        <widget class="QToolButton" name="ButtonChangeEchoMode" >
-         <property name="text" >
-          <string>...</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="Edit_PasswordRep" />
-       </item>
       </layout>
      </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="textLabel1" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Maximum" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Enter a Password and/or choose a key file.</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupframe" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>Key</string>
+     </property>
+     <widget class="QWidget" name="layoutWidget" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>20</y>
+        <width>541</width>
+        <height>124</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" >
        <property name="spacing" >
         <number>6</number>
        </property>
+       <property name="leftMargin" >
+        <number>0</number>
+       </property>
+       <property name="topMargin" >
+        <number>0</number>
+       </property>
+       <property name="rightMargin" >
+        <number>0</number>
+       </property>
+       <property name="bottomMargin" >
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QLabel" name="Label_KeyFile" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>5</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+        <layout class="QGridLayout" >
+         <property name="leftMargin" >
+          <number>0</number>
          </property>
-         <property name="text" >
-          <string>Key file or directory:</string>
+         <property name="topMargin" >
+          <number>0</number>
          </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QComboBox" name="Combo_Dirs" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="rightMargin" >
+          <number>0</number>
          </property>
-         <property name="editable" >
-          <bool>true</bool>
+         <property name="bottomMargin" >
+          <number>0</number>
          </property>
-        </widget>
+         <property name="horizontalSpacing" >
+          <number>6</number>
+         </property>
+         <property name="verticalSpacing" >
+          <number>6</number>
+         </property>
+         <item row="1" column="0" >
+          <widget class="QLabel" name="Label_PasswordRep" >
+           <property name="text" >
+            <string>Password Repet.:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1" >
+          <widget class="QLineEdit" name="Edit_Password" />
+         </item>
+         <item row="0" column="0" >
+          <widget class="QLabel" name="Label_Password" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>Password:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2" >
+          <widget class="QToolButton" name="ButtonChangeEchoMode" >
+           <property name="text" >
+            <string>...</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" >
+          <widget class="QLineEdit" name="Edit_PasswordRep" />
+         </item>
+        </layout>
        </item>
        <item>
-        <widget class="QPushButton" name="ButtonBrowse" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>6</number>
          </property>
-         <property name="text" >
-          <string>&amp;Browse...</string>
+         <property name="leftMargin" >
+          <number>0</number>
          </property>
-         <property name="shortcut" >
-          <string>Alt+B</string>
+         <property name="topMargin" >
+          <number>0</number>
          </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QCheckBox" name="CheckBox_Both" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>0</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+         <property name="rightMargin" >
+          <number>0</number>
          </property>
-         <property name="text" >
-          <string>Use Password AND Key File</string>
+         <property name="bottomMargin" >
+          <number>0</number>
          </property>
-        </widget>
+         <item>
+          <widget class="QLabel" name="Label_KeyFile" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>Key file or directory:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="Combo_Dirs" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="editable" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="ButtonBrowse" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>&amp;Browse...</string>
+           </property>
+           <property name="shortcut" >
+            <string>Alt+B</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+        <layout class="QHBoxLayout" >
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <property name="leftMargin" >
+          <number>0</number>
+         </property>
+         <property name="topMargin" >
+          <number>0</number>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
+         <property name="rightMargin" >
+          <number>0</number>
          </property>
-        </spacer>
+         <property name="bottomMargin" >
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="CheckBox_Both" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string>Use Password AND Key File</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
        </item>
       </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <property name="leftMargin" >
+      <number>0</number>
+     </property>
+     <property name="topMargin" >
+      <number>0</number>
+     </property>
+     <property name="rightMargin" >
+      <number>0</number>
+     </property>
+     <property name="bottomMargin" >
+      <number>0</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>351</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonOK" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonCancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="ButtonExit" >
+       <property name="text" >
+        <string>Exit</string>
+       </property>
+      </widget>
      </item>
     </layout>
-   </widget>
-  </widget>
-  <widget class="QLabel" name="textLabel1" >
-   <property name="geometry" >
-    <rect>
-     <x>10</x>
-     <y>60</y>
-     <width>459</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="sizePolicy" >
-    <sizepolicy>
-     <hsizetype>7</hsizetype>
-     <vsizetype>4</vsizetype>
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="text" >
-    <string>Enter a Password and/or choose a key file.</string>
-   </property>
-  </widget>
+   </item>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>Edit_Password</tabstop>
   <tabstop>Edit_PasswordRep</tabstop>
   <tabstop>Combo_Dirs</tabstop>
-  <tabstop>CheckBox_Both</tabstop>
-  <tabstop>ButtonChangeEchoMode</tabstop>
   <tabstop>ButtonBrowse</tabstop>
+  <tabstop>CheckBox_Both</tabstop>
   <tabstop>ButtonOK</tabstop>
   <tabstop>ButtonCancel</tabstop>
   <tabstop>ButtonExit</tabstop>
+  <tabstop>Button_Bookmarks</tabstop>
+  <tabstop>ButtonChangeEchoMode</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/src/forms/SettingsDlg.ui b/src/forms/SettingsDlg.ui
index b0dba08..7e39081 100644
--- a/src/forms/SettingsDlg.ui
+++ b/src/forms/SettingsDlg.ui
@@ -846,7 +846,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QCheckBox" name="checkBox_EnableBookmarkMenu" >
+        <widget class="QCheckBox" name="CheckBox_FeatureBookmarks" >
          <property name="text" >
           <string>Bookmarks</string>
          </property>
diff --git a/src/lib/EntryView.cpp b/src/lib/EntryView.cpp
index 2e6daf2..8c267ac 100644
--- a/src/lib/EntryView.cpp
+++ b/src/lib/EntryView.cpp
@@ -462,7 +462,6 @@ void KeepassEntryView::OnColumnMoved(int LogIndex,int OldVisIndex,int NewVisInde
 }
 
 int KeepassEntryView::logicalColIndex(int LstIndex){
-	qDebug("%i",LstIndex);
 	int c=-1;
 	for(int i=0;i<NUM_COLUMNS;i++){
 		if(Columns.at(i))c++;
diff --git a/src/lib/bookmarks.cpp b/src/lib/bookmarks.cpp
new file mode 100644
index 0000000..892e96d
--- /dev/null
+++ b/src/lib/bookmarks.cpp
@@ -0,0 +1,127 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Tarek Saidi                                     *
+ *   tarek.saidi@arcor.de                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License.               *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QFile>
+#include "bookmarks.h"
+#include "main.h"
+#define CSTR(x)(x.toUtf8().data())
+
+QList<KpxBookmarks::BookmarkEntry> KpxBookmarks::Bookmarks;
+QString KpxBookmarks::filename;
+
+bool KpxBookmarks::load(const QString& _filename){
+	/* 
+      Fileformat:
+	   "Title1" "Path1"\n
+	   "Title2" "Path2"\n
+		...	 
+	*/
+	
+	filename=_filename;
+	QFile file(filename);
+	if(!file.exists()){
+		return true;
+	}
+	if(!file.open(QIODevice::ReadOnly)){
+		qWarning("Reading bookmarks failed: %s",CSTR(decodeFileError(file.error())));
+		return false;		
+	}
+	QString content=QString::fromUtf8(file.readAll());
+	file.close();
+	content.replace("\r","");
+	QStringList lines=content.split("\n");
+	for(int i=0;i<lines.size();i++){
+		if(lines[i].simplified()==QString()) continue; //skip empty line
+		if(lines[i].count("\"")!=4){
+			qWarning("Bookmark parsing error: Skipping line %i.",i);
+			continue;		
+		}
+		int a_title=lines[i].indexOf("\"");
+		int b_title=lines[i].indexOf("\"",a_title+1);
+		int a_path=lines[i].indexOf("\"",b_title+1);
+		int b_path=lines[i].indexOf("\"",a_path+1);
+		BookmarkEntry entry;
+		entry.Title=lines[i].mid(a_title+1,b_title-a_title-1);
+		entry.Path=lines[i].mid(a_path+1,b_path-a_path-1);
+		Bookmarks << entry;
+	}
+	return true;		
+}
+
+int KpxBookmarks::count(){
+	return Bookmarks.size();
+}
+
+QString KpxBookmarks::title(int i){
+	return Bookmarks[i].Title;
+}
+
+QString KpxBookmarks::path(int i){
+	return Bookmarks[i].Path;
+}
+
+
+int KpxBookmarks::add(const QString& Title,const QString& Path){
+	BookmarkEntry entry;
+	entry.Title=Title;
+	entry.Path=Path;
+	entry.Index=Bookmarks.size();
+	Bookmarks<<entry;
+	save();
+	return Bookmarks.size()-1;
+}
+
+bool KpxBookmarks::save(){
+	QFile file(filename);
+	if(!file.exists()){
+		return false;
+	}
+	if(!file.open(QIODevice::WriteOnly | QIODevice::Truncate)){
+		qWarning("Writing bookmarks failed: %s",CSTR(decodeFileError(file.error())));
+		return false;		
+	}
+	QString data;
+	for(int i=0;i<Bookmarks.size();i++){
+		data+=QString("\"%1\" \"%2\"\n").arg(Bookmarks[i].Title)
+				                        .arg(Bookmarks[i].Path);		
+	}
+	file.write(data.toUtf8());
+	file.close();	
+}
+
+void KpxBookmarks::remove(int index){
+	Bookmarks.removeAt(index);
+	save();
+}
+
+void KpxBookmarks::edit(const QString& Title,const QString& Path,int i){
+	Bookmarks[i].Title=Title;
+	Bookmarks[i].Path=Path;
+	save();
+}
+
+
+void KpxBookmarks::resort(QList<int> order){
+	QList<BookmarkEntry> NewList;
+	for(int i=0;i<order.size();i++){
+		NewList << Bookmarks[order[i]];		
+	}
+	Bookmarks=NewList;
+	save();
+}
\ No newline at end of file
diff --git a/src/lib/bookmarks.h b/src/lib/bookmarks.h
new file mode 100644
index 0000000..ef6095b
--- /dev/null
+++ b/src/lib/bookmarks.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Tarek Saidi                                     *
+ *   tarek.saidi@arcor.de                                                  *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License.               *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef _BOOKMARKS_H_
+#define _BOOKMARKS_H_
+
+#include <QString>
+#include <QList>
+
+class KpxBookmarks {	
+	public:
+		static bool load(const QString& file);
+		static int add(const QString& Title,const QString& Path);
+		static void remove(int id);
+		static void edit(const QString& Title,const QString& Path, int Index);
+		static int count();
+		static void resort(QList<int> order);
+		static QString title(int Index);
+		static QString path(int Index);
+	private:
+		static bool save();
+		class BookmarkEntry {
+			public:
+				QString Title;
+				QString Path;
+				int Index;		
+		};
+		static QList<BookmarkEntry> Bookmarks;
+		static QString filename;
+
+};
+
+
+#endif
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index e6b714a..3be4dcd 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -43,6 +43,7 @@
 
 #include "main.h"
 #include "lib/FileDialogs.h"
+#include "lib/bookmarks.h"
 #include "KpxConfig.h"
 #include "Kdb3Database.h"
 #include "mainwindow.h"
@@ -216,6 +217,7 @@ int main(int argc, char **_argv)
 	else loadDefaultDetailViewTemplate();
 
 	loadImages();
+	KpxBookmarks::load(QDir::homePath()+"/.keepassx/bookmarks");
 	initYarrow(); //init random number generator
 	SecString::generateSessionKey();
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9e6f303..4e299e6 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -42,6 +42,7 @@
 #include "lib/random.h"
 #include "lib/AutoType.h"
 #include "lib/FileDialogs.h"
+#include "lib/bookmarks.h"
 #include "import/Import_PwManager.h"
 #include "import/Import_KWalletXml.h"
 #include "import/Import_KeePassX_Xml.h"
@@ -59,13 +60,11 @@
 #include "dialogs/CustomizeDetailViewDlg.h"
 #include "dialogs/ExpiredEntriesDlg.h"
 #include "dialogs/TrashCanDlg.h"
+#include "dialogs/AddBookmarkDlg.h"
+#include "dialogs/ManageBookmarksDlg.h"
 
-//#include <QtDBus/QtDBus>
 #include <iostream>
 
-//QDBusServer* dbusServer;
-//QDBusConnection* dbusCon;
-
 Import_KeePassX_Xml import_KeePassX_Xml;
 Import_PwManager import_PwManager;
 Import_KWalletXml import_KWalletXml;
@@ -116,21 +115,8 @@ 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");
-
-	// DBus Server of Qt 4.2 does not work - 4.3 snapshot seems to work fine
-	/*
-	//dbusServer=new QDBusServer("unix:path=/tmp/KpxBus",this);
-	//qDebug("DBUS: %s",dbusServer->lastError().message().toAscii().data());
-	//QDBusConnection::connectToBus("unix:path=/tmp/KpxBus","MyKpxConnection");
-	//qDebug("DBUS: %s",dbusCon->lastError().message().toAscii().data());
-
-	KpxFirefox* fox=new KpxFirefox(NULL);
-	new KpxFirefoxAdaptor(fox);
-	QDBusConnection::sessionBus().registerService("org.keepassx.firefoxservice");
-	QDBusConnection::sessionBus().registerObject("/KpxFirefox",fox);
-	qDebug("DBUS: %s",QDBusConnection::sessionBus().lastError().message().toAscii().data());
-	*/
-
+	
+	createBookmarkActions();
 }
 
 void KeepassMainWindow::setupConnections(){
@@ -145,6 +131,7 @@ void KeepassMainWindow::setupConnections(){
 	connect(FileUnLockWorkspaceAction,SIGNAL(triggered()), this, SLOT(OnUnLockWorkspace()));
 	connect(menuImport,SIGNAL(triggered(QAction*)),this,SLOT(OnImport(QAction*)));
 	connect(menuExport,SIGNAL(triggered(QAction*)),this,SLOT(OnExport(QAction*)));
+	connect(menuBookmarks,SIGNAL(triggered(QAction*)),this,SLOT(OnBookmarkTriggered(QAction*)));
 
 	connect(EditNewGroupAction, SIGNAL(triggered()), GroupView, SLOT(OnNewGroup()));
 	connect(EditEditGroupAction, SIGNAL(triggered()), GroupView, SLOT(OnEditGroup()));
@@ -252,6 +239,10 @@ void KeepassMainWindow::setupIcons(){
     EditAutoTypeAction->setIcon(getIcon("autotype"));
 	HelpHandbookAction->setIcon(getIcon("manual"));
 	HelpAboutAction->setIcon(getIcon("help"));
+	menuBookmarks->menuAction()->setIcon(getIcon("bookmark_folder"));
+	AddThisAsBookmarkAction->setIcon(getIcon("bookmark"));
+	AddBookmarkAction->setIcon(getIcon("bookmark_add"));
+	ManageBookmarksAction->setIcon(getIcon("bookmark_edit"));
 	SysTray->setIcon(getIcon("keepassx_large"));
 	if(config->showSysTrayIcon())
 		SysTray->show();
@@ -350,6 +341,7 @@ void KeepassMainWindow::setupMenus(){
 #endif
 
 	ExtrasTrashCanAction->setVisible(false); //For KP 2.x only
+	menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
 }
 
 void KeepassMainWindow::setupDatabaseConnections(IDatabase* DB){
@@ -367,12 +359,14 @@ void KeepassMainWindow::openDatabase(QString filename,bool IsAuto){
 		config->setLastKeyLocation(QString());
 		config->setLastKeyType(PASSWORD);}
 	db=dynamic_cast<IDatabase*>(new Kdb3Database());
-	CPasswordDialog PasswordDlg(this,db,IsAuto,false);
-	PasswordDlg.setWindowTitle(filename);
+	CPasswordDialog PasswordDlg(this,filename,db,IsAuto,false);
 	switch(PasswordDlg.exec()){
 		case 0: return;
 		case 2: Start=false; return;
 	}
+	if(PasswordDlg.BookmarkFilename!=QString())
+		filename=PasswordDlg.BookmarkFilename;
+
 	GroupView->db=db;
 	EntryView->db=db;
 	setupDatabaseConnections(db);
@@ -432,7 +426,7 @@ bool KeepassMainWindow::closeDatabase(){
 void KeepassMainWindow::OnFileNewKdb(){
 	IDatabase* db_new=dynamic_cast<IDatabase*>(new Kdb3Database());
 	db_new->create();
-	CPasswordDialog dlg(this,db_new,false,true);
+	CPasswordDialog dlg(this,QString(),db_new,false,true);
 	dlg.setWindowTitle(tr("New Database"));
 	if(dlg.exec()==1){
 		if(FileOpen)
@@ -495,6 +489,7 @@ EntryView->setEnabled(IsOpen);
 DetailView->setEnabled(IsOpen);
 QuickSearchEdit->setEnabled(IsOpen);
 ExtrasShowExpiredEntriesAction->setEnabled(IsOpen);
+AddThisAsBookmarkAction->setEnabled(IsOpen);
 
 if(!IsOpen){
     EditNewGroupAction->setEnabled(false);
@@ -756,7 +751,7 @@ if(dlg.exec())setStateFileModified(true);
 }
 
 void KeepassMainWindow::OnFileChangeKey(){
-	CPasswordDialog dlg(this,db,false,true);
+	CPasswordDialog dlg(this,QString(),db,false,true);
 	if(dlg.exec())
 		setStateFileModified(true);
 }
@@ -777,7 +772,7 @@ void KeepassMainWindow::OnImport(QAction* action){
 	IDatabase* tmpdb=dynamic_cast<IDatabase*>(new Kdb3Database());
 	tmpdb->create();
 	if(dynamic_cast<IImport*>(action->data().value<QObject*>())->importDatabase(this,tmpdb)){
-			CPasswordDialog dlg(this,tmpdb,false,true);
+			CPasswordDialog dlg(this,QString(),tmpdb,false,true);
 			dlg.setWindowTitle(tr("Set Master Key"));
 			if(!dlg.exec()){
 				delete tmpdb;
@@ -890,6 +885,7 @@ void KeepassMainWindow::OnExtrasSettings(){
 	if(dlg.exec()==QDialog::Accepted){
 		EntryView->setAlternatingRowColors(config->alternatingRowColors());
 		SysTray->setVisible(config->showSysTrayIcon());
+		menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
 	}
 }
 
@@ -1029,3 +1025,55 @@ void KeepassMainWindow::OnUnLockWorkspace(){
 		IsLocked=true;
 	}
 }
+
+void KeepassMainWindow::OnBookmarkTriggered(QAction* action){
+	if(action==AddBookmarkAction){
+		AddBookmarkDlg dlg(this);
+		if(dlg.exec()){
+			int id=dlg.ItemID;	
+			QAction* action=new QAction(this);
+			action->setData(id);
+			action->setText(KpxBookmarks::title(id));
+			action->setIcon(getIcon("document"));
+			menuBookmarks->addAction(action);	
+		}
+		return;
+	}
+	
+	if(action==ManageBookmarksAction){
+		ManageBookmarksDlg dlg(this);
+		dlg.exec();
+		menuBookmarks->clear();
+		createBookmarkActions();
+		return;			
+	}
+	
+	if(action==AddThisAsBookmarkAction){
+		AddBookmarkDlg dlg(this,db->file()->fileName());
+		if(dlg.exec()){
+			int id=dlg.ItemID;	
+			QAction* action=new QAction(this);
+			action->setData(id);
+			action->setText(KpxBookmarks::title(id));
+			action->setIcon(getIcon("document"));
+			menuBookmarks->addAction(action);	
+		}	
+		return;
+	}	
+	openDatabase(KpxBookmarks::path(action->data().toInt()));
+	
+}
+
+void KeepassMainWindow::createBookmarkActions(){
+	menuBookmarks->addAction(AddBookmarkAction);
+	menuBookmarks->addAction(AddThisAsBookmarkAction);
+	menuBookmarks->addAction(ManageBookmarksAction);
+	menuBookmarks->addSeparator();
+	for(int i=0;i<KpxBookmarks::count();i++){
+		QAction* action=new QAction(this);
+		action->setData(i);
+		action->setText(KpxBookmarks::title(i));
+		action->setIcon(getIcon("document"));
+		menuBookmarks->addAction(action);		
+	}	
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 8666ffb..9c687da 100755
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -69,6 +69,7 @@ class KeepassMainWindow : public QMainWindow, public Ui_MainWindow{
 		void OnFileSettings();
 		void OnFileChangeKey();
 		void OnFileExit();
+		void OnBookmarkTriggered(QAction* action);
 		void OnSearch();
 		void OnGroupSearch();
 		void OnViewShowToolbar(bool);
@@ -120,6 +121,7 @@ class KeepassMainWindow : public QMainWindow, public Ui_MainWindow{
 		void updateDetailView();
 		void exportDatabase(IExport* exporter,QStringList filters);
 		void saveLastFilename(const QString& filename);
+		void createBookmarkActions();
 		QLineEdit* QuickSearchEdit;
 		QLabel* StatusBarGeneral;
 		QLabel* StatusBarSelection;
diff --git a/src/src.pro b/src/src.pro
index 27ccdac..8f70b6b 100755
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,20 +14,24 @@ INSTALLS += target data
 data.files += ../share/keepass/*
 TARGET = ../bin/keepassx
 
-unix: !macx{
+isEmpty(PREFIX){
+	PREFIX = /usr
+}
+
+unix : !macx {
         target.path = $${PREFIX}/bin
         data.path = $${PREFIX}/share/keepass
         LIBS += -lXtst -lQtDBus
         SOURCES += lib/AutoType_X11.cpp
     }
 
-macx{
+macx {
     target.path = /Applications
     data.path = /Applications/keepass.app/Contents/share/keepass
     SOURCES += lib/AutoType_X11.cpp
 }
 
-win32{
+win32 {
     SOURCES += lib/AutoType_Win.cpp
     TARGET = ../$$TARGET
     QMAKE_LINK_OBJECT_SCRIPT = ../build/$$QMAKE_LINK_OBJECT_SCRIPT
@@ -50,7 +54,9 @@ FORMS += forms/EditGroupDlg.ui \
 	 forms/CalendarDlg.ui \
 	 forms/TrashCanDlg.ui \
 	 forms/ExpiredEntriesDlg.ui \
-	 forms/WorkspaceLockedWidget.ui
+	 forms/WorkspaceLockedWidget.ui \
+ forms/AddBookmarkDlg.ui \
+ forms/ManageBookmarksDlg.ui
 TRANSLATIONS += translations/keepass-de_DE.ts \
 		translations/keepass-ru_RU.ts \
 		translations/keepass-es_ES.ts \
@@ -113,7 +119,10 @@ HEADERS += lib/IniReader.h \
 	   plugins/interfaces/IGnomeInit.h \
 	   plugins/interfaces/IIconTheme.h \
 	   KpxConfig.h \
-           KpxFirefox.h
+           KpxFirefox.h \
+ 	   dialogs/AddBookmarkDlg.h \
+ lib/bookmarks.h \
+ dialogs/ManageBookmarksDlg.h
 SOURCES += lib/UrlLabel.cpp \
            main.cpp \
            mainwindow.cpp \
@@ -161,7 +170,10 @@ SOURCES += lib/UrlLabel.cpp \
 	   crypto/yarrow.cpp \
 	   lib/WaitAnimationWidget.cpp \
 	   KpxConfig.cpp \
-           KpxFirefox.cpp
+           KpxFirefox.cpp \
+           dialogs/AddBookmarkDlg.cpp \
+ lib/bookmarks.cpp \
+dialogs/ManageBookmarksDlg.cpp
 RESOURCES += res/resources.qrc
 MOC_DIR = ../build/moc
 UI_DIR = ../build/ui
@@ -171,9 +183,8 @@ CONFIG += debug \
 qt \
 thread \
 warn_off \
-dbus \
 assistant
-QT += dbus xml
+QT += xml
 TEMPLATE = app
 INCLUDEPATH += . \
 lib \