diff --git a/changelog b/changelog index 0407969..a931a5b 100644 --- a/changelog +++ b/changelog @@ -6,12 +6,16 @@ with KeePassX (no KPX_CUSTOM_ICONS metastream) -removed all old Qt3 support dependecies -implemented correct UUID management for entries +-added delay of 0.3s before performing auto-type +-metastreams now get valid group IDs (KeePass/Win compatibility) -fixed drawing errors when performing drag and drop operations in group view -when there is no translation installed for the system's country preference but - one for the same language the program will now use it + one for the same language the program will use it now -when canceling the file dialog for the opening of an existing database a already openend database will not longer be closed -same for the creation of a new database +-alpha blending for banner icons +-new standard banner icon --------------- 0.2.1 --------------- diff --git a/src/PwManager.cpp b/src/PwManager.cpp index 4dce23f..17ea2ee 100755 --- a/src/PwManager.cpp +++ b/src/PwManager.cpp @@ -248,9 +248,8 @@ bool PwDatabase::parseMetaStream(const CEntry& entry){ if(entry.Additional=="KPX_CUSTOM_ICONS_2") return parseCustomIconsMetaStream(entry.BinaryData); -/* Old stream format will be ignored*/ if(entry.Additional=="KPX_CUSTOM_ICONS") - return true; //return true to avoid that this stream get saved + return parseCustomIconsMetaStreamV1(entry.BinaryData); return false; //unknown MetaStream } @@ -261,6 +260,15 @@ CEntry* PwDatabase::getEntry(const KpxUuid& uuid){ return NULL; } + +/* legacy function */ +bool PwDatabase::parseCustomIconsMetaStreamV1(const QByteArray& dta){ + +return true; + +} + + bool PwDatabase::parseCustomIconsMetaStream(const QByteArray& dta){ quint32 NumIcons,NumEntries,NumGroups,offset; memcpyFromLEnd32(&NumIcons,dta.data()); diff --git a/src/PwManager.h b/src/PwManager.h index 5da16b3..bb389d0 100755 --- a/src/PwManager.h +++ b/src/PwManager.h @@ -93,6 +93,7 @@ private: bool IsMetaStream(CEntry& Entry); bool parseMetaStream(const CEntry& Entry); bool parseCustomIconsMetaStream(const QByteArray& data); + bool parseCustomIconsMetaStreamV1(const QByteArray& data); void createCustomIconsMetaStream(CEntry* dst); void transformKey(quint8* src,quint8* dst,quint8* seed,int rounds); bool readHeader(char* raw); diff --git a/src/main.h b/src/main.h index a3f0313..28c08fb 100644 --- a/src/main.h +++ b/src/main.h @@ -26,7 +26,7 @@ #include #include -#define KEEPASS_VERSION "0.2.1" +#define KEEPASS_VERSION "0.2.2" #define BUILTIN_ICONS 62 typedef enum tKeyType {PASSWORD=0,KEYFILE=1,BOTH=2}; diff --git a/todo b/todo index 66f260f..e69de29 100644 --- a/todo +++ b/todo @@ -1 +0,0 @@ -- no taskbar entry for modal dialog under gnome? \ No newline at end of file