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

changed some copyright headers,

Browse Source 
added copying file,
extended main qmake projekt file, 
implemented all file dialogs for kde,
new icons (bug #1730334),
automatic file extension,
fixed show/hide behavior of the simple password dlg (bug #1722682)

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@145 b624d157-de02-0410-bad0-e51aec6abb33
master
tarek_saidi 18 years ago
parent 895e47554f
commit 13c5615698
107 changed files with 1035 additions and 679 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. 360
      COPYING
  2. 37
      keepass.pro
  3. BIN
      share/keepass/icons/clientic.png
  4. 4
      src/Database.cpp
  5. 4
      src/Database.h
  6. 8
      src/Kdb3Database.cpp
  7. 8
      src/Kdb3Database.h
  8. 4
      src/KpxConfig.cpp
  9. 3
      src/KpxConfig.h
  10. 4
      src/KpxFirefox.cpp
  11. 4
      src/KpxFirefox.h
  12. 49
      src/crypto/aes.h
  13. 57
      src/crypto/aes_modes.c
  14. 50
      src/crypto/aes_tdefs.h
  15. 49
      src/crypto/aescpp.h
  16. 50
      src/crypto/aescrypt.c
  17. 50
      src/crypto/aeskey.c
  18. 50
      src/crypto/aesopt.h
  19. 50
      src/crypto/aestab.c
  20. 51
      src/crypto/aestab.h
  21. 4
      src/crypto/arcfour.cpp
  22. 6
      src/crypto/arcfour.h
  23. 47
      src/crypto/blowfish.cpp
  24. 25
      src/crypto/blowfish.h
  25. 43
      src/crypto/sha1.cpp
  26. 26
      src/crypto/sha1.h
  27. 6
      src/crypto/sha256.cpp
  28. 4
      src/crypto/sha256.h
  29. 47
      src/crypto/twoclass.cpp
  30. 47
      src/crypto/twoclass.h
  31. 45
      src/crypto/yarrow.cpp
  32. 46
      src/crypto/yarrow.h
  33. 4
      src/dialogs/AboutDlg.cpp
  34. 4
      src/dialogs/AboutDlg.h
  35. 4
      src/dialogs/CalendarDlg.cpp
  36. 4
      src/dialogs/CalendarDlg.h
  37. 4
      src/dialogs/CollectEntropyDlg.cpp
  38. 6
      src/dialogs/CollectEntropyDlg.h
  39. 6
      src/dialogs/CustomizeDetailViewDlg.cpp
  40. 6
      src/dialogs/CustomizeDetailViewDlg.h
  41. 4
      src/dialogs/DatabaseSettingsDlg.cpp
  42. 4
      src/dialogs/DatabaseSettingsDlg.h
  43. 4
      src/dialogs/EditEntryDlg.cpp
  44. 4
      src/dialogs/EditEntryDlg.h
  45. 4
      src/dialogs/EditGroupDlg.cpp
  46. 4
      src/dialogs/EditGroupDlg.h
  47. 4
      src/dialogs/ExpiredEntriesDlg.cpp
  48. 4
      src/dialogs/ExpiredEntriesDlg.h
  49. 4
      src/dialogs/PasswordDlg.cpp
  50. 4
      src/dialogs/PasswordDlg.h
  51. 4
      src/dialogs/PasswordGenDlg.cpp
  52. 4
      src/dialogs/PasswordGenDlg.h
  53. 4
      src/dialogs/SearchDlg.cpp
  54. 4
      src/dialogs/SearchDlg.h
  55. 5
      src/dialogs/SelectIconDlg.cpp
  56. 4
      src/dialogs/SelectIconDlg.h
  57. 5
      src/dialogs/SettingsDlg.cpp
  58. 4
      src/dialogs/SettingsDlg.h
  59. 16
      src/dialogs/SimplePasswordDlg.cpp
  60. 4
      src/dialogs/SimplePasswordDlg.h
  61. 4
      src/dialogs/TrashCanDlg.cpp
  62. 4
      src/dialogs/TrashCanDlg.h
  63. 4
      src/export/Export.cpp
  64. 6
      src/export/Export.h
  65. 6
      src/export/Export_KeePassX_Xml.cpp
  66. 4
      src/export/Export_KeePassX_Xml.h
  67. 6
      src/export/Export_Txt.cpp
  68. 4
      src/export/Export_Txt.h
  69. 52
      src/forms/SimplePasswordDlg.ui
  70. 6
      src/import/Import.cpp
  71. 4
      src/import/Import.h
  72. 6
      src/import/Import_KWalletXml.cpp
  73. 4
      src/import/Import_KWalletXml.h
  74. 4
      src/import/Import_KeePassX_Xml.cpp
  75. 6
      src/import/Import_KeePassX_Xml.h
  76. 6
      src/import/Import_PwManager.cpp
  77. 4
      src/import/Import_PwManager.h
  78. 4
      src/lib/AutoType.h
  79. 4
      src/lib/AutoType_Win.cpp
  80. 4
      src/lib/AutoType_X11.cpp
  81. 4
      src/lib/EntryView.cpp
  82. 4
      src/lib/EntryView.h
  83. 30
      src/lib/FileDialogs.cpp
  84. 4
      src/lib/FileDialogs.h
  85. 3
      src/lib/GroupView.cpp
  86. 4
      src/lib/GroupView.h
  87. 4
      src/lib/KpFileIconProvider.cpp
  88. 6
      src/lib/KpFileIconProvider.h
  89. 6
      src/lib/SecString.cpp
  90. 4
      src/lib/SecString.h
  91. 4
      src/lib/UrlLabel.cpp
  92. 6
      src/lib/UrlLabel.h
  93. 4
      src/lib/WaitAnimationWidget.cpp
  94. 4
      src/lib/WaitAnimationWidget.h
  95. 4
      src/lib/random.cpp
  96. 6
      src/lib/random.h
  97. 6
      src/main.h
  98. 5
      src/mainwindow.cpp
  99. 3
      src/mainwindow.h
  100. 6
      src/plugins/gnome/keepassx-gnome.cpp
  101. Some files were not shown because too many files have changed in this diff Show More

360
COPYING
Unescape View File

@ -0,0 +1,360 @@
Copyright (C) 2005-2007 Tarek Saidi <tarek.saidi@arcor.de>
Copyright (C) 2003-2007 Dominik Reichl <dominik.reichl@t-online.de>
Copyright (C) 2001 Niels Müler
Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
Copyright (C) 2003, 2004 Michael Buesch <mbuesch@freenet.de>
Copyright (c) 2003 Dr Brian Gladman, Worcester, UK
Copyright (C) 2001-2003 Christophe Devine
Copyright (C) 1992-2007 Trolltech ASA
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
text of the GNU General Public License below for more details.
---------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
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; either version 2 of the License, or
(at your option) any later version.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

37
keepass.pro
Unescape View File

@ -1,9 +1,28 @@
# Diese Datei wurde mit dem qmake-Manager von KDevelop erstellt. message("See 'Install.txt' for configuration options.")
# ------------------------------------------- message("*** Build Configuration:")
# Unterverzeichnis relativ zum Projektverzeichnis: . TEMPLATE = subdirs
# Das Target ist Projekt im Unterverzeichnis isEmpty(PREFIX){
PREFIX = /usr
CONFIG += release \ }
warn_on isEmpty(KDEDIR){
TEMPLATE = subdirs KDEDIR = /usr
SUBDIRS += src }
SUBDIRS += src
contains(INT_PLUGINS,kde) {
SUBDIRS +=src/plugins/kde
message("Build KDE Plugin: yes")
}
!contains(INT_PLUGINS,kde) {
message("Build KDE Plugin: no")
}
contains(INT_PLUGINS,gtk) {
SUBDIRS +=src/plugins/gnome
message("Build Gnome Plugin: yes")
}
!contains(INT_PLUGINS,gtk) {
message("Build Gnome Plugin: no")
}
message("Install Prefix:" $$PREFIX)
message("KDE Prefix:" $$KDEDIR)
message("*** Makefile successfully generated.")
message("*** Start make now.")

BIN
share/keepass/icons/clientic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

4
src/Database.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/Database.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

8
src/Kdb3Database.cpp
Unescape View File

@ -1,11 +1,10 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2007 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* keepassx@gmail.com * * 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -35,7 +34,6 @@
#include "lib/random.h" #include "lib/random.h"
using namespace std; using namespace std;
#include "Kdb3Database.h" #include "Kdb3Database.h"
#include "main.h"
#include "KpxConfig.h" #include "KpxConfig.h"
#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__);
@ -1703,4 +1701,4 @@ QList<IEntryHandle*> Kdb3Database::trashEntries(){
if(TrashHandles[i].isValid()) if(TrashHandles[i].isValid())
handles << &TrashHandles[i]; handles << &TrashHandles[i];
return handles; return handles;
} }

8
src/Kdb3Database.h
Unescape View File

@ -1,11 +1,10 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005-2007 by Tarek Saidi * * Copyright (C) 2005-2007 by Tarek Saidi *
* keepassx@gmail.com * * 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -39,6 +38,7 @@
#include <QStringList> #include <QStringList>
#include <QPixmap> #include <QPixmap>
#include <QMap> #include <QMap>
#include "main.h"
#include "lib/SecString.h" #include "lib/SecString.h"
#include "Database.h" #include "Database.h"
@ -168,7 +168,7 @@ public:
virtual void addIcon(const QPixmap& icon); virtual void addIcon(const QPixmap& icon);
virtual void removeIcon(int index); virtual void removeIcon(int index);
virtual void replaceIcon(int index,const QPixmap& icon); virtual void replaceIcon(int index,const QPixmap& icon);
virtual int builtinIcons(){return 62;}; virtual int builtinIcons(){return BUILTIN_ICONS;};
virtual void authByPwd(QString& password); virtual void authByPwd(QString& password);
virtual bool authByFile(QString& filename); virtual bool authByFile(QString& filename);
virtual bool authByFileAndPwd(QString& password, QString& filename); virtual bool authByFileAndPwd(QString& password, QString& filename);

4
src/KpxConfig.cpp
Unescape View File

@ -7,8 +7,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

3
src/KpxConfig.h
Unescape View File

@ -7,8 +7,7 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/KpxFirefox.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/KpxFirefox.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

49
src/crypto/aes.h
Unescape View File

@ -1,33 +1,24 @@
/**************************************************************************
* *
* Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
* *
* 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. *
***************************************************************************/
/* /*
---------------------------------------------------------------------------
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved.
LICENSE TERMS
The free distribution and use of this software in both source and binary
form is allowed (with or without changes) provided that:
1. distributions of this source code include the above copyright
notice, this list of conditions and the following disclaimer;
2. distributions in binary form include the above copyright
notice, this list of conditions and the following disclaimer
in the documentation and/or other associated materials;
3. the copyright holder's name is not used to endorse products
built using this software without specific written permission.
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
This file contains the definitions required to use AES in C. See aesopt.h This file contains the definitions required to use AES in C. See aesopt.h
for optimisation details. for optimisation details.

57
src/crypto/aes_modes.c
Unescape View File

@ -1,41 +1,22 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
3. the copyright holder's name is not used to endorse products * Free Software Foundation, Inc., *
built using this software without specific written permission. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
These subroutines implement multiple block AES modes for ECB, CBC, CFB,
OFB and CTR encryption, The code provides support for the VIA Advanced
Cryptography Engine (ACE).
NOTE: In the following subroutines, the AES contexts (ctx) must be
16 byte aligned if VIA ACE is being used
*/
#include <memory.h> #include <memory.h>
#include <assert.h> #include <assert.h>

50
src/crypto/aes_tdefs.h
Unescape View File

@ -1,34 +1,24 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
3. the copyright holder's name is not used to endorse products * Free Software Foundation, Inc., *
built using this software without specific written permission. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
/*
The unsigned integer types defined here are of the form uint_<nn>t where The unsigned integer types defined here are of the form uint_<nn>t where
<nn> is the length of the type; for example, the unsigned 32-bit type is <nn> is the length of the type; for example, the unsigned 32-bit type is
'uint_32t'. These are NOT the same as the 'C99 integer types' that are 'uint_32t'. These are NOT the same as the 'C99 integer types' that are

49
src/crypto/aescpp.h
Unescape View File

@ -1,33 +1,24 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * 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. *
***************************************************************************/
3. the copyright holder's name is not used to endorse products /*
built using this software without specific written permission.
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
This file contains the definitions required to use AES (Rijndael) in C++. This file contains the definitions required to use AES (Rijndael) in C++.
*/ */

50
src/crypto/aescrypt.c
Unescape View File

@ -1,34 +1,22 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
3. the copyright holder's name is not used to endorse products * Free Software Foundation, Inc., *
built using this software without specific written permission. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
*/
#include "aesopt.h" #include "aesopt.h"
#include "aestab.h" #include "aestab.h"

50
src/crypto/aeskey.c
Unescape View File

@ -1,34 +1,22 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
3. the copyright holder's name is not used to endorse products * Free Software Foundation, Inc., *
built using this software without specific written permission. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
*/
#include "aesopt.h" #include "aesopt.h"
#include "aestab.h" #include "aestab.h"

50
src/crypto/aesopt.h
Unescape View File

@ -1,34 +1,24 @@
/**************************************************************************
* *
* Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
* *
* 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. *
***************************************************************************/
/* /*
---------------------------------------------------------------------------
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved.
LICENSE TERMS
The free distribution and use of this software in both source and binary
form is allowed (with or without changes) provided that:
1. distributions of this source code include the above copyright
notice, this list of conditions and the following disclaimer;
2. distributions in binary form include the above copyright
notice, this list of conditions and the following disclaimer
in the documentation and/or other associated materials;
3. the copyright holder's name is not used to endorse products
built using this software without specific written permission.
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
This file contains the compilation options for AES (Rijndael) and code This file contains the compilation options for AES (Rijndael) and code
that is common across encryption, key scheduling and table generation. that is common across encryption, key scheduling and table generation.

50
src/crypto/aestab.c
Unescape View File

@ -1,34 +1,22 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
3. the copyright holder's name is not used to endorse products * Free Software Foundation, Inc., *
built using this software without specific written permission. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL),
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
*/
#define DO_TABLES #define DO_TABLES

51
src/crypto/aestab.h
Unescape View File

@ -1,33 +1,24 @@
/* /**************************************************************************
--------------------------------------------------------------------------- * *
Copyright (c) 2003, Dr Brian Gladman, Worcester, UK. All rights reserved. * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Copyright (c) 2003 Dr Brian Gladman, Worcester, UK *
LICENSE TERMS * *
* This program is free software; you can redistribute it and/or modify *
The free distribution and use of this software in both source and binary * it under the terms of the GNU General Public License as published by *
form is allowed (with or without changes) provided that: * the Free Software Foundation; version 2 of the License. *
* *
1. distributions of this source code include the above copyright * This program is distributed in the hope that it will be useful, *
notice, this list of conditions and the following disclaimer; * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
2. distributions in binary form include the above copyright * GNU General Public License for more details. *
notice, this list of conditions and the following disclaimer * *
in the documentation and/or other associated materials; * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
3. the copyright holder's name is not used to endorse products * Free Software Foundation, Inc., *
built using this software without specific written permission. * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
ALTERNATIVELY, provided that this notice is retained in full, this product
may be distributed under the terms of the GNU General Public License (GPL), /*
in which case the provisions of the GPL apply INSTEAD OF those given above.
DISCLAIMER
This software is provided 'as is' with no explicit or implied warranties
in respect of its properties, including, but not limited to, correctness
and/or fitness for purpose.
---------------------------------------------------------------------------
Issue 31/01/2006
This file contains the code for declaring the tables needed to implement This file contains the code for declaring the tables needed to implement
AES. The file aesopt.h is assumed to be included before this header file. AES. The file aesopt.h is assumed to be included before this header file.

4
src/crypto/arcfour.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/crypto/arcfour.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -42,4 +42,4 @@ private:
}; };
#endif #endif

47
src/crypto/blowfish.cpp
Unescape View File

@ -1,28 +1,25 @@
/* 2003.05.02: Derived from libgcrypt-1.1.12 by Michael Buesch */ /**************************************************************************
* Implementation of the Blowfish chiper *
/* blowfish.c - Blowfish encryption * Derived from Libgcrypt *
* Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. * *
* * Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. *
* This file is part of Libgcrypt. * Copyright (C) 2003 by Michael Buesch *
* * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* Libgcrypt is free software; you can redistribute it and/or modify * *
* it under the terms of the GNU Lesser general Public License as * This program is free software; you can redistribute it and/or modify *
* published by the Free Software Foundation; either version 2.1 of * it under the terms of the GNU General Public License as published by *
* the License, or (at your option) any later version. * the Free Software Foundation; version 2 of the License. *
* * *
* Libgcrypt is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. * GNU General Public License for more details. *
* * *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU General Public License *
* License along with this program; if not, write to the Free Software * along with this program; if not, write to the *
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Free Software Foundation, Inc., *
* * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* For a description of the algorithm, see: ***************************************************************************/
* Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
* ISBN 0-471-11709-9. Pages 336 ff.
*/
/* Test values: /* Test values:
* key "abcdefghijklmnopqrstuvwxyz"; * key "abcdefghijklmnopqrstuvwxyz";

25
src/crypto/blowfish.h
Unescape View File

@ -1,15 +1,24 @@
/*************************************************************************** /**************************************************************************
* Implementation of the Blowfish chiper *
* Derived from Libgcrypt *
* * * *
* copyright (C) 2003, 2004 by Michael Buesch * * Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. *
* email: mbuesch@freenet.de * * Copyright (C) 2003, 2004 by Michael Buesch <mbuesch@freenet.de> *
* * * Copyright (C) 2007 by Tarek Saidi <tarek.saidi@arcor.de> *
* blowfish.c - Blowfish encryption *
* Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc. *
* * * *
* 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 version 2 * * it under the terms of the GNU General Public License as published by *
* as published by the Free Software Foundation. * * 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 BLOWFISH_H #ifndef BLOWFISH_H

43
src/crypto/sha1.cpp
Unescape View File

@ -1,24 +1,25 @@
/* /***************************************************************************
100% free public domain implementation of the SHA-1 algorithm * Implementation of the SHA-1 algorithm *
by Dominik Reichl <dominik.reichl@t-online.de> * by Dominik Reichl <dominik.reichl@t-online.de> (public domain) *
* *
Version 1.5 - 2005-01-01 * Copyright (C) 2007 by Tarek Saidi *
- 64-bit compiler compatibility added * tarek.saidi@arcor.de *
- Made variable wiping optional (define SHA1_WIPE_VARIABLES) * *
- Removed unnecessary variable initializations * This program is free software; you can redistribute it and/or modify *
- ROL32 improvement for the Microsoft compiler (using _rotl) * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; version 2 of the License. *
======== Test Vectors (from FIPS PUB 180-1) ======== * *
* This program is distributed in the hope that it will be useful, *
SHA1("abc") = * but WITHOUT ANY WARRANTY; without even the implied warranty of *
A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
SHA1("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq") = * *
84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
SHA1(A million repetitions of "a") = * Free Software Foundation, Inc., *
34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
*/ ***************************************************************************/
#include "global.h" #include "global.h"
#include "sha1.h" #include "sha1.h"

26
src/crypto/sha1.h
Unescape View File

@ -1,7 +1,27 @@
/* /***************************************************************************
100% free public domain implementation of the SHA-1 algorithm * Implementation of the SHA-1 algorithm *
by Dominik Reichl <dominik.reichl@t-online.de> * by Dominik Reichl <dominik.reichl@t-online.de> (no copyright) *
* *
* 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. *
***************************************************************************/
/*
Version 1.5 - 2005-01-01 Version 1.5 - 2005-01-01
- 64-bit compiler compatibility added - 64-bit compiler compatibility added
- Made variable wiping optional (define SHA1_WIPE_VARIABLES) - Made variable wiping optional (define SHA1_WIPE_VARIABLES)

6
src/crypto/sha256.cpp
Unescape View File

@ -5,8 +5,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -265,4 +265,4 @@ void sha256_finish( sha256_context *ctx, quint8 digest[32] )
PUT_qquint32( ctx->state[5], digest, 20 ); PUT_qquint32( ctx->state[5], digest, 20 );
PUT_qquint32( ctx->state[6], digest, 24 ); PUT_qquint32( ctx->state[6], digest, 24 );
PUT_qquint32( ctx->state[7], digest, 28 ); PUT_qquint32( ctx->state[7], digest, 28 );
} }

4
src/crypto/sha256.h
Unescape View File

@ -5,8 +5,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

47
src/crypto/twoclass.cpp
Unescape View File

@ -1,31 +1,22 @@
/* /***************************************************************************
Copyright (c) 2003/2004, Dominik Reichl <dominik.reichl@t-online.de> * Copyright (C) 2005-2007 Tarek Saidi <tarek.saidi@arcor.de> *
All rights reserved. * Copyright (c) 2003,2004 Dominik Reichl <dominik.reichl@t-online.de> *
* *
Redistribution and use in source and binary forms, with or without * This program is free software; you can redistribute it and/or modify *
modification, are permitted provided that the following conditions are met: * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; version 2 of the License. *
- Redistributions of source code must retain the above copyright notice, * *
this list of conditions and the following disclaimer. * This program is distributed in the hope that it will be useful, *
- Redistributions in binary form must reproduce the above copyright notice, * but WITHOUT ANY WARRANTY; without even the implied warranty of *
this list of conditions and the following disclaimer in the documentation * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
and/or other materials provided with the distribution. * GNU General Public License for more details. *
- Neither the name of ReichlSoft nor the names of its contributors may be * *
used to endorse or promote products derived from this software without * You should have received a copy of the GNU General Public License *
specific prior written permission. * along with this program; if not, write to the *
* Free Software Foundation, Inc., *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ***************************************************************************/
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#include <qstring.h> #include <qstring.h>
#include "twoclass.h" #include "twoclass.h"

47
src/crypto/twoclass.h
Unescape View File

@ -1,31 +1,22 @@
/* /***************************************************************************
Copyright (c) 2003/2004, Dominik Reichl <dominik.reichl@t-online.de> * Copyright (C) 2005-2007 Tarek Saidi <tarek.saidi@arcor.de> *
All rights reserved. * Copyright (c) 2003,2004 Dominik Reichl <dominik.reichl@t-online.de> *
* *
Redistribution and use in source and binary forms, with or without * This program is free software; you can redistribute it and/or modify *
modification, are permitted provided that the following conditions are met: * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; version 2 of the License. *
- Redistributions of source code must retain the above copyright notice, * *
this list of conditions and the following disclaimer. * This program is distributed in the hope that it will be useful, *
- Redistributions in binary form must reproduce the above copyright notice, * but WITHOUT ANY WARRANTY; without even the implied warranty of *
this list of conditions and the following disclaimer in the documentation * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
and/or other materials provided with the distribution. * GNU General Public License for more details. *
- Neither the name of ReichlSoft nor the names of its contributors may be * *
used to endorse or promote products derived from this software without * You should have received a copy of the GNU General Public License *
specific prior written permission. * along with this program; if not, write to the *
* Free Software Foundation, Inc., *
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ***************************************************************************/
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ___TWOFISH_CLASS_H___ #ifndef ___TWOFISH_CLASS_H___
#define ___TWOFISH_CLASS_H___ #define ___TWOFISH_CLASS_H___

45
src/crypto/yarrow.cpp
Unescape View File

@ -1,27 +1,24 @@
/* yarrow256.c /***************************************************************************
* * The yarrow pseudo-randomness genrator *
* The yarrow pseudo-randomness generator. * extracted from nettle, the low-level cryptographics library *
*/ * *
* Copyright (C) 2007 Tarek Saidi <tarek.saidi@arcor.de> *
/* nettle, low-level cryptographics library * Copyright (C) 2001 Niels Müler *
* * *
* Copyright (C) 2001 Niels M<EFBFBD>ler * 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 nettle library is free software; you can redistribute it and/or modify * the Free Software Foundation; version 2 of the License. *
* it under the terms of the GNU Lesser General Public License as published by * *
* the Free Software Foundation; either version 2.1 of the License, or (at your * This program is distributed in the hope that it will be useful, *
* option) any later version. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* The nettle library is distributed in the hope that it will be useful, but * GNU General Public License for more details. *
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * *
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * You should have received a copy of the GNU General Public License *
* License for more details. * along with this program; if not, write to the *
* * Free Software Foundation, Inc., *
* You should have received a copy of the GNU Lesser General Public License * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with the nettle library; see the file COPYING.LIB. If not, write to ***************************************************************************/
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
# include "config.h" # include "config.h"

46
src/crypto/yarrow.h
Unescape View File

@ -1,27 +1,25 @@
/* yarrow.h /***************************************************************************
* * The yarrow pseudo-randomness genrator *
* The yarrow pseudo-randomness generator. * extracted from nettle, the low-level cryptographics library *
*/ * *
* Copyright (C) 2007 Tarek Saidi <tarek.saidi@arcor.de> *
/* nettle, low-level cryptographics library * Copyright (C) 2001 Niels Müler *
* * *
* Copyright (C) 2001 Niels M<EFBFBD>ler * 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 nettle library is free software; you can redistribute it and/or modify * the Free Software Foundation; version 2 of the License. *
* it under the terms of the GNU Lesser General Public License as published by * *
* the Free Software Foundation; either version 2.1 of the License, or (at your * This program is distributed in the hope that it will be useful, *
* option) any later version. * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* The nettle library is distributed in the hope that it will be useful, but * GNU General Public License for more details. *
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * *
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public * You should have received a copy of the GNU General Public License *
* License for more details. * along with this program; if not, write to the *
* * Free Software Foundation, Inc., *
* You should have received a copy of the GNU Lesser General Public License * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* along with the nettle library; see the file COPYING.LIB. If not, write to ***************************************************************************/
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef NETTLE_YARROW_COMPAT_H_INCLUDED #ifndef NETTLE_YARROW_COMPAT_H_INCLUDED
#define NETTLE_YARROW_COMPAT_H_INCLUDED #define NETTLE_YARROW_COMPAT_H_INCLUDED

4
src/dialogs/AboutDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/AboutDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/CalendarDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/CalendarDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/CollectEntropyDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/dialogs/CollectEntropyDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -51,4 +51,4 @@ class CollectEntropyDlg: public QDialog, public Ui_CollectEntropyDlg{
#endif #endif

6
src/dialogs/CustomizeDetailViewDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -214,4 +214,4 @@ void CustomizeDetailViewDialog::OnRestoreDefault(){
loadDefaultDetailViewTemplate(); loadDefaultDetailViewTemplate();
HtmlEdit->setPlainText(DetailViewTemplate); HtmlEdit->setPlainText(DetailViewTemplate);
RichEdit->setHtml(DetailViewTemplate); RichEdit->setHtml(DetailViewTemplate);
} }

6
src/dialogs/CustomizeDetailViewDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -52,4 +52,4 @@ class CustomizeDetailViewDialog : public QDialog, public Ui_CustomizeDetailViewD
}; };
#endif #endif

4
src/dialogs/DatabaseSettingsDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/DatabaseSettingsDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/EditEntryDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/EditEntryDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/EditGroupDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/EditGroupDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/ExpiredEntriesDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/ExpiredEntriesDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/PasswordDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/PasswordDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/PasswordGenDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/PasswordGenDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/SearchDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/SearchDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

5
src/dialogs/SelectIconDlg.cpp
Unescape View File

@ -4,8 +4,7 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -124,4 +123,4 @@ void CSelectIconDlg::showEvent(QShowEvent *event){
updateView(); updateView();
List->setCurrentItem(List->item(Id)); List->setCurrentItem(List->item(Id));
} }
} }

4
src/dialogs/SelectIconDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

5
src/dialogs/SettingsDlg.cpp
Unescape View File

@ -1,11 +1,10 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2005 by Tarek Saidi * * Copyright (C) 2005 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/SettingsDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

16
src/dialogs/SimplePasswordDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -28,11 +28,11 @@ SimplePasswordDialog::SimplePasswordDialog(QWidget* parent, bool modal, Qt::WFl
: QDialog(parent,fl) : QDialog(parent,fl)
{ {
setupUi(this); setupUi(this);
if(!config->showPasswords())Button_HidePassword->toggle();
connect(buttonBox->button(QDialogButtonBox::Ok),SIGNAL(clicked()),this,SLOT(OnOK())); connect(buttonBox->button(QDialogButtonBox::Ok),SIGNAL(clicked()),this,SLOT(OnOK()));
connect(buttonBox->button(QDialogButtonBox::Cancel),SIGNAL(clicked()),this,SLOT(OnCancel())); connect(buttonBox->button(QDialogButtonBox::Cancel),SIGNAL(clicked()),this,SLOT(OnCancel()));
connect(Button_HidePassword,SIGNAL(toggled(bool)),this,SLOT(OnHidePasswordToggled(bool))); connect(Button_HidePassword,SIGNAL(toggled(bool)),this,SLOT(OnHidePasswordToggled(bool)));
connect(EditPassword,SIGNAL(textChanged(const QString&)),this,SLOT(OnTextChanged(const QString&))); connect(EditPassword,SIGNAL(textChanged(const QString&)),this,SLOT(OnTextChanged(const QString&)));
if(!config->showPasswordsPasswordDlg())Button_HidePassword->toggle();
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
} }
@ -62,6 +62,12 @@ void SimplePasswordDialog::OnOK()
void SimplePasswordDialog::OnHidePasswordToggled(bool state) void SimplePasswordDialog::OnHidePasswordToggled(bool state)
{ {
if(state)EditPassword->setEchoMode(QLineEdit::Password); if(state){
else EditPassword->setEchoMode(QLineEdit::Normal); EditPassword->setEchoMode(QLineEdit::Password);
Button_HidePassword->setIcon(getIcon("pwd_hide"));
}
else {
EditPassword->setEchoMode(QLineEdit::Normal);
Button_HidePassword->setIcon(getIcon("pwd_show"));
}
} }

4
src/dialogs/SimplePasswordDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/TrashCanDlg.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/dialogs/TrashCanDlg.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/export/Export.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/export/Export.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -41,4 +41,4 @@ class ExporterBase:public QObject{
#endif #endif

6
src/export/Export_KeePassX_Xml.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -113,4 +113,4 @@ void Export_KeePassX_Xml::addEntry(IEntryHandle* entry,QDomElement& parent,QDomD
GroupElement.appendChild(LastAccess); GroupElement.appendChild(LastAccess);
GroupElement.appendChild(LastMod); GroupElement.appendChild(LastMod);
GroupElement.appendChild(Expire); GroupElement.appendChild(Expire);
} }

4
src/export/Export_KeePassX_Xml.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/export/Export_Txt.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -58,4 +58,4 @@ bool Export_Txt::exportDatabase(QWidget* GuiParent, IDatabase* db){
} }
delete file; delete file;
return true; return true;
} }

4
src/export/Export_Txt.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

52
src/forms/SimplePasswordDlg.ui
Unescape View File

@ -10,9 +10,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
<hsizetype>0</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -33,26 +31,42 @@
<string>Enter your Password</string> <string>Enter your Password</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </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> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </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> <item>
<widget class="QLabel" name="textLabel1" > <widget class="QLabel" name="textLabel1" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<hsizetype>4</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -68,27 +82,25 @@
<item> <item>
<widget class="QPushButton" name="Button_HidePassword" > <widget class="QPushButton" name="Button_HidePassword" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<hsizetype>5</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>28</width> <width>23</width>
<height>0</height> <height>23</height>
</size> </size>
</property> </property>
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>28</width> <width>23</width>
<height>16777215</height> <height>23</height>
</size> </size>
</property> </property>
<property name="text" > <property name="text" >
<string>...</string> <string/>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string/> <string/>

6
src/import/Import.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -40,4 +40,4 @@ QString ImporterBase::getPassword(QWidget* parent){
SimplePasswordDialog dlg(parent); SimplePasswordDialog dlg(parent);
dlg.exec(); dlg.exec();
return dlg.password; return dlg.password;
} }

4
src/import/Import.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/import/Import_KWalletXml.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -67,4 +67,4 @@ bool Import_KWalletXml::importDatabase(QWidget* GuiParent, IDatabase* db){
} }
} }
return true; return true;
} }

4
src/import/Import_KWalletXml.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/import/Import_KeePassX_Xml.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/import/Import_KeePassX_Xml.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -38,4 +38,4 @@ class Import_KeePassX_Xml:public IImport, public ImporterBase{
}; };
#endif #endif

6
src/import/Import_PwManager.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -166,4 +166,4 @@ bool Import_PwManager::xml_parseEntryAttributes(QDomElement* EntryElement,IGroup
e->setComment(comment); e->setComment(comment);
e->setUrl(EntryElement->elementsByTagName("u").item(0).toElement().text()); e->setUrl(EntryElement->elementsByTagName("u").item(0).toElement().text());
return true; return true;
} }

4
src/import/Import_PwManager.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/AutoType.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/AutoType_Win.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/AutoType_X11.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/EntryView.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/EntryView.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

30
src/lib/FileDialogs.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -104,7 +104,29 @@ QString QtStandardFileDialogs::saveFileDialog(QWidget* parent,QString title,QStr
FileDlg.setConfirmOverwrite(ShowOverwriteWarning); FileDlg.setConfirmOverwrite(ShowOverwriteWarning);
if(!FileDlg.exec())return QString(); if(!FileDlg.exec())return QString();
LastFilter=FileDlg.filters().indexOf(FileDlg.selectedFilter()); LastFilter=FileDlg.filters().indexOf(FileDlg.selectedFilter());
return FileDlg.selectedFiles().first();
//Check whether the file has an extension which fits to the selected filter
QString filepath=FileDlg.selectedFiles()[0];
QString filename=filepath.right(filepath.length()-filepath.lastIndexOf("/")-1);
int a=Filters[LastFilter].indexOf('(');
int b=Filters[LastFilter].indexOf(')');
QStringList Extensions=Filters[LastFilter].mid(a+1,b-a-1).split(" ");
if(Extensions.contains("*"))
return filepath;
for(int i=0;i<Extensions.size();i++)
Extensions[i].remove(0,2); //remove the *. from the extensions
if(filename.contains(".")){
int p=filename.lastIndexOf(".");
QString ext=filename.right(filename.size()-p-1).toLower();
if(Extensions.contains(ext))
return filepath;
else
return filepath+"."+Extensions[0];
}
else
return filepath+"."+Extensions[0];
} }
int QtStandardFileDialogs::getLastFilter(){ int QtStandardFileDialogs::getLastFilter(){
@ -163,4 +185,4 @@ void FileDlgHistory::load(){
void FileDlgHistory::clear(){ void FileDlgHistory::clear(){
History=QHash<QString,Entry>(); History=QHash<QString,Entry>();
config->clearFileDlgHistory(); config->clearFileDlgHistory();
} }

4
src/lib/FileDialogs.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

3
src/lib/GroupView.cpp
Unescape View File

@ -4,8 +4,7 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/GroupView.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/KpFileIconProvider.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/lib/KpFileIconProvider.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -25,4 +25,4 @@ class KpFileIconProvider : public QFileIconProvider{
public: public:
virtual QIcon icon(IconType type) const; virtual QIcon icon(IconType type) const;
virtual QIcon icon(const QFileInfo& info) const; virtual QIcon icon(const QFileInfo& info) const;
}; };

6
src/lib/SecString.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -105,4 +105,4 @@ unsigned char* sessionkey=new unsigned char[32];
randomize(sessionkey,32); randomize(sessionkey,32);
RC4.setKey(sessionkey,32); RC4.setKey(sessionkey,32);
delete [] sessionkey; delete [] sessionkey;
} }

4
src/lib/SecString.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/UrlLabel.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/lib/UrlLabel.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -45,4 +45,4 @@ QString URL;
}; };
#endif #endif

4
src/lib/WaitAnimationWidget.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/WaitAnimationWidget.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

4
src/lib/random.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/lib/random.h
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -17,4 +17,4 @@
* 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. *
***************************************************************************/ ***************************************************************************/
extern void getRandomBytes(void* buffer,int NumBlocks,int BlockSize=1,bool Strong=false); extern void getRandomBytes(void* buffer,int NumBlocks,int BlockSize=1,bool Strong=false);

6
src/main.h
Unescape View File

@ -4,8 +4,7 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -17,6 +16,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 _MAIN_H_ #ifndef _MAIN_H_
#define _MAIN_H_ #define _MAIN_H_
@ -30,7 +30,7 @@
#define APP_NAME "KeePassX" #define APP_NAME "KeePassX"
#define APP_FUNC "Password Manager" #define APP_FUNC "Password Manager"
#define KEEPASS_VERSION "0.2.3" #define KEEPASS_VERSION "0.2.3"
#define BUILTIN_ICONS 62 #define BUILTIN_ICONS 65
typedef enum tKeyType {PASSWORD=0,KEYFILE=1,BOTH=2}; typedef enum tKeyType {PASSWORD=0,KEYFILE=1,BOTH=2};
class KpxConfig; class KpxConfig;

5
src/mainwindow.cpp
Unescape View File

@ -4,8 +4,7 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -1029,4 +1028,4 @@ void KeepassMainWindow::OnUnLockWorkspace(){
FileUnLockWorkspaceAction->setText(tr("Un&lock Workspace")); FileUnLockWorkspaceAction->setText(tr("Un&lock Workspace"));
IsLocked=true; IsLocked=true;
} }
} }

3
src/mainwindow.h
Unescape View File

@ -4,8 +4,7 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *

6
src/plugins/gnome/keepassx-gnome.cpp
Unescape View File

@ -4,8 +4,8 @@
* * * *
* 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 *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; version 2 of the License. *
* (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
@ -136,4 +136,4 @@ QString GnomePlugin::saveFileDialog(QWidget* parent,QString title,QString dir,QS
g_free(filename_cstring); g_free(filename_cstring);
} }
gtk_widget_destroy(FileDlg); gtk_widget_destroy(FileDlg);
return filename;} return filename;}

Some files were not shown because too many files have changed in this diff Show More