Compare commits

...
This repo is archived. You can view files and clone it, but cannot push or open issues/pull-requests.

5 Commits
master ... qt5

  1. 0
      keepassx1.pro
  2. 4
      share/CMakeLists.txt
  3. 2
      share/applications/keepassx1.desktop
  4. 0
      share/keepassx1/i18n/keepassx-de_DE.qm
  5. 0
      share/keepassx1/i18n/keepassx-es_ES.qm
  6. 0
      share/keepassx1/i18n/keepassx-fi_FI.qm
  7. 0
      share/keepassx1/i18n/keepassx-fr_FR.qm
  8. 0
      share/keepassx1/i18n/keepassx-gl_ES.qm
  9. 0
      share/keepassx1/i18n/keepassx-hu_HU.qm
  10. 0
      share/keepassx1/i18n/keepassx-it_IT.qm
  11. 0
      share/keepassx1/i18n/keepassx-ja_JP.qm
  12. 0
      share/keepassx1/i18n/keepassx-nb_NO.qm
  13. 0
      share/keepassx1/i18n/keepassx-nl_NL.qm
  14. 0
      share/keepassx1/i18n/keepassx-pl_PL.qm
  15. 0
      share/keepassx1/i18n/keepassx-pt_PT.qm
  16. 0
      share/keepassx1/i18n/keepassx-ru_RU.qm
  17. 0
      share/keepassx1/i18n/keepassx-sk_SK.qm
  18. 0
      share/keepassx1/i18n/keepassx-sr_RS.qm
  19. 0
      share/keepassx1/i18n/keepassx-tr_TR.qm
  20. 0
      share/keepassx1/i18n/keepassx-uk_UA.qm
  21. 0
      share/keepassx1/i18n/keepassx-zh_CN.qm
  22. 0
      share/keepassx1/i18n/qt_fi.qm
  23. 0
      share/keepassx1/i18n/qt_gl_ES.qm
  24. 0
      share/keepassx1/i18n/qt_hu.qm
  25. 0
      share/keepassx1/i18n/qt_it.qm
  26. 0
      share/keepassx1/i18n/qt_nl.qm
  27. 0
      share/keepassx1/i18n/qt_sr.qm
  28. 0
      share/keepassx1/i18n/qt_tr.qm
  29. 0
      share/keepassx1/icons/alarmclock.png
  30. 0
      share/keepassx1/icons/appsettings.png
  31. 0
      share/keepassx1/icons/autotype.png
  32. 0
      share/keepassx1/icons/bookmark.png
  33. 0
      share/keepassx1/icons/bookmark_add.png
  34. 0
      share/keepassx1/icons/bookmark_del.png
  35. 0
      share/keepassx1/icons/bookmark_edit.png
  36. 0
      share/keepassx1/icons/bookmark_folder.png
  37. 0
      share/keepassx1/icons/bookmark_this.png
  38. 0
      share/keepassx1/icons/clientic.png
  39. 0
      share/keepassx1/icons/clock.png
  40. 0
      share/keepassx1/icons/cloneentry.png
  41. 0
      share/keepassx1/icons/copypwd.png
  42. 0
      share/keepassx1/icons/copyusername.png
  43. 0
      share/keepassx1/icons/dbsearch.png
  44. 0
      share/keepassx1/icons/dbsettings.png
  45. 0
      share/keepassx1/icons/delete.png
  46. 0
      share/keepassx1/icons/deleteentry.png
  47. 0
      share/keepassx1/icons/deletegroup.png
  48. 0
      share/keepassx1/icons/dice.png
  49. 0
      share/keepassx1/icons/document.png
  50. 0
      share/keepassx1/icons/down.png
  51. 0
      share/keepassx1/icons/editentry.png
  52. 0
      share/keepassx1/icons/editgroup.png
  53. 0
      share/keepassx1/icons/exit.png
  54. 0
      share/keepassx1/icons/expired.png
  55. 0
      share/keepassx1/icons/fileclose.png
  56. 0
      share/keepassx1/icons/filedelete.png
  57. 0
      share/keepassx1/icons/filenew.png
  58. 0
      share/keepassx1/icons/fileopen.png
  59. 0
      share/keepassx1/icons/filesave.png
  60. 0
      share/keepassx1/icons/filesaveas.png
  61. 0
      share/keepassx1/icons/filesavedisabled.png
  62. 0
      share/keepassx1/icons/generator.png
  63. 0
      share/keepassx1/icons/go-home.png
  64. 0
      share/keepassx1/icons/go-next.png
  65. 0
      share/keepassx1/icons/go-previous.png
  66. 0
      share/keepassx1/icons/groupsearch.png
  67. 0
      share/keepassx1/icons/help.png
  68. 0
      share/keepassx1/icons/help_about.png
  69. 0
      share/keepassx1/icons/i18n.png
  70. 0
      share/keepassx1/icons/keepassx.png
  71. 0
      share/keepassx1/icons/keepassx_large.png
  72. 0
      share/keepassx1/icons/keepassx_locked.png
  73. 0
      share/keepassx1/icons/keepassx_small.png
  74. 0
      share/keepassx1/icons/key.png
  75. 0
      share/keepassx1/icons/lock.png
  76. 0
      share/keepassx1/icons/manual.png
  77. 0
      share/keepassx1/icons/newentry.png
  78. 0
      share/keepassx1/icons/newgroup.png
  79. 0
      share/keepassx1/icons/ok.png
  80. 0
      share/keepassx1/icons/openurl.png
  81. 0
      share/keepassx1/icons/pwd_hide.png
  82. 0
      share/keepassx1/icons/pwd_show.png
  83. 0
      share/keepassx1/icons/restore.png
  84. 0
      share/keepassx1/icons/search.png
  85. 0
      share/keepassx1/icons/swap.png
  86. 0
      share/keepassx1/icons/templates.png
  87. 0
      share/keepassx1/icons/text_block.png
  88. 0
      share/keepassx1/icons/text_bold.png
  89. 0
      share/keepassx1/icons/text_center.png
  90. 0
      share/keepassx1/icons/text_italic.png
  91. 0
      share/keepassx1/icons/text_left.png
  92. 0
      share/keepassx1/icons/text_right.png
  93. 0
      share/keepassx1/icons/text_under.png
  94. 0
      share/keepassx1/icons/trashcan.png
  95. 0
      share/keepassx1/icons/up.png
  96. 0
      share/keepassx1/license.html
  97. 0
      share/mime/packages/keepassx1.xml
  98. 32
      src/CMakeLists.txt
  99. 2
      src/Kdb3Database.cpp
  100. 6
      src/KpxConfig.h
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,13 +1,13 @@
# CMake is still experimental, use qmake instead
INSTALL(DIRECTORY keepassx/i18n keepassx/icons
INSTALL(DIRECTORY keepassx1/i18n keepassx/icons
DESTINATION ${SHAREDIR}
PATTERN *.qm EXCLUDE
PATTERN *~ EXCLUDE
PATTERN .svn EXCLUDE
)
INSTALL(FILES keepassx/license.html DESTINATION ${SHAREDIR})
INSTALL(FILES keepassx1/license.html DESTINATION ${SHAREDIR})
IF (NOT MINGW AND NOT APPLE)
INSTALL(DIRECTORY applications

@ -4,7 +4,7 @@ GenericName=Cross Platform Password Manager
GenericName[de]=Passwortverwaltung
GenericName[es]=Gestor de contraseñas multiplataforma
GenericName[fr]=Gestionnaire de mot de passe
Exec=keepassx %f
Exec=keepassx1 %f
Icon=keepassx
Comment=Cross Platform Password Manager
Comment[de]=Passwortverwaltung

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 898 B

After

Width:  |  Height:  |  Size: 898 B

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Before

Width:  |  Height:  |  Size: 634 B

After

Width:  |  Height:  |  Size: 634 B

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before

Width:  |  Height:  |  Size: 754 B

After

Width:  |  Height:  |  Size: 754 B

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 818 B

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 213 B

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 183 B

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -122,22 +122,22 @@ SET(keepassx_FORMS
SET(keepassx_RESOURCES res/resources.qrc)
set(keepassx_TRANSLATIONS
# translations/keepassx-cs_CZ.ts
translations/keepassx-de_DE.ts
translations/keepassx-es_ES.ts
translations/keepassx-fi_FI.ts
translations/keepassx-fr_FR.ts
translations/keepassx-gl_ES.ts
translations/keepassx-hu_HU.ts
translations/keepassx-it_IT.ts
translations/keepassx-ja_JP.ts
translations/keepassx-nb_NO.ts
translations/keepassx-nl_NL.ts
translations/keepassx-pl_PL.ts
translations/keepassx-ru_RU.ts
translations/keepassx-tr_TR.ts
translations/keepassx-uk_UA.ts
translations/keepassx-zh_CN.ts
# translations/keepassx1-cs_CZ.ts
translations/keepassx1-de_DE.ts
translations/keepassx1-es_ES.ts
translations/keepassx1-fi_FI.ts
translations/keepassx1-fr_FR.ts
translations/keepassx1-gl_ES.ts
translations/keepassx1-hu_HU.ts
translations/keepassx1-it_IT.ts
translations/keepassx1-ja_JP.ts
translations/keepassx1-nb_NO.ts
translations/keepassx1-nl_NL.ts
translations/keepassx1-pl_PL.ts
translations/keepassx1-ru_RU.ts
translations/keepassx1-tr_TR.ts
translations/keepassx1-uk_UA.ts
translations/keepassx1-zh_CN.ts
translations/qt_fi.ts
translations/qt_hu.ts
translations/qt_it.ts

@ -883,7 +883,7 @@ void Kdb3Database::GroupHandle::setIndex(int index){
*/
bool Kdb3Database::convHexToBinaryKey(char* HexKey, char* dst){
QString hex=QString::fromAscii(HexKey,64);
QString hex=QString::fromLatin1(HexKey,64);
for(int i=0; i<64; i+=2){
bool err;
quint8 bin;

@ -25,11 +25,11 @@
#include "lib/AutoType.h"
#if defined(Q_WS_MAC)
#if defined(Q_OS_MAC)
# define DEFAULT_MOUNT_DIR "/Volumes/"
#elif defined(Q_WS_X11)
#elif defined(Q_OS_LINUX)
# define DEFAULT_MOUNT_DIR "/media/"
#elif defined(Q_WS_WIN)
#elif defined(Q_OS_WIN32)
# define DEFAULT_MOUNT_DIR "/"
#else
# define DEFAULT_MOUNT_DIR QString()

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