From ff58631a2cd69f67fe921501876d5c52f1777131 Mon Sep 17 00:00:00 2001 From: sniperbeamer Date: Mon, 22 Dec 2008 13:43:47 +0000 Subject: [PATCH] Reduce height of PasswordGenDlg and EditEntryDlg git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@242 b624d157-de02-0410-bad0-e51aec6abb33 --- src/Kdb3Database.cpp | 5 +- src/dialogs/PasswordGenDlg.cpp | 2 +- src/forms/EditEntryDlg.ui | 27 ++++---- src/forms/PasswordGenDlg.ui | 115 ++++++++++++-------------------- src/import/Import_PwManager.cpp | 1 + src/keepassx.h | 3 - src/lib/SecString.cpp | 2 +- 7 files changed, 63 insertions(+), 92 deletions(-) diff --git a/src/Kdb3Database.cpp b/src/Kdb3Database.cpp index d4e483e..0340fac 100644 --- a/src/Kdb3Database.cpp +++ b/src/Kdb3Database.cpp @@ -17,10 +17,11 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include -#include #include "Kdb3Database.h" +#include "crypto/twoclass.h" +#include +#include #define UNEXP_ERROR error=QString("Unexpected error in: %1, Line:%2").arg(__FILE__).arg(__LINE__); diff --git a/src/dialogs/PasswordGenDlg.cpp b/src/dialogs/PasswordGenDlg.cpp index 701343a..9aa5706 100644 --- a/src/dialogs/PasswordGenDlg.cpp +++ b/src/dialogs/PasswordGenDlg.cpp @@ -114,7 +114,7 @@ CGenPwDialog::CGenPwDialog(QWidget* parent, bool StandAloneMode,Qt::WFlags fl) Check_EveryGroup->setChecked(config->pwGenEveryGroup()); Spin_Num->setValue(config->pwGenLength()); adjustSize(); - resize(size() + QSize(10, 20)); + resize(size() + QSize(5, 10)); createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width()); if(!config->showPasswords()) diff --git a/src/forms/EditEntryDlg.ui b/src/forms/EditEntryDlg.ui index 00a5e9b..575b574 100644 --- a/src/forms/EditEntryDlg.ui +++ b/src/forms/EditEntryDlg.ui @@ -6,8 +6,8 @@ 0 0 - 500 - 526 + 494 + 491 @@ -154,13 +154,6 @@ - - - - %1 - - - @@ -333,6 +326,19 @@ + + + + + 0 + 0 + + + + %1 + + + @@ -387,9 +393,6 @@ 14 - - 24 - false diff --git a/src/forms/PasswordGenDlg.ui b/src/forms/PasswordGenDlg.ui index 2c7f8fd..2cee0aa 100644 --- a/src/forms/PasswordGenDlg.ui +++ b/src/forms/PasswordGenDlg.ui @@ -5,8 +5,8 @@ 0 0 - 462 - 543 + 460 + 505 @@ -42,8 +42,8 @@ 0 0 - 440 - 271 + 438 + 243 @@ -152,31 +152,15 @@ - + &Special Characters - - true - - - - - Qt::Horizontal - - - - 101 - 108 - - - - @@ -240,8 +224,8 @@ 0 0 - 440 - 271 + 438 + 243 @@ -262,54 +246,37 @@ - - - - - 15 + + + 12 + + + + + Lower Letters - - - - Upper Letters - - - - - - - Numbers - - - - - - - Lower Letters - - - - - - - Special Characters - - - - + - - - - Qt::Horizontal + + + + Upper Letters - - - 40 - 20 - + + + + + + Numbers - + + + + + + Special Characters + + @@ -341,7 +308,7 @@ 20 - 15 + 5 @@ -540,22 +507,24 @@ checkBox1 checkBox2 checkBox3 - checkBox4 checkBox5 checkBox6 checkBox7 + checkBox4 Radio_2 Edit_chars - checkBoxPU - checkBoxPL - checkBoxPN - checkBoxPS + Check_ExcludeLookAlike + Check_EveryGroup Spin_Num Check_CollectEntropy Check_CollectOncePerSession Edit_dest ButtonChangeEchoMode ButtonGenerate + checkBoxPL + checkBoxPU + checkBoxPN + checkBoxPS DialogButtons diff --git a/src/import/Import_PwManager.cpp b/src/import/Import_PwManager.cpp index 60dec31..24ff174 100644 --- a/src/import/Import_PwManager.cpp +++ b/src/import/Import_PwManager.cpp @@ -21,6 +21,7 @@ #include "Import_PwManager.h" +#include "crypto/blowfish.h" #include bool Import_PwManager::importDatabase(QWidget* GuiParent, IDatabase* db){ diff --git a/src/keepassx.h b/src/keepassx.h index 832b307..dee8608 100644 --- a/src/keepassx.h +++ b/src/keepassx.h @@ -72,9 +72,6 @@ #include #include "crypto/aescpp.h" -#include "crypto/blowfish.h" -#include "crypto/sha256.h" -#include "crypto/twoclass.h" #include "crypto/yarrow.h" #include "lib/bookmarks.h" #include "lib/FileDialogs.h" diff --git a/src/lib/SecString.cpp b/src/lib/SecString.cpp index a24bdfb..3436e4a 100644 --- a/src/lib/SecString.cpp +++ b/src/lib/SecString.cpp @@ -49,7 +49,7 @@ void SecString::unlock(){ if(!crypt.length()) return; const unsigned char* buffer = new unsigned char[crypt.length()]; - RC4.decrypt( (byte*)crypt.data(), (unsigned char*)buffer, crypt.length() ); + RC4.decrypt( (quint8*)crypt.data(), (unsigned char*)buffer, crypt.length() ); plain = QString::fromUtf8((const char*)buffer, crypt.size()); overwrite((unsigned char*)buffer, crypt.size()); delete [] buffer;