thooge
/
keepassx1
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

completed tree state restore function,

Browse Source 
visual order of entries will now affect their saving order,
changed the behavior of the entry view header.

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@124 b624d157-de02-0410-bad0-e51aec6abb33
master
tarek_saidi 17 years ago
parent ee97e3c197
commit 28ba242090
23 changed files with 658 additions and 357 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 21
      src/Database.cpp
  2. 23
      src/Database.h
  3. 221
      src/StandardDatabase.cpp
  4. 18
      src/StandardDatabase.h
  5. 37
      src/dialogs/PasswordDlg.cpp
  6. 9
      src/dialogs/SettingsDlg.cpp
  7. 43
      src/export/Export_Txt.cpp
  8. 11
      src/export/Export_Txt.h
  9. 3
      src/forms/MainWindow.ui
  10. 9
      src/forms/SettingsDlg.ui
  11. 5
      src/import/Import_KWalletXml.h
  12. 22
      src/lib/EntryView.cpp
  13. 1
      src/lib/EntryView.h
  14. 93
      src/lib/FileDialogs.cpp
  15. 51
      src/lib/FileDialogs.h
  16. 17
      src/lib/GroupView.cpp
  17. 4
      src/lib/GroupView.h
  18. 12
      src/main.cpp
  19. 2
      src/main.h
  20. 104
      src/mainwindow.cpp
  21. 2
      src/mainwindow.h
  22. 2
      src/plugins/interfaces/IFileDialog.h
  23. 305
      src/src.pro

21
src/Database.cpp
Unescape View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* mail@tarek-saidi.de * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
@ -87,18 +87,19 @@ else return date().toString(format);
CEntry::CEntry(){ CEntry::CEntry(){
Image=0; Image=0;
GroupId=0; GroupId=0;
Creation=QDateTime::currentDateTime(); Creation=QDateTime::currentDateTime();
LastMod=QDateTime::currentDateTime(); LastMod=QDateTime::currentDateTime();
LastAccess=QDateTime::currentDateTime(); LastAccess=QDateTime::currentDateTime();
Expire=QDateTime(QDate(2999,12,28),QTime(23,59,59)); //Never Expire=QDateTime(QDate(2999,12,28),QTime(23,59,59)); //Never
Binary=QByteArray(); Binary=QByteArray();
} }
CGroup::CGroup(){ CGroup::CGroup(){
Image=0; Image=0;
IsExpanded=false;
} }

23
src/Database.h
Unescape View File

@ -103,6 +103,7 @@ public:
quint32 Image; quint32 Image;
QString Title; QString Title;
bool operator==(const CGroup& other) const; bool operator==(const CGroup& other) const;
bool IsExpanded;
}; };
@ -144,14 +145,25 @@ public:
virtual KpxDateTime expire()=0; virtual KpxDateTime expire()=0;
virtual QByteArray binary()=0; virtual QByteArray binary()=0;
virtual quint32 binarySize()=0; virtual quint32 binarySize()=0;
//! \return the index of the entry amongst the entries of its group. The index of the first entry is 0. //! \return the index of the entry amongst the entries of its group. The index of the first entry is 0.
virtual int index()const=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.
*/
virtual void setVisualIndexDirectly(int index)=0;
/*! Tests the validity of the handle. /*! 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 entry was deleted.*/ \return TRUE if the handle is valid and FALSE if the handle is invalid e.g. because the associated entry was deleted.*/
virtual bool isValid()const=0; virtual bool isValid()const=0;
virtual bool operator<(const IEntryHandle*& other)=0;
}; };
@ -218,6 +230,9 @@ public:
/*! \return the level of the group in the group tree. This level is tantamount to the number of parents that the group has. */ /*! \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 int level()=0;
virtual bool expanded()=0;
virtual void setExpanded(bool)=0;
}; };
@ -225,7 +240,7 @@ public:
/*! /*!
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{ class IDatabase:public QObject{
public: public:
virtual ~IDatabase(){}; virtual ~IDatabase(){};

221
src/StandardDatabase.cpp
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2006 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* keepassx@gmail.com * * keepassx@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -17,6 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "global.h" #include "global.h"
#include <iostream> #include <iostream>
#include <time.h> #include <time.h>
@ -38,6 +39,19 @@ using namespace std;
#define UNEXP_ERROR error=QString("Unexpected error in: %1, Line:%2").arg(__FILE__).arg(__LINE__); #define UNEXP_ERROR error=QString("Unexpected error in: %1, Line:%2").arg(__FILE__).arg(__LINE__);
const QDateTime Date_Never(QDate(2999,12,28),QTime(23,59,59)); const QDateTime Date_Never(QDate(2999,12,28),QTime(23,59,59));
bool EntryHandleLessThan(const IEntryHandle* This,const IEntryHandle* Other){
if(!This->isValid() && Other->isValid())return true;
if(This->isValid() && !Other->isValid())return false;
if(!This->isValid() && !Other->isValid())return false;
return This->visualIndex()<Other->visualIndex();
}
bool StdEntryLessThan(const StandardDatabase::StdEntry& This,const StandardDatabase::StdEntry& Other){
return This.Index<Other.Index;
}
QString StandardDatabase::getError(){ QString StandardDatabase::getError(){
@ -89,8 +103,15 @@ int StandardDatabase::numIcons(){
bool StandardDatabase::parseMetaStream(const StdEntry& entry){ bool StandardDatabase::parseMetaStream(const StdEntry& entry){
if(entry.Comment=="KPX_CUSTOM_ICONS_3") qDebug("%s",entry.Comment.toUtf8().data());
return parseCustomIconsMetaStream(entry.Binary);
if(entry.Comment=="KPX_GROUP_TREE_STATE"){
parseGroupTreeStateMetaStream(entry.Binary);
return true;}
if(entry.Comment=="KPX_CUSTOM_ICONS_3"){
parseCustomIconsMetaStream(entry.Binary);
return true;}
if(entry.Comment=="KPX_CUSTOM_ICONS_2") if(entry.Comment=="KPX_CUSTOM_ICONS_2")
return parseCustomIconsMetaStreamV2(entry.Binary); return parseCustomIconsMetaStreamV2(entry.Binary);
@ -123,58 +144,98 @@ bool StandardDatabase::parseCustomIconsMetaStreamV2(const QByteArray& dta){
return true; return true;
} }
bool StandardDatabase::parseCustomIconsMetaStream(const QByteArray& dta){ void StandardDatabase::parseCustomIconsMetaStream(const QByteArray& dta){
qDebug("CuIcMeSt v3 found."); //Rev 3
quint32 NumIcons,NumEntries,NumGroups,offset;
//Rev 3 memcpyFromLEnd32(&NumIcons,dta.data());
quint32 NumIcons,NumEntries,NumGroups,offset; memcpyFromLEnd32(&NumEntries,dta.data()+4);
memcpyFromLEnd32(&NumIcons,dta.data()); memcpyFromLEnd32(&NumGroups,dta.data()+8);
memcpyFromLEnd32(&NumEntries,dta.data()+4); offset=12;
memcpyFromLEnd32(&NumGroups,dta.data()+8); CustomIcons.clear();
offset=12; for(int i=0;i<NumIcons;i++){
CustomIcons.clear(); CustomIcons << QPixmap();
for(int i=0;i<NumIcons;i++){ quint32 Size;
CustomIcons << QPixmap(); memcpyFromLEnd32(&Size,dta.data()+offset);
quint32 Size; if(offset+Size > dta.size()){
memcpyFromLEnd32(&Size,dta.data()+offset); CustomIcons.clear();
if(offset+Size > dta.size()){ qWarning("Discarded metastream KPX_CUSTOM_ICONS_3 because of a parsing error.");
CustomIcons.clear(); return;}
return false;} offset+=4;
offset+=4; if(!CustomIcons.back().loadFromData((const unsigned char*)dta.data()+offset,Size,"PNG")){
if(!CustomIcons.back().loadFromData((const unsigned char*)dta.data()+offset,Size,"PNG")){ CustomIcons.clear();
CustomIcons.clear(); qWarning("Discarded metastream KPX_CUSTOM_ICONS_3 because of a parsing error.");
return false;} return;}
offset+=Size; offset+=Size;
if(offset > dta.size()){ if(offset > dta.size()){
CustomIcons.clear(); CustomIcons.clear();
return false;} qWarning("Discarded metastream KPX_CUSTOM_ICONS_3 because of a parsing error.");
} return;}
for(int i=0;i<NumEntries;i++){
quint32 Icon;
KpxUuid EntryUuid;
EntryUuid.fromRaw(dta.data()+offset);
offset+=16;
memcpyFromLEnd32(&Icon,dta.data()+offset);
offset+=4;
StdEntry* entry=getEntry(EntryUuid);
if(entry){
entry->OldImage=entry->Image;
entry->Image=Icon;
} }
} for(int i=0;i<NumEntries;i++){
for(int i=0;i<NumGroups;i++){ quint32 Icon;
quint32 GroupId,Icon; KpxUuid EntryUuid;
memcpyFromLEnd32(&GroupId,dta.data()+offset); EntryUuid.fromRaw(dta.data()+offset);
offset+=4; offset+=16;
memcpyFromLEnd32(&Icon,dta.data()+offset); memcpyFromLEnd32(&Icon,dta.data()+offset);
offset+=4; offset+=4;
StdGroup* Group=getGroup(GroupId); StdEntry* entry=getEntry(EntryUuid);
if(Group){ if(entry){
Group->OldImage=Group->Image; entry->OldImage=entry->Image;
Group->Image=Icon; entry->Image=Icon;
}
}
for(int i=0;i<NumGroups;i++){
quint32 GroupId,Icon;
memcpyFromLEnd32(&GroupId,dta.data()+offset);
offset+=4;
memcpyFromLEnd32(&Icon,dta.data()+offset);
offset+=4;
StdGroup* Group=getGroup(GroupId);
if(Group){
Group->OldImage=Group->Image;
Group->Image=Icon;
}
}
return;
}
void StandardDatabase::parseGroupTreeStateMetaStream(const QByteArray& dta){
if(dta.size()<4){qWarning("Discarded metastream KPX_GROUP_TREE_STATE because of a parsing error."); return;}
quint32 Num;
memcpyFromLEnd32(&Num,dta.data());
if(Num*5!=dta.size()-4){qWarning("Discarded metastream KPX_GROUP_TREE_STATE because of a parsing error."); return;}
TreeStateMetaStream.clear();
for(int i=0;i<Num;i++){
quint32 GroupID;
quint8 IsExpanded;
memcpyFromLEnd32(&GroupID,dta.data()+4+5*i);
memcpy(&IsExpanded,dta.data()+8+5*i,1);
TreeStateMetaStream.insert(GroupID,(bool)IsExpanded);
} }
return;
} }
return true;
void StandardDatabase::createGroupTreeStateMetaStream(StdEntry* e){
e->BinaryDesc="bin-stream";
e->Title="Meta-Info";
e->Username="SYSTEM";
e->Comment="KPX_GROUP_TREE_STATE";
e->Url="$";
e->OldImage=0;
e->Image=0;
if(Groups.size())e->GroupId=Groups[0].Id;
QByteArray bin;
quint32 Num=Groups.size();
bin.resize(Num*5+4);
memcpyToLEnd32(bin.data(),&Num);
for(int i=0;i<Num;i++){
memcpyToLEnd32(bin.data()+4+5*i,&Groups[i].Id);
if(Groups[i].IsExpanded)
bin.data()[8+5*i]=1;
else
bin.data()[8+5*i]=0;
}
e->Binary=bin;
} }
StandardDatabase::StdEntry* StandardDatabase::getEntry(const KpxUuid& uuid){ StandardDatabase::StdEntry* StandardDatabase::getEntry(const KpxUuid& uuid){
@ -319,11 +380,16 @@ bool StandardDatabase::createGroupTree(QList<quint32>& Levels){
Groups[i].Parent->Childs.append(&Groups[i]); Groups[i].Parent->Childs.append(&Groups[i]);
} }
QList<int> EntryIndexCounter;
for(int i=0;i<Groups.size();i++)EntryIndexCounter << 0;
for(int e=0;e<Entries.size();e++){ for(int e=0;e<Entries.size();e++){
for(int g=0;g<Groups.size();g++){ for(int g=0;g<Groups.size();g++){
if(Entries[e].GroupId==Groups[g].Id){ if(Entries[e].GroupId==Groups[g].Id){
Groups[g].Entries.append(&Entries[e]); Groups[g].Entries.append(&Entries[e]);
Entries[e].Group=&Groups[g]; Entries[e].Group=&Groups[g];
Entries[e].Index=EntryIndexCounter[g];
EntryIndexCounter[g]++;
} }
} }
} }
@ -335,7 +401,7 @@ void StandardDatabase::createHandles(){
for(int i=0;i<Groups.size();i++){ for(int i=0;i<Groups.size();i++){
GroupHandles.append(GroupHandle(this)); GroupHandles.append(GroupHandle(this));
Groups[i].Handle=&GroupHandles.back(); Groups[i].Handle=&GroupHandles.back();
GroupHandles.back().Group=&Groups[i]; GroupHandles.back().Group=&Groups[i];
} }
for(int i=0;i<Entries.size();i++){ for(int i=0;i<Entries.size();i++){
EntryHandles.append(EntryHandle(this)); EntryHandles.append(EntryHandle(this));
@ -344,6 +410,21 @@ void StandardDatabase::createHandles(){
} }
} }
void StandardDatabase::restoreGroupTreeState(){
if(settings->value("GroupTreeState","ExpandAll")=="ExpandAll"){
for(int i=0;i<Groups.size();i++){
Groups[i].IsExpanded=true;
}
}
else
if(settings->value("GroupTreeState","ExpandAll")=="Restore"){
for(int i=0;i<Groups.size();i++){
if(TreeStateMetaStream.contains(Groups[i].Id))
Groups[i].IsExpanded=TreeStateMetaStream.value(Groups[i].Id);
}
}
}
bool StandardDatabase::load(QString filename){ bool StandardDatabase::load(QString filename){
unsigned long total_size,crypto_size; unsigned long total_size,crypto_size;
quint32 Signature1,Signature2,Version,NumGroups,NumEntries,Flags; quint32 Signature1,Signature2,Version,NumGroups,NumEntries,Flags;
@ -511,6 +592,7 @@ for(int i=0;i<Entries.size();i++){
UnknownMetaStreams << Entries[i]; UnknownMetaStreams << Entries[i];
Entries.removeAt(i); Entries.removeAt(i);
i--;} i--;}
} }
int* EntryIndices=new int[Groups.size()]; int* EntryIndices=new int[Groups.size()];
@ -526,6 +608,7 @@ for(int g=0;g<Groups.size();g++){
} }
delete [] EntryIndices; delete [] EntryIndices;
createHandles(); createHandles();
restoreGroupTreeState();
return true; return true;
} }
@ -727,20 +810,15 @@ QList<IEntryHandle*> StandardDatabase::entries(){
return handles; return handles;
} }
bool StandardDatabase::EntryHandle::operator<(const IEntryHandle*& other){
if(!isValid() && other->isValid())return true;
if(isValid() && !other->isValid())return false;
if(!isValid() && !other->isValid())return false;
return index()<other->index();
}
QList<IEntryHandle*> StandardDatabase::entries(IGroupHandle* group){ QList<IEntryHandle*> StandardDatabase::entries(IGroupHandle* group){
QList<IEntryHandle*> handles; QList<IEntryHandle*> handles;
for(int i=0; i<EntryHandles.size(); i++){ for(int i=0; i<EntryHandles.size(); i++){
if(EntryHandles[i].isValid() && (EntryHandles[i].group()==group)) if(EntryHandles[i].isValid() && (EntryHandles[i].group()==group))
handles.append(&EntryHandles[i]); handles.append(&EntryHandles[i]);
} }
qSort(handles.begin(),handles.end()); qSort(handles.begin(),handles.end(),EntryHandleLessThan);
foreach(IEntryHandle* h,handles){qDebug("+ %s (%i)",h->title().toUtf8().data(),(int)h->isValid());}
return handles; return handles;
} }
@ -859,9 +937,18 @@ KpxDateTime StandardDatabase::EntryHandle::lastAccess(){return Entry->LastAccess
KpxDateTime StandardDatabase::EntryHandle::expire(){return Entry->Expire;} KpxDateTime StandardDatabase::EntryHandle::expire(){return Entry->Expire;}
QByteArray StandardDatabase::EntryHandle::binary(){return Entry->Binary;} QByteArray StandardDatabase::EntryHandle::binary(){return Entry->Binary;}
quint32 StandardDatabase::EntryHandle::binarySize(){return Entry->Binary.size();} quint32 StandardDatabase::EntryHandle::binarySize(){return Entry->Binary.size();}
int StandardDatabase::EntryHandle::index()const{return Entry->Index;} int StandardDatabase::EntryHandle::visualIndex()const{return Entry->Index;}
void StandardDatabase::EntryHandle::setVisualIndexDirectly(int i){Entry->Index=i;}
bool StandardDatabase::EntryHandle::isValid()const{return valid;} bool StandardDatabase::EntryHandle::isValid()const{return valid;}
void StandardDatabase::EntryHandle::setVisualIndex(int index){
QList<IEntryHandle*>Entries=pDB->entries(Entry->Group->Handle);
Entries.move(visualIndex(),index);
for(int i=0;i<Entries.size();i++){
dynamic_cast<StandardDatabase::EntryHandle*>(Entries[i])->Entry->Index=index;
}
}
StandardDatabase::EntryHandle::EntryHandle(StandardDatabase* db){ StandardDatabase::EntryHandle::EntryHandle(StandardDatabase* db){
pDB=db; pDB=db;
ListIndex=0; ListIndex=0;
@ -876,8 +963,8 @@ quint32 StandardDatabase::GroupHandle::oldImage(){return Group->OldImage;}
quint32 StandardDatabase::GroupHandle::image(){return Group->Image;} quint32 StandardDatabase::GroupHandle::image(){return Group->Image;}
int StandardDatabase::GroupHandle::index(){return Group->Index;} int StandardDatabase::GroupHandle::index(){return Group->Index;}
void StandardDatabase::GroupHandle::setTitle(const QString& Title){Group->Title=Title;} void StandardDatabase::GroupHandle::setTitle(const QString& Title){Group->Title=Title;}
void StandardDatabase::GroupHandle::setExpanded(bool IsExpanded){Group->IsExpanded=IsExpanded;}
bool StandardDatabase::GroupHandle::expanded(){return Group->IsExpanded;}
void StandardDatabase::GroupHandle::setImage(const quint32& New) void StandardDatabase::GroupHandle::setImage(const quint32& New)
{ {
if(Group->Image < pDB->builtinIcons() && New >= pDB->builtinIcons()) if(Group->Image < pDB->builtinIcons() && New >= pDB->builtinIcons())
@ -1003,6 +1090,8 @@ bool StandardDatabase::save(){
QList<StdEntry> MetaStreams; QList<StdEntry> MetaStreams;
MetaStreams << StdEntry(); MetaStreams << StdEntry();
createCustomIconsMetaStream(&MetaStreams.back()); createCustomIconsMetaStream(&MetaStreams.back());
MetaStreams << StdEntry();
createGroupTreeStateMetaStream(&MetaStreams.back());
FileSize=DB_HEADER_SIZE; FileSize=DB_HEADER_SIZE;
// Get the size of all groups (94 Byte + length of the name string) // Get the size of all groups (94 Byte + length of the name string)
@ -1048,7 +1137,9 @@ bool StandardDatabase::save(){
else if(Algorithm == Twofish_Cipher) Flags |= PWM_FLAG_TWOFISH; else if(Algorithm == Twofish_Cipher) Flags |= PWM_FLAG_TWOFISH;
Version = PWM_DBVER_DW; Version = PWM_DBVER_DW;
NumGroups = Groups.size(); NumGroups = Groups.size();
NumEntries = Entries.size()+UnknownMetaStreams.size()+1; NumEntries = Entries.size()+UnknownMetaStreams.size()+MetaStreams.size();
qSort(Entries.begin(),Entries.end(),StdEntryLessThan);
randomize(FinalRandomSeed,16); randomize(FinalRandomSeed,16);
randomize(TransfRandomSeed,32); randomize(TransfRandomSeed,32);

18
src/StandardDatabase.h
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2006 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* keepassx@gmail.com * * keepassx@gmail.com *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -38,6 +38,7 @@
#include <QTime> #include <QTime>
#include <QStringList> #include <QStringList>
#include <QPixmap> #include <QPixmap>
#include <QMap>
#include "lib/SecString.h" #include "lib/SecString.h"
#include "Database.h" #include "Database.h"
@ -73,7 +74,9 @@ public:
virtual KpxUuid uuid(); virtual KpxUuid uuid();
virtual IGroupHandle* group(); virtual IGroupHandle* group();
virtual quint32 image(); virtual quint32 image();
virtual int index() const; virtual int visualIndex() const;
virtual void setVisualIndex(int i);
virtual void setVisualIndexDirectly(int i);
quint32 oldImage(); quint32 oldImage();
virtual QString title(); virtual QString title();
virtual QString url(); virtual QString url();
@ -88,7 +91,6 @@ public:
virtual QByteArray binary(); virtual QByteArray binary();
virtual quint32 binarySize(); virtual quint32 binarySize();
virtual bool isValid() const; virtual bool isValid() const;
virtual bool operator<(const IEntryHandle*& other);
private: private:
void invalidate(){valid=false;} void invalidate(){valid=false;}
bool valid; bool valid;
@ -113,6 +115,8 @@ public:
virtual int index(); virtual int index();
virtual void setIndex(int index); virtual void setIndex(int index);
virtual int level(); virtual int level();
virtual bool expanded();
virtual void setExpanded(bool IsExpanded);
private: private:
void invalidate(){valid=false;} void invalidate(){valid=false;}
bool valid; bool valid;
@ -193,9 +197,12 @@ private:
void dateToPackedStruct5(const QDateTime& datetime, unsigned char* dst); void dateToPackedStruct5(const QDateTime& datetime, unsigned char* dst);
bool isMetaStream(StdEntry& Entry); bool isMetaStream(StdEntry& Entry);
bool parseMetaStream(const StdEntry& Entry); bool parseMetaStream(const StdEntry& Entry);
bool parseCustomIconsMetaStream(const QByteArray& data); void parseCustomIconsMetaStream(const QByteArray& data);
bool parseCustomIconsMetaStreamV1(const QByteArray& data); bool parseCustomIconsMetaStreamV1(const QByteArray& data);
bool parseCustomIconsMetaStreamV2(const QByteArray& data); bool parseCustomIconsMetaStreamV2(const QByteArray& data);
void parseGroupTreeStateMetaStream(const QByteArray& data);
void createCustomIconsMetaStream(StdEntry* e);
void createGroupTreeStateMetaStream(StdEntry* e);
bool readEntryField(StdEntry* entry, quint16 FieldType, quint32 FieldSize, quint8 *pData); bool readEntryField(StdEntry* entry, quint16 FieldType, quint32 FieldSize, quint8 *pData);
bool readGroupField(StdGroup* group,QList<quint32>& Levels,quint16 FieldType, quint32 FieldSize, quint8 *pData); bool readGroupField(StdGroup* group,QList<quint32>& Levels,quint16 FieldType, quint32 FieldSize, quint8 *pData);
bool createGroupTree(QList<quint32>& Levels); bool createGroupTree(QList<quint32>& Levels);
@ -206,12 +213,12 @@ private:
quint32 getNewGroupId(); quint32 getNewGroupId();
void serializeEntries(QList<StdEntry>& EntryList,char* buffer,unsigned int& pos); void serializeEntries(QList<StdEntry>& EntryList,char* buffer,unsigned int& pos);
void serializeGroups(QList<StdGroup>& GroupList,char* buffer,unsigned int& pos); void serializeGroups(QList<StdGroup>& GroupList,char* buffer,unsigned int& pos);
void createCustomIconsMetaStream(StdEntry* e);
void appendChildsToGroupList(QList<StdGroup*>& list,StdGroup& group); void appendChildsToGroupList(QList<StdGroup*>& list,StdGroup& group);
void appendChildsToGroupList(QList<IGroupHandle*>& list,StdGroup& group); void appendChildsToGroupList(QList<IGroupHandle*>& list,StdGroup& group);
bool searchStringContains(const QString& search, const QString& string,bool Cs, bool RegExp); bool searchStringContains(const QString& search, const QString& string,bool Cs, bool RegExp);
void getEntriesRecursive(IGroupHandle* Group, QList<IEntryHandle*>& EntryList); void getEntriesRecursive(IGroupHandle* Group, QList<IEntryHandle*>& EntryList);
void rebuildIndices(QList<StdGroup*>& list); void rebuildIndices(QList<StdGroup*>& list);
void restoreGroupTreeState();
StdEntry* getEntry(const KpxUuid& uuid); StdEntry* getEntry(const KpxUuid& uuid);
StdEntry* getEntry(EntryHandle* handle); StdEntry* getEntry(EntryHandle* handle);
@ -231,6 +238,7 @@ private:
QString error; QString error;
bool KeyError; bool KeyError;
QList<StdEntry> UnknownMetaStreams; QList<StdEntry> UnknownMetaStreams;
QMap<quint32,bool> TreeStateMetaStream;
unsigned int KeyTransfRounds; unsigned int KeyTransfRounds;
CryptAlgorithm Algorithm; CryptAlgorithm Algorithm;
quint8 RawMasterKey[32]; quint8 RawMasterKey[32];

37
src/dialogs/PasswordDlg.cpp
Unescape View File

@ -18,9 +18,6 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "main.h"
#include "PwmConfig.h"
#include "PasswordDlg.h"
#include <QFileDialog> #include <QFileDialog>
#include <QDir> #include <QDir>
#include <QStringList> #include <QStringList>
@ -29,6 +26,12 @@
#include <QComboBox> #include <QComboBox>
#include <QPushButton> #include <QPushButton>
#include <QMessageBox> #include <QMessageBox>
#include <QStringList>
#include "main.h"
#include "PwmConfig.h"
#include "PasswordDlg.h"
#include "lib/FileDialogs.h"
CPasswordDialog::CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButton,bool ChangeKeyMode) CPasswordDialog::CPasswordDialog(QWidget* parent,IDatabase* DB,bool ShowExitButton,bool ChangeKeyMode)
@ -127,27 +130,23 @@ void CPasswordDialog::setStateBoth(){
void CPasswordDialog::OnButtonBrowse() void CPasswordDialog::OnButtonBrowse()
{ {
QFileDialog FileDlg(this,tr("Select a Key File"),QDir::homePath()); QString filename=KpxFileDialogs::openExistingFile(this,"PasswordDlg",tr("Select a Key File"),
FileDlg.setFilters(QStringList()<<tr("All Files (*)") << tr("Key Files (*.key)")); QStringList() << tr("All Files (*)") << tr("Key Files (*.key)"));
FileDlg.setFileMode(QFileDialog::ExistingFile); if(filename!=QString()){
if(!FileDlg.exec())return; Combo_Dirs->setEditText(filename);
if(!FileDlg.selectedFiles().size())return;
QFile file(FileDlg.selectedFiles()[0]);
if(file.exists()){
Combo_Dirs->setEditText(FileDlg.selectedFiles()[0]);
return;
} }
QMessageBox::warning(this,tr("Error"),tr("Unexpected Error: File does not exist."),tr("OK"),"","",0,0); return;
} }
void CPasswordDialog::OnButtonBrowse_Set() void CPasswordDialog::OnButtonBrowse_Set()
{ {
QFileDialog FileDlg(this,tr("Select a Key File"),QDir::homePath()); QString filename=KpxFileDialogs::saveFile(this,"PasswordDlg",tr("Select a Key File"),
FileDlg.setFilters(QStringList()<<tr("All Files (*)") << tr("Key Files (*.key)")); QStringList() << tr("All Files (*)") << tr("Key Files (*.key)"),
FileDlg.setFileMode(QFileDialog::AnyFile); false);
if(!FileDlg.exec())return; if(filename!=QString()){
if(!FileDlg.selectedFiles().size())return; Combo_Dirs->setEditText(filename);
Combo_Dirs->setEditText(FileDlg.selectedFiles()[0]); }
return;
} }
void CPasswordDialog::OnCancel() void CPasswordDialog::OnCancel()

9
src/dialogs/SettingsDlg.cpp
Unescape View File

@ -107,6 +107,10 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
case CConfig::KDE: Radio_IntPlugin_Kde->setChecked(true); break; case CConfig::KDE: Radio_IntPlugin_Kde->setChecked(true); break;
} }
if(settings->value("GroupTreeState","ExpandAll")=="ExpandAll")Radio_GroupTreeExpand->setChecked(true);
if(settings->value("GroupTreeState","ExpandAll")=="Restore")Radio_GroupTreeRestore->setChecked(true);
if(settings->value("GroupTreeState","ExpandAll")=="ExpandNone")Radio_GroupTreeDoNothing->setChecked(true);
if(!PluginsModified) if(!PluginsModified)
Label_IntPlugin_Info->hide(); Label_IntPlugin_Info->hide();
} }
@ -167,6 +171,11 @@ void CSettingsDlg::apply(){
if(Radio_IntPlugin_None->isChecked())config.IntegrPlugin=CConfig::NONE; if(Radio_IntPlugin_None->isChecked())config.IntegrPlugin=CConfig::NONE;
if(Radio_IntPlugin_Gnome->isChecked())config.IntegrPlugin=CConfig::GNOME; if(Radio_IntPlugin_Gnome->isChecked())config.IntegrPlugin=CConfig::GNOME;
if(Radio_IntPlugin_Kde->isChecked())config.IntegrPlugin=CConfig::KDE; if(Radio_IntPlugin_Kde->isChecked())config.IntegrPlugin=CConfig::KDE;
if(Radio_GroupTreeExpand->isChecked())settings->setValue("GroupTreeState","ExpandAll");
if(Radio_GroupTreeDoNothing->isChecked())settings->setValue("GroupTreeState","ExpandNone");
if(Radio_GroupTreeRestore->isChecked())settings->setValue("GroupTreeState","Restore");
} }
void CSettingsDlg::OnTextColor() void CSettingsDlg::OnTextColor()

43
src/export/Export_Txt.cpp
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2006 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* tarek.saidi@arcor.de * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -21,9 +21,9 @@
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#include "main.h" #include "main.h"
#include "../lib/SecString.h" #include "lib/SecString.h"
#include "Export_Txt.h" #include "Export_Txt.h"
/*
QString EntryTemplate=QString("\n\ QString EntryTemplate=QString("\n\
Title: %1\n\ Title: %1\n\
@ -37,27 +37,22 @@ QString GroupTemplate=QString("\n\
*** Group: %1 ***\n\ *** Group: %1 ***\n\
"); ");
bool Export_Txt::exportFile(const QString& filename,StandardDatabase* db,QString& err){ QString Export_Txt::exportDatabase(QWidget* GuiParent, IDatabase* db, QIODevice* file){
QFile file(filename); QList<IGroupHandle*> groups=db->sortedGroups();
if(!file.open(QIODevice::Truncate | QIODevice::WriteOnly)){ for(int g=0;g<groups.size();g++){
err+=tr("Could not open file (FileError=%1)").arg(file.error()); file->write(GroupTemplate.arg(groups[g]->title()).toUtf8());
return false; QList<IEntryHandle*> entries=db->entries(groups[g]);
} for(int e=0;e<entries.size();e++){
SecString password=entries[e]->password();
for(int g=0;g<db->numGroups();g++){ password.unlock();
file.write(GroupTemplate.arg(db->group(g).Name).toUtf8()); file->write(EntryTemplate.arg(entries[e]->title())
for(int e=0;e<db->numEntries();e++){ .arg(entries[e]->username())
if(db->group(g).ID==db->entry(e).GroupID){ .arg(entries[e]->url())
db->entry(e).Password.unlock(); .arg(password.string())
file.write(EntryTemplate.arg(db->entry(e).Title) .arg(entries[e]->comment().replace('\n',"\n "))
.arg(db->entry(e).UserName)
.arg(db->entry(e).URL)
.arg(db->entry(e).Password.string())
.arg(db->entry(e).Additional.replace('\n',"\n "))
.toUtf8()); .toUtf8());
db->entry(e).Password.lock(); password.lock();
} }
} }
} return QString();
file.close(); }
}*/

11
src/export/Export_Txt.h
Unescape View File

@ -19,13 +19,14 @@
***************************************************************************/ ***************************************************************************/
#ifndef _EXPORT_TXT_H_ #ifndef _EXPORT_TXT_H_
#define _EXPORT_TXT_H_ #define _EXPORT_TXT_H_
#include <QObject>
#include "StandardDatabase.h"
class Export_Txt:public QObject{ #include <QObject>
public: #include "IExport.h"
bool exportFile(const QString& filename,StandardDatabase* db,QString& err);
class Export_Txt:public QObject, public IExport{
public:
virtual QString exportDatabase(QWidget* GuiParent, IDatabase* Database, QIODevice* Dest);
virtual QString name(){return QString("Txt");}
}; };
#endif #endif

3
src/forms/MainWindow.ui
Unescape View File

@ -77,9 +77,6 @@
<property name="rootIsDecorated" > <property name="rootIsDecorated" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sortingEnabled" >
<bool>true</bool>
</property>
</widget> </widget>
</widget> </widget>
</item> </item>

9
src/forms/SettingsDlg.ui
Unescape View File

@ -62,7 +62,7 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex" > <property name="currentIndex" >
<number>3</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="tab" > <widget class="QWidget" name="tab" >
<attribute name="title" > <attribute name="title" >
@ -915,6 +915,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QCheckBox" name="checkBox_VerifyAfterSaving" >
<property name="text" >
<string>Verify database content and structure after saving</string>
</property>
</widget>
</item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >

5
src/import/Import_KWalletXml.h
Unescape View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 by Tarek Saidi * * Copyright (C) 2007 by Tarek Saidi *
* mail@tarek-saidi.de * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
@ -17,6 +17,7 @@
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#ifndef _IMPORT_KWALLET_H_ #ifndef _IMPORT_KWALLET_H_
#define _IMPORT_KWALLET_H_ #define _IMPORT_KWALLET_H_
#include <qstring.h> #include <qstring.h>

22
src/lib/EntryView.cpp
Unescape View File

@ -47,9 +47,11 @@ KeepassEntryView::KeepassEntryView(QWidget* parent):QTreeWidget(parent){
updateColumns(); updateColumns();
header()->setResizeMode(QHeaderView::Interactive); header()->setResizeMode(QHeaderView::Interactive);
header()->setStretchLastSection(false); header()->setStretchLastSection(false);
header()->setClickable(true);
connect(header(),SIGNAL(sectionResized(int,int,int)),this,SLOT(OnColumnResized(int,int,int))); connect(header(),SIGNAL(sectionResized(int,int,int)),this,SLOT(OnColumnResized(int,int,int)));
connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(OnItemsChanged())); connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(OnItemsChanged()));
connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut())); connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut()));
connect(header(),SIGNAL(sectionClicked(int)),this,SLOT(OnHeaderSectionClicked(int)));
Clipboard=QApplication::clipboard(); Clipboard=QApplication::clipboard();
ContextMenu=new QMenu(this); ContextMenu=new QMenu(this);
setAlternatingRowColors(config.AlternatingRowColors); setAlternatingRowColors(config.AlternatingRowColors);
@ -82,6 +84,22 @@ void KeepassEntryView::OnItemsChanged(){
} }
} }
void KeepassEntryView::OnHeaderSectionClicked(int index){
if(header()->isSortIndicatorShown() && header()->sortIndicatorSection()==index){
header()->setSortIndicator(index,header()->sortIndicatorOrder() ? Qt::DescendingOrder : Qt::AscendingOrder);
sortItems(index,header()->sortIndicatorOrder());
}
else{
header()->setSortIndicator(index,Qt::AscendingOrder);
header()->setSortIndicatorShown(true);
sortItems(index,Qt::AscendingOrder);
}
for(int i=0;i<Items.size();i++){
Items[i]->EntryHandle->setVisualIndexDirectly(indexOfTopLevelItem(Items[i]));
}
}
void KeepassEntryView::OnSaveAttachment(){ void KeepassEntryView::OnSaveAttachment(){
Q_ASSERT(selectedItems().size()==1); Q_ASSERT(selectedItems().size()==1);
CEditEntryDlg::saveAttachment(((EntryViewItem*)selectedItems()[0])->EntryHandle,this); CEditEntryDlg::saveAttachment(((EntryViewItem*)selectedItems()[0])->EntryHandle,this);
@ -268,7 +286,8 @@ void KeepassEntryView::showGroup(IGroupHandle* group){
createItems(entries); createItems(entries);
} }
void KeepassEntryView::createItems(QList<IEntryHandle*>& entries){ void KeepassEntryView::createItems(QList<IEntryHandle*>& entries){
header()->setSortIndicatorShown(false);
for(int i=0;i<entries.size();i++){ for(int i=0;i<entries.size();i++){
if(!entries[i]->isValid())continue; if(!entries[i]->isValid())continue;
EntryViewItem* item=new EntryViewItem(this); EntryViewItem* item=new EntryViewItem(this);
@ -304,6 +323,7 @@ void KeepassEntryView::createItems(QList<IEntryHandle*>& entries){
if(config.Columns[9]){ if(config.Columns[9]){
item->setText(j++,entries[i]->binaryDesc());} item->setText(j++,entries[i]->binaryDesc());}
Items.back()->setIcon(0,db->icon(entries[i]->image())); Items.back()->setIcon(0,db->icon(entries[i]->image()));
qDebug("%s : %i",entries[i]->title().toUtf8().data(),entries[i]->visualIndex());
} }
} }

1
src/lib/EntryView.h
Unescape View File

@ -70,6 +70,7 @@ class KeepassEntryView:public QTreeWidget{
virtual void mouseMoveEvent(QMouseEvent *event); virtual void mouseMoveEvent(QMouseEvent *event);
public slots: public slots:
void OnColumnResized(int index,int OldSize, int NewSize); void OnColumnResized(int index,int OldSize, int NewSize);
void OnHeaderSectionClicked(int index);
void OnGroupChanged(IGroupHandle* group); void OnGroupChanged(IGroupHandle* group);
void OnShowSearchResults(); void OnShowSearchResults();
void OnEntryActivated(QTreeWidgetItem*,int); void OnEntryActivated(QTreeWidgetItem*,int);

93
src/lib/FileDialogs.cpp
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2006 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* tarek.saidi@arcor.de * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -18,11 +18,15 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "FileDialogs.h"
#include <QDir> #include <QDir>
#include <QSettings>
#include "main.h"
#include "FileDialogs.h"
IFileDialog* KpxFileDialogs::iFileDialog=NULL; IFileDialog* KpxFileDialogs::iFileDialog=NULL;
QtStandardFileDialogs DefaultQtDlgs; QtStandardFileDialogs DefaultQtDlgs;
FileDlgHistory fileDlgHistory;
void KpxFileDialogs::setPlugin(IFileDialog* plugin){ void KpxFileDialogs::setPlugin(IFileDialog* plugin){
iFileDialog=plugin; iFileDialog=plugin;
@ -30,26 +34,37 @@ void KpxFileDialogs::setPlugin(IFileDialog* plugin){
QString KpxFileDialogs::openExistingFile(QWidget* Parent, const QString& Name, const QString& Title,const QStringList& Filters,const QString& Dir) QString KpxFileDialogs::openExistingFile(QWidget* Parent, const QString& Name, const QString& Title,const QStringList& Filters,const QString& Dir)
{ {
QString dir;
if(iFileDialog==NULL)iFileDialog=dynamic_cast<IFileDialog*>(&DefaultQtDlgs); if(iFileDialog==NULL)iFileDialog=dynamic_cast<IFileDialog*>(&DefaultQtDlgs);
//Load History here! if(Dir==QString()) dir=fileDlgHistory.getDir(Name);
return iFileDialog->openExistingFileDialog(Parent,Title,QDir::homePath(),Filters); else dir=Dir;
QString result = iFileDialog->openExistingFileDialog(Parent,Title,dir,Filters);
if(result!=QString()){
fileDlgHistory.set(Name,result.left(result.lastIndexOf("/")+1),iFileDialog->getLastFilter());
}
return result;
} }
QStringList KpxFileDialogs::openExistingFiles(QWidget* Parent, const QString& Name, const QString& Title,const QStringList& Filters,const QString& Dir) QStringList KpxFileDialogs::openExistingFiles(QWidget* Parent, const QString& Name, const QString& Title,const QStringList& Filters,const QString& Dir)
{ {
if(iFileDialog==NULL)iFileDialog=dynamic_cast<IFileDialog*>(&DefaultQtDlgs); if(iFileDialog==NULL)iFileDialog=dynamic_cast<IFileDialog*>(&DefaultQtDlgs);
//Load History here! //Load History here!
return iFileDialog->openExistingFilesDialog(Parent,Title,QString(),Filters); QStringList results=iFileDialog->openExistingFilesDialog(Parent,Title,QString(),Filters);
if(results.size()){
fileDlgHistory.set(Name,results[0].left(results[0].lastIndexOf("/")+1),iFileDialog->getLastFilter());
}
return results;
} }
QString KpxFileDialogs::saveFile(QWidget* Parent, const QString& Name, const QString& Title,const QStringList& Filters,bool OverWriteWarn, const QString& Dir) QString KpxFileDialogs::saveFile(QWidget* Parent, const QString& Name, const QString& Title,const QStringList& Filters,bool OverWriteWarn, const QString& Dir)
{ {
if(iFileDialog==NULL)iFileDialog=dynamic_cast<IFileDialog*>(&DefaultQtDlgs); if(iFileDialog==NULL)iFileDialog=dynamic_cast<IFileDialog*>(&DefaultQtDlgs);
//Load History here! //Load History here!
return iFileDialog->saveFileDialog(Parent,Title,QString(),Filters,OverWriteWarn); QString result = iFileDialog->saveFileDialog(Parent,Title,QString(),Filters,OverWriteWarn);
if(result!=QString()){
fileDlgHistory.set(Name,result.left(result.lastIndexOf("/")+1),iFileDialog->getLastFilter());
}
return result;
} }
QString QtStandardFileDialogs::openExistingFileDialog(QWidget* parent,QString title,QString dir,QStringList Filters){ QString QtStandardFileDialogs::openExistingFileDialog(QWidget* parent,QString title,QString dir,QStringList Filters){
@ -58,6 +73,7 @@ QString QtStandardFileDialogs::openExistingFileDialog(QWidget* parent,QString ti
FileDlg.setFileMode(QFileDialog::ExistingFile); FileDlg.setFileMode(QFileDialog::ExistingFile);
if(!FileDlg.exec())return QString(); if(!FileDlg.exec())return QString();
if(!FileDlg.selectedFiles().size())return QString(); if(!FileDlg.selectedFiles().size())return QString();
LastFilter=FileDlg.filters().indexOf(FileDlg.selectedFilter());
return FileDlg.selectedFiles()[0]; return FileDlg.selectedFiles()[0];
} }
@ -66,6 +82,7 @@ QStringList QtStandardFileDialogs::openExistingFilesDialog(QWidget* parent,QStri
FileDlg.setFilters(Filters); FileDlg.setFilters(Filters);
FileDlg.setFileMode(QFileDialog::ExistingFiles); FileDlg.setFileMode(QFileDialog::ExistingFiles);
if(!FileDlg.exec())return QStringList(); if(!FileDlg.exec())return QStringList();
LastFilter=FileDlg.filters().indexOf(FileDlg.selectedFilter());
return FileDlg.selectedFiles(); return FileDlg.selectedFiles();
} }
@ -76,7 +93,65 @@ QString QtStandardFileDialogs::saveFileDialog(QWidget* parent,QString title,QStr
FileDlg.setAcceptMode(QFileDialog::AcceptSave); FileDlg.setAcceptMode(QFileDialog::AcceptSave);
FileDlg.setConfirmOverwrite(ShowOverwriteWarning); FileDlg.setConfirmOverwrite(ShowOverwriteWarning);
if(!FileDlg.exec())return QString(); if(!FileDlg.exec())return QString();
LastFilter=FileDlg.filters().indexOf(FileDlg.selectedFilter());
return FileDlg.selectedFiles()[0]; return FileDlg.selectedFiles()[0];
} }
int QtStandardFileDialogs::getLastFilter(){
return LastFilter;
}
QString FileDlgHistory::getDir(const QString& name){
Entry e=History.value(name);
if(e.isNull())
return QDir::homePath();
else
return e.Dir;
}
int FileDlgHistory::getFilter(const QString& name){
Entry e=History.value(name);
if(e.isNull())
return 0;
else
return e.Filter;
}
void FileDlgHistory::set(const QString& name,const QString& dir, int filter){
History[name]=Entry();
History[name].Dir=dir;
History[name].Filter=filter;
}
void FileDlgHistory::save(){
if(settings->value("General/SaveFileDlgHistory",QVariant(true)).toBool()){
settings->beginGroup("FileDlgHistory");
for(int i=0;i<History.size();i++){
QStringList entry;
entry << History.keys()[i]
<< History.values()[i].Dir
<< QString::number(History.values()[i].Filter);
settings->setValue(QString("ENTRY%1").arg(i),QVariant(entry));
}
settings->endGroup();
}
}
void FileDlgHistory::load(){
if(settings->value("General/SaveFileDlgHistory",QVariant(true)).toBool()){
settings->beginGroup("FileDlgHistory");
QStringList keys=settings->childKeys();
for(int i=0;i<keys.size();i++){
Entry entry;
QStringList value=settings->value(QString("ENTRY%1").arg(i)).toStringList();
entry.Dir=value[1];
entry.Filter=value[2].toInt();
History[value[0]]=entry;
}
settings->endGroup();
}
else{
settings->remove("FileDlgHistory");
}
}

51
src/lib/FileDialogs.h
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2006 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* tarek.saidi@arcor.de * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -23,27 +23,31 @@
#include <QObject> #include <QObject>
#include <QFileDialog> #include <QFileDialog>
#include <QList> #include <QList>
#include <QHash>
#include "plugins/interfaces/IFileDialog.h" #include "plugins/interfaces/IFileDialog.h"
/*
class FileDlgHistory{ class FileDlgHistory{
class HistoryEntry{
public:
QString DlgId;
QString Dir;
int Filter;
QString toString();
void fromString(const QString& str);
};
public: public:
void set(const QString& DlgId,const QString& Dir,int Filter); QString getDir(const QString& name);
int getFilter(const QString& DlgId); int getFilter(const QString& name);
QString getDir(const QString& DlgId); void set(const QString& name,const QString& dir,int filter);
void clear(); void save();
void load();
private: private:
QList class Entry{
public:
Entry(){Filter=-1;}
QString Dir;
int Filter;
bool isNull(){if(Filter==-1)return true;
else return false;}
};
QHash<QString,Entry>History;
}; };
*/
class KpxFileDialogs{ class KpxFileDialogs{
public: public:
@ -71,14 +75,17 @@ class KpxFileDialogs{
class QtStandardFileDialogs:public QObject,public IFileDialog{ class QtStandardFileDialogs:public QObject,public IFileDialog{
Q_OBJECT Q_OBJECT
public: public:
QString openExistingFileDialog(QWidget* parent,QString title,QString dir,QStringList Filters); QString openExistingFileDialog(QWidget* parent,QString title,QString dir,QStringList Filters);
QStringList openExistingFilesDialog(QWidget* parent,QString title,QString dir,QStringList Filters); QStringList openExistingFilesDialog(QWidget* parent,QString title,QString dir,QStringList Filters);
QString saveFileDialog(QWidget* parent,QString title,QString dir,QStringList Filters,bool ShowOverwriteWarning); QString saveFileDialog(QWidget* parent,QString title,QString dir,QStringList Filters,bool ShowOverwriteWarning);
int getLastFilter();
private:
int LastFilter;
}; };
extern FileDlgHistory fileDlgHistory;
#endif #endif

17
src/lib/GroupView.cpp
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* tarek.saidi@arcor.de * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@ -46,8 +46,8 @@ KeepassGroupView::KeepassGroupView(QWidget* parent):QTreeWidget(parent){
ContextMenu=new QMenu(this); ContextMenu=new QMenu(this);
ContextMenuSearchGroup=new QMenu(this); ContextMenuSearchGroup=new QMenu(this);
connect(this,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*))); connect(this,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
// connect(this,SIGNAL(itemExpanded(QTreeWidgetItem*)),this,SLOT(OnItemExpanded(QTreeWidgetItem*))); connect(this,SIGNAL(itemExpanded(QTreeWidgetItem*)),this,SLOT(OnItemExpanded(QTreeWidgetItem*)));
// connect(this,SIGNAL(itemCollapsed(QTreeWidgetItem*)),this,SLOT(OnItemCollapsed(QTreeWidgetItem*))); connect(this,SIGNAL(itemCollapsed(QTreeWidgetItem*)),this,SLOT(OnItemCollapsed(QTreeWidgetItem*)));
} }
@ -59,12 +59,13 @@ void KeepassGroupView::createItems(){
if(groups[i]->parent()==NULL){ if(groups[i]->parent()==NULL){
Items.append(new GroupViewItem(this)); Items.append(new GroupViewItem(this));
Items.back()->setText(0,groups[i]->title()); Items.back()->setText(0,groups[i]->title());
Items.back()->GroupHandle=groups[i]; Items.back()->GroupHandle=groups[i];
addChilds(Items.back()); addChilds(Items.back());
} }
} }
for(int i=0;i<Items.size();i++){ for(int i=0;i<Items.size();i++){
Items[i]->setIcon(0,db->icon(Items[i]->GroupHandle->image())); Items[i]->setIcon(0,db->icon(Items[i]->GroupHandle->image()));
Items[i]->setExpanded(Items[i]->GroupHandle->expanded());
} }
SearchResultItem=new GroupViewItem(); SearchResultItem=new GroupViewItem();
SearchResultItem->setText(0,tr("Search Results")); SearchResultItem->setText(0,tr("Search Results"));
@ -398,6 +399,14 @@ void KeepassGroupView::mouseMoveEvent(QMouseEvent *event){
Qt::DropAction dropAction = drag->start(Qt::MoveAction); Qt::DropAction dropAction = drag->start(Qt::MoveAction);
} }
void KeepassGroupView::OnItemExpanded(QTreeWidgetItem* item){
dynamic_cast<GroupViewItem*>(item)->GroupHandle->setExpanded(true);
}
void KeepassGroupView::OnItemCollapsed(QTreeWidgetItem* item){
dynamic_cast<GroupViewItem*>(item)->GroupHandle->setExpanded(false);
}
GroupViewItem::GroupViewItem():QTreeWidgetItem(){ GroupViewItem::GroupViewItem():QTreeWidgetItem(){

4
src/lib/GroupView.h
Unescape View File

@ -62,8 +62,8 @@ class KeepassGroupView:public QTreeWidget{
void OnEditGroup(); void OnEditGroup();
void updateIcons(); void updateIcons();
void OnHideSearchResults(); void OnHideSearchResults();
// void OnItemExpanded(QTreeWidgetItem*); void OnItemExpanded(QTreeWidgetItem*);
// void OnItemCollapsed(QTreeWidgetItem*); void OnItemCollapsed(QTreeWidgetItem*);
signals: signals:
void groupChanged(IGroupHandle* NewGroup); void groupChanged(IGroupHandle* NewGroup);

12
src/main.cpp
Unescape View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2006 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* tarek@linux * * tarek.saidi@arcor.de *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
@ -38,6 +38,7 @@
#include "lib/FileDialogs.h" #include "lib/FileDialogs.h"
#include "main.h" #include "main.h"
#include "lib/FileDialogs.h"
#include "PwmConfig.h" #include "PwmConfig.h"
#include "StandardDatabase.h" #include "StandardDatabase.h"
#include "mainwindow.h" #include "mainwindow.h"
@ -56,6 +57,7 @@ using namespace std;
#define CSTR(x)(x.toUtf8().data()) #define CSTR(x)(x.toUtf8().data())
CConfig config; CConfig config;
QSettings* settings;
QString AppDir; QString AppDir;
QString PluginLoadError; QString PluginLoadError;
bool TrActive; bool TrActive;
@ -113,6 +115,9 @@ int main(int argc, char **argv)
config.loadFromIni(IniFilename);} config.loadFromIni(IniFilename);}
settings = new QSettings(QDir::homePath()+"/.keepassx/config",QSettings::IniFormat);
fileDlgHistory.load();
//Plugins //Plugins
if(config.IntegrPlugin!=CConfig::NONE){ if(config.IntegrPlugin!=CConfig::NONE){
QString LibName="libkeepassx-"; QString LibName="libkeepassx-";
@ -209,7 +214,10 @@ int main(int argc, char **argv)
QMessageBox::warning(NULL,QObject::tr("Warning"), QMessageBox::warning(NULL,QObject::tr("Warning"),
QObject::tr("Could not save configuration file.\nMake sure you have write access to '~/.keepass'."), QObject::tr("Could not save configuration file.\nMake sure you have write access to '~/.keepass'."),
QObject::tr("OK"),"","",0.0); QObject::tr("OK"),"","",0.0);
fileDlgHistory.save();
delete app; delete app;
delete settings;
return r; return r;
} }

2
src/main.h
Unescape View File

@ -26,6 +26,7 @@
#include <QColor> #include <QColor>
#include <QIcon> #include <QIcon>
#include <QFile> #include <QFile>
#include <QSettings>
#define KEEPASS_VERSION "0.2.3" #define KEEPASS_VERSION "0.2.3"
#define BUILTIN_ICONS 62 #define BUILTIN_ICONS 62
@ -43,6 +44,7 @@ QString findPlugin(const QString& filename);
extern QString PluginLoadError; extern QString PluginLoadError;
extern CConfig config; extern CConfig config;
extern QSettings *settings;
extern QString AppDir; extern QString AppDir;
extern bool TrActive; extern bool TrActive;
extern QPixmap *EntryIcons; extern QPixmap *EntryIcons;

104
src/mainwindow.cpp
Unescape View File

@ -38,6 +38,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QStatusBar> #include <QStatusBar>
#include "KpxFirefox.h"
#include "lib/random.h" #include "lib/random.h"
#include "lib/IniReader.h" #include "lib/IniReader.h"
#include "lib/AutoType.h" #include "lib/AutoType.h"
@ -55,35 +56,54 @@
#include "dialogs/PasswordGenDlg.h" #include "dialogs/PasswordGenDlg.h"
#include "dialogs/CollectEntropyDlg.h" #include "dialogs/CollectEntropyDlg.h"
#include <QtDBus/QtDBus>
#include <iostream>
QDBusServer* dbusServer;
QDBusConnection* dbusCon;
KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,QWidget *parent, Qt::WFlags flags):QMainWindow(parent,flags){ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,QWidget *parent, Qt::WFlags flags):QMainWindow(parent,flags){
Start=true; Start=true;
ShutingDown=false; ShutingDown=false;
setupUi(this); setupUi(this);
AutoType::MainWin=this; AutoType::MainWin=this;
setGeometry(geometry().x(),geometry().y(),config.MainWinWidth,config.MainWinHeight); setGeometry(settings->value("Ui/MainWindowGeometry",QVariant(geometry())).toRect());
splitter->setSizes(QList<int>() << config.MainWinSplit1 << config.MainWinSplit2); splitter->restoreState(settings->value("Ui/SplitterPos").toByteArray());
SysTray=new QSystemTrayIcon(this); SysTray=new QSystemTrayIcon(this);
setupToolbar(); setupToolbar();
setupIcons(); setupIcons();
setStateFileOpen(false); setStateFileOpen(false);
setupMenus(); setupMenus();
StatusBarGeneral=new QLabel(tr("Ready"),statusBar()); StatusBarGeneral=new QLabel(tr("Ready"),statusBar());
StatusBarSelection=new QLabel(statusBar()); StatusBarSelection=new QLabel(statusBar());
statusBar()->addWidget(StatusBarGeneral,15); statusBar()->addWidget(StatusBarGeneral,15);
statusBar()->addWidget(StatusBarSelection,85); statusBar()->addWidget(StatusBarSelection,85);
statusBar()->setVisible(config.ShowStatusbar); statusBar()->setVisible(config.ShowStatusbar);
setupConnections(); setupConnections();
FileOpen=false; FileOpen=false;
if(ArgFile!=QString()) if(ArgFile!=QString())
openDatabase(ArgFile,false); openDatabase(ArgFile,false);
else if(config.OpenLast && (config.LastFile!=QString()) ){ else if(config.OpenLast && (config.LastFile!=QString()) ){
QFileInfo file(config.LastFile); QFileInfo file(config.LastFile);
if(file.exists()) if(file.exists())
openDatabase(config.LastFile,true); openDatabase(config.LastFile,true);
else else
config.LastFile=QString(); config.LastFile=QString();
} }
//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());
} }
void KeepassMainWindow::setupConnections(){ void KeepassMainWindow::setupConnections(){
@ -642,13 +662,33 @@ void KeepassMainWindow::OnFileExit(){
} }
void KeepassMainWindow::OnExportToTxt(){ void KeepassMainWindow::OnExportToTxt(){
/* IExport* exporter=new Export_Txt();
QString filename=QFileDialog::getSaveFileName(this,tr("Export To..."),QDir::homePath(),"*.txt"); QStringList Filters;
if(filename==QString())return; Filters << tr("All Files (*)");
Export_Txt exp; Filters << tr("Text Files (*.txt)");
QString err; exportDatabase(exporter, Filters);
exp.exportFile(filename,db,err); delete exporter;
*/ }
void KeepassMainWindow::exportDatabase(IExport* exporter,QStringList Filters){
QString filename=KpxFileDialogs::saveFile(this,"Export_"+exporter->name(),tr("Export Database"),Filters,true);
if(filename==QString())return;
QFile file(filename);
if(!file.open(QIODevice::WriteOnly|QIODevice::Truncate)){
QMessageBox::critical(this,tr("Export Failed"),decodeFileError(file.error()));
return;
}
QString err=exporter->exportDatabase(this,db,&file);
if(err!=QString()){
QMessageBox::critical(this,tr("Export Failed"),err);
return;
}
file.close();
if(file.error()!=QFile::NoError){
QMessageBox::critical(this,tr("Export Failed"),decodeFileError(file.error()));
return;
}
} }
void KeepassMainWindow::OnImportFromPwm(){ void KeepassMainWindow::OnImportFromPwm(){
@ -816,10 +856,8 @@ void KeepassMainWindow::closeEvent(QCloseEvent* e){
return; return;
} }
config.MainWinHeight=geometry().height(); settings->setValue("Ui/MainWindowGeometry",QVariant(geometry()));
config.MainWinWidth=geometry().width(); settings->setValue("Ui/SplitterPos",splitter->saveState());
config.MainWinSplit1=splitter->sizes()[0];
config.MainWinSplit2=splitter->sizes()[1];
config.ShowStatusbar=statusBar()->isVisible(); config.ShowStatusbar=statusBar()->isVisible();
if(FileOpen){ if(FileOpen){

2
src/mainwindow.h
Unescape View File

@ -43,6 +43,7 @@
#include "PwmConfig.h" #include "PwmConfig.h"
#include "lib/EntryView.h" #include "lib/EntryView.h"
#include "lib/GroupView.h" #include "lib/GroupView.h"
#include "export/IExport.h"
#include "ui_MainWindow.h" #include "ui_MainWindow.h"
@ -112,6 +113,7 @@ class KeepassMainWindow : public QMainWindow, public Ui_MainWindow{
void search(IGroupHandle* Group); void search(IGroupHandle* Group);
void removeFromSearchResults(int sID); void removeFromSearchResults(int sID);
void updateDetailView(); void updateDetailView();
void exportDatabase(IExport* exporter,QStringList filters);
QLineEdit* QuickSearchEdit; QLineEdit* QuickSearchEdit;
QLabel* StatusBarGeneral; QLabel* StatusBarGeneral;
QLabel* StatusBarSelection; QLabel* StatusBarSelection;

2
src/plugins/interfaces/IFileDialog.h
Unescape View File

@ -33,6 +33,8 @@ class IFileDialog{
virtual QString saveFileDialog(QWidget* parent,QString title,QString dir, virtual QString saveFileDialog(QWidget* parent,QString title,QString dir,
QStringList Filters,bool ShowOverwriteWarning=true)=0; QStringList Filters,bool ShowOverwriteWarning=true)=0;
virtual int getLastFilter()=0;
}; };
Q_DECLARE_INTERFACE(IFileDialog,"org.KeePassX.FileDialogInterface/1.0") Q_DECLARE_INTERFACE(IFileDialog,"org.KeePassX.FileDialogInterface/1.0")

305
src/src.pro
Unescape View File

@ -1,146 +1,159 @@
# Diese Datei wurde mit dem qmake-Manager von KDevelop erstellt. ######################################################################
# ------------------------------------------- # Automatically generated by qmake (2.01a) Mo Jan 29 18:17:19 2007
# Unterordner relativ zum Projektordner: ./src ######################################################################
# Das Target ist eine Anwendung: ../bin/keepass
DEPENDPATH += "crypto \
dialogs \
INSTALLS += target data export \
data.files += ../share/keepass/* forms \
TARGET = ../bin/keepassx import \
lib \
unix:!macx{ translations"
isEmpty(PREFIX){ INSTALLS += target data
PREFIX=/usr/local data.files += ../share/keepass/*
} TARGET = ../bin/keepassx
target.path = $${PREFIX}/bin
data.path = $${PREFIX}/share/keepass unix: !macx{
LIBS+=-lXtst isEmpty(PREFIX){
SOURCES+=lib/AutoType_X11.cpp PREFIX = /usr/local
} }
target.path = $${PREFIX}/bin
macx{ data.path = $${PREFIX}/share/keepass
target.path = /Applications LIBS += -lXtst -lQtDBus
data.path = /Applications/keepass.app/Contents/share/keepass SOURCES += lib/AutoType_X11.cpp
SOURCES+=lib/AutoType_X11.cpp }
}
macx{
win32{ target.path = /Applications
SOURCES+=lib/AutoType_Win.cpp data.path = /Applications/keepass.app/Contents/share/keepass
TARGET=../$$TARGET SOURCES += lib/AutoType_X11.cpp
QMAKE_LINK_OBJECT_SCRIPT=../build/$$QMAKE_LINK_OBJECT_SCRIPT }
} win32{
SOURCES += lib/AutoType_Win.cpp
FORMS += forms/EditGroupDlg.ui \ TARGET = ../$$TARGET
forms/SearchDlg.ui \ QMAKE_LINK_OBJECT_SCRIPT = ../build/$$QMAKE_LINK_OBJECT_SCRIPT
forms/AboutDlg.ui \
forms/SettingsDlg.ui \ }
forms/MainWindow.ui \
forms/SimplePasswordDlg.ui \ FORMS += forms/EditGroupDlg.ui \
forms/DatabaseSettingsDlg.ui \ forms/SearchDlg.ui \
forms/PasswordDlg.ui \ forms/AboutDlg.ui \
forms/EditEntryDlg.ui \ forms/SettingsDlg.ui \
forms/PasswordGenDlg.ui \ forms/MainWindow.ui \
forms/SelectIconDlg.ui \ forms/SimplePasswordDlg.ui \
forms/CollectEntropyDlg.ui forms/DatabaseSettingsDlg.ui \
TRANSLATIONS += translations/keepass-de_DE.ts \ forms/PasswordDlg.ui \
translations/keepass-ru_RU.ts \ forms/EditEntryDlg.ui \
translations/keepass-es_ES.ts \ forms/PasswordGenDlg.ui \
translations/keepass-fr_FR.ts \ forms/SelectIconDlg.ui \
translations/keepass-cs_CS.ts \ forms/CollectEntropyDlg.ui
translations/keepass-xx_XX.ts TRANSLATIONS += translations/keepass-de_DE.ts \
HEADERS += lib/IniReader.h \ translations/keepass-ru_RU.ts \
lib/UrlLabel.h \ translations/keepass-es_ES.ts \
mainwindow.h \ translations/keepass-fr_FR.ts \
StandardDatabase.h \ translations/keepass-cs_CS.ts \
lib/SecString.h \ translations/keepass-xx_XX.ts
crypto/twoclass.h \ HEADERS += lib/IniReader.h \
crypto/twofish.h \ lib/UrlLabel.h \
import/Import_PwManager.h \ mainwindow.h \
export/Export_Txt.h \ StandardDatabase.h \
import/Import_KWalletXml.h \ lib/SecString.h \
PwmConfig.h \ crypto/twoclass.h \
dialogs/AboutDlg.h \ crypto/twofish.h \
dialogs/EditGroupDlg.h \ import/Import_PwManager.h \
dialogs/SearchDlg.h \ export/Export_Txt.h \
dialogs/SettingsDlg.h \ import/Import_KWalletXml.h \
dialogs/DatabaseSettingsDlg.h \ PwmConfig.h \
dialogs/PasswordDlg.h \ dialogs/AboutDlg.h \
dialogs/SimplePasswordDlg.h \ dialogs/EditGroupDlg.h \
dialogs/EditEntryDlg.h \ dialogs/SearchDlg.h \
dialogs/PasswordGenDlg.h \ dialogs/SettingsDlg.h \
dialogs/SelectIconDlg.h \ dialogs/DatabaseSettingsDlg.h \
dialogs/CollectEntropyDlg.h \ dialogs/PasswordDlg.h \
lib/random.h \ dialogs/SimplePasswordDlg.h \
Database.h \ dialogs/EditEntryDlg.h \
lib/KdePlugin.h \ dialogs/PasswordGenDlg.h \
lib/AutoType.h \ dialogs/SelectIconDlg.h \
lib/FileDialogs.h \ dialogs/CollectEntropyDlg.h \
global.h \ lib/random.h \
main.h \ Database.h \
lib/GroupView.h \ lib/KdePlugin.h \
lib/EntryView.h \ lib/AutoType.h \
crypto/arcfour.h \ lib/FileDialogs.h \
lib/KpFileIconProvider.h \ global.h \
crypto/aes_edefs.h \ main.h \
crypto/aes_tdefs.h \ lib/GroupView.h \
crypto/aes.h \ lib/EntryView.h \
crypto/aesopt.h \ crypto/arcfour.h \
crypto/aestab.h \ lib/KpFileIconProvider.h \
crypto/aescpp.h \ crypto/aes_edefs.h \
crypto/sha256.h \ crypto/aes_tdefs.h \
crypto/yarrow.h \ crypto/aes.h \
lib/WaitAnimationWidget.h \ crypto/aesopt.h \
plugins/interfaces/IFileDialog.h \ crypto/aestab.h \
plugins/interfaces/IKdeInit.h \ crypto/aescpp.h \
plugins/interfaces/IGnomeInit.h crypto/sha256.h \
SOURCES += lib/IniReader.cpp \ crypto/yarrow.h \
lib/UrlLabel.cpp \ lib/WaitAnimationWidget.h \
main.cpp \ plugins/interfaces/IFileDialog.h \
mainwindow.cpp \ plugins/interfaces/IKdeInit.h \
StandardDatabase.cpp \ plugins/interfaces/IGnomeInit.h \
lib/SecString.cpp \ KpxFirefox.h
crypto/twoclass.cpp \ SOURCES += lib/IniReader.cpp \
crypto/twofish.cpp \ lib/UrlLabel.cpp \
import/Import_PwManager.cpp \ main.cpp \
export/Export_Txt.cpp \ mainwindow.cpp \
import/Import_KWalletXml.cpp \ StandardDatabase.cpp \
PwmConfig.cpp \ lib/SecString.cpp \
dialogs/AboutDlg.cpp \ crypto/twoclass.cpp \
dialogs/EditGroupDlg.cpp \ crypto/twofish.cpp \
dialogs/SearchDlg.cpp \ import/Import_PwManager.cpp \
dialogs/SettingsDlg.cpp \ export/Export_Txt.cpp \
dialogs/DatabaseSettingsDlg.cpp \ import/Import_KWalletXml.cpp \
dialogs/PasswordDlg.cpp \ PwmConfig.cpp \
dialogs/SimplePasswordDlg.cpp \ dialogs/AboutDlg.cpp \
dialogs/EditEntryDlg.cpp \ dialogs/EditGroupDlg.cpp \
dialogs/PasswordGenDlg.cpp \ dialogs/SearchDlg.cpp \
dialogs/SelectIconDlg.cpp \ dialogs/SettingsDlg.cpp \
dialogs/CollectEntropyDlg.cpp \ dialogs/DatabaseSettingsDlg.cpp \
lib/random.cpp \ dialogs/PasswordDlg.cpp \
Database.cpp \ dialogs/SimplePasswordDlg.cpp \
lib/KdePlugin.cpp \ dialogs/EditEntryDlg.cpp \
lib/GroupView.cpp \ dialogs/PasswordGenDlg.cpp \
lib/EntryView.cpp \ dialogs/SelectIconDlg.cpp \
lib/FileDialogs.cpp \ dialogs/CollectEntropyDlg.cpp \
crypto/arcfour.cpp \ lib/random.cpp \
lib/KpFileIconProvider.cpp \ Database.cpp \
crypto/aescrypt.c \ lib/KdePlugin.cpp \
crypto/aeskey.c \ lib/GroupView.cpp \
crypto/aestab.c \ lib/EntryView.cpp \
crypto/aes_modes.c \ lib/FileDialogs.cpp \
crypto/sha256.cpp \ crypto/arcfour.cpp \
crypto/yarrow.cpp \ lib/KpFileIconProvider.cpp \
lib/WaitAnimationWidget.cpp crypto/aescrypt.c \
QT += xml crypto/aeskey.c \
MOC_DIR = ../build/moc crypto/aestab.c \
UI_DIR = ../build/ui crypto/aes_modes.c \
OBJECTS_DIR = ../build/ crypto/sha256.cpp \
INCLUDEPATH += ./ crypto/yarrow.cpp \
CONFIG += debug \ lib/WaitAnimationWidget.cpp \
warn_off \ KpxFirefox.cpp
qt \ MOC_DIR = ../build/moc
thread \ UI_DIR = ../build/ui
exceptions \ OBJECTS_DIR = ../build/
stl CONFIG += debug \
TEMPLATE = app qt \
thread \
warn_off \
dbus
QT += dbus xml
TEMPLATE = app
INCLUDEPATH += . \
lib \
crypto \
plugins/interfaces \
export \
import \
dialogs \
./