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

Reduce height of PasswordGenDlg and EditEntryDlg

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@242 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 16 years ago
parent 06a938ce4a
commit ff58631a2c
7 changed files with 63 additions and 92 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. 5
      src/Kdb3Database.cpp
  2. 2
      src/dialogs/PasswordGenDlg.cpp
  3. 27
      src/forms/EditEntryDlg.ui
  4. 115
      src/forms/PasswordGenDlg.ui
  5. 1
      src/import/Import_PwManager.cpp
  6. 3
      src/keepassx.h
  7. 2
      src/lib/SecString.cpp

5
src/Kdb3Database.cpp
Unescape View File

@ -17,10 +17,11 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include <QBuffer>
#include <QTextCodec>
#include "Kdb3Database.h" #include "Kdb3Database.h"
#include "crypto/twoclass.h"
#include <QBuffer>
#include <QTextCodec>
#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__);

2
src/dialogs/PasswordGenDlg.cpp
Unescape View File

@ -114,7 +114,7 @@ CGenPwDialog::CGenPwDialog(QWidget* parent, bool StandAloneMode,Qt::WFlags fl)
Check_EveryGroup->setChecked(config->pwGenEveryGroup()); Check_EveryGroup->setChecked(config->pwGenEveryGroup());
Spin_Num->setValue(config->pwGenLength()); Spin_Num->setValue(config->pwGenLength());
adjustSize(); adjustSize();
resize(size() + QSize(10, 20)); resize(size() + QSize(5, 10));
createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width()); createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width());
if(!config->showPasswords()) if(!config->showPasswords())

27
src/forms/EditEntryDlg.ui
Unescape View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>500</width> <width>494</width>
<height>526</height> <height>491</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -154,13 +154,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1" >
<widget class="QLabel" name="Label_AttachmentSize" >
<property name="text" >
<string>%1</string>
</property>
</widget>
</item>
<item row="4" column="0" > <item row="4" column="0" >
<widget class="QLabel" name="textLabel7" > <widget class="QLabel" name="textLabel7" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -333,6 +326,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="Label_AttachmentSize" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>%1</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="9" column="1" > <item row="9" column="1" >
@ -387,9 +393,6 @@
<height>14</height> <height>14</height>
</size> </size>
</property> </property>
<property name="value" >
<number>24</number>
</property>
<property name="textVisible" > <property name="textVisible" >
<bool>false</bool> <bool>false</bool>
</property> </property>

115
src/forms/PasswordGenDlg.ui
Unescape View File

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>462</width> <width>460</width>
<height>543</height> <height>505</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -42,8 +42,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>440</width> <width>438</width>
<height>271</height> <height>243</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -152,31 +152,15 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="0" column="2" >
<widget class="QCheckBox" name="checkBox4" > <widget class="QCheckBox" name="checkBox4" >
<property name="text" > <property name="text" >
<string>&amp;Special Characters</string> <string>&amp;Special Characters</string>
</property> </property>
<property name="checked" >
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>101</width>
<height>108</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -240,8 +224,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>440</width> <width>438</width>
<height>271</height> <height>243</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -262,54 +246,37 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" > <layout class="QGridLayout" name="gridLayout_2" >
<item> <property name="verticalSpacing" >
<layout class="QGridLayout" name="gridLayout_2" > <number>12</number>
<property name="spacing" > </property>
<number>15</number> <item row="0" column="0" >
<widget class="QCheckBox" name="checkBoxPL" >
<property name="text" >
<string>Lower Letters</string>
</property> </property>
<item row="0" column="0" > </widget>
<widget class="QCheckBox" name="checkBoxPU" >
<property name="text" >
<string>Upper Letters</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QCheckBox" name="checkBoxPN" >
<property name="text" >
<string>Numbers</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QCheckBox" name="checkBoxPL" >
<property name="text" >
<string>Lower Letters</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QCheckBox" name="checkBoxPS" >
<property name="text" >
<string>Special Characters</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item row="1" column="0" >
<spacer name="horizontalSpacer" > <widget class="QCheckBox" name="checkBoxPU" >
<property name="orientation" > <property name="text" >
<enum>Qt::Horizontal</enum> <string>Upper Letters</string>
</property> </property>
<property name="sizeHint" stdset="0" > </widget>
<size> </item>
<width>40</width> <item row="2" column="0" >
<height>20</height> <widget class="QCheckBox" name="checkBoxPN" >
</size> <property name="text" >
<string>Numbers</string>
</property> </property>
</spacer> </widget>
</item>
<item row="3" column="0" >
<widget class="QCheckBox" name="checkBoxPS" >
<property name="text" >
<string>Special Characters</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -341,7 +308,7 @@
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0" >
<size> <size>
<width>20</width> <width>20</width>
<height>15</height> <height>5</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@ -540,22 +507,24 @@
<tabstop>checkBox1</tabstop> <tabstop>checkBox1</tabstop>
<tabstop>checkBox2</tabstop> <tabstop>checkBox2</tabstop>
<tabstop>checkBox3</tabstop> <tabstop>checkBox3</tabstop>
<tabstop>checkBox4</tabstop>
<tabstop>checkBox5</tabstop> <tabstop>checkBox5</tabstop>
<tabstop>checkBox6</tabstop> <tabstop>checkBox6</tabstop>
<tabstop>checkBox7</tabstop> <tabstop>checkBox7</tabstop>
<tabstop>checkBox4</tabstop>
<tabstop>Radio_2</tabstop> <tabstop>Radio_2</tabstop>
<tabstop>Edit_chars</tabstop> <tabstop>Edit_chars</tabstop>
<tabstop>checkBoxPU</tabstop> <tabstop>Check_ExcludeLookAlike</tabstop>
<tabstop>checkBoxPL</tabstop> <tabstop>Check_EveryGroup</tabstop>
<tabstop>checkBoxPN</tabstop>
<tabstop>checkBoxPS</tabstop>
<tabstop>Spin_Num</tabstop> <tabstop>Spin_Num</tabstop>
<tabstop>Check_CollectEntropy</tabstop> <tabstop>Check_CollectEntropy</tabstop>
<tabstop>Check_CollectOncePerSession</tabstop> <tabstop>Check_CollectOncePerSession</tabstop>
<tabstop>Edit_dest</tabstop> <tabstop>Edit_dest</tabstop>
<tabstop>ButtonChangeEchoMode</tabstop> <tabstop>ButtonChangeEchoMode</tabstop>
<tabstop>ButtonGenerate</tabstop> <tabstop>ButtonGenerate</tabstop>
<tabstop>checkBoxPL</tabstop>
<tabstop>checkBoxPU</tabstop>
<tabstop>checkBoxPN</tabstop>
<tabstop>checkBoxPS</tabstop>
<tabstop>DialogButtons</tabstop> <tabstop>DialogButtons</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>

1
src/import/Import_PwManager.cpp
Unescape View File

@ -21,6 +21,7 @@
#include "Import_PwManager.h" #include "Import_PwManager.h"
#include "crypto/blowfish.h"
#include <QCryptographicHash> #include <QCryptographicHash>
bool Import_PwManager::importDatabase(QWidget* GuiParent, IDatabase* db){ bool Import_PwManager::importDatabase(QWidget* GuiParent, IDatabase* db){

3
src/keepassx.h
Unescape View File

@ -72,9 +72,6 @@
#include <QUrl> #include <QUrl>
#include "crypto/aescpp.h" #include "crypto/aescpp.h"
#include "crypto/blowfish.h"
#include "crypto/sha256.h"
#include "crypto/twoclass.h"
#include "crypto/yarrow.h" #include "crypto/yarrow.h"
#include "lib/bookmarks.h" #include "lib/bookmarks.h"
#include "lib/FileDialogs.h" #include "lib/FileDialogs.h"

2
src/lib/SecString.cpp
Unescape View File

@ -49,7 +49,7 @@ void SecString::unlock(){
if(!crypt.length()) if(!crypt.length())
return; return;
const unsigned char* buffer = new unsigned char[crypt.length()]; 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()); plain = QString::fromUtf8((const char*)buffer, crypt.size());
overwrite((unsigned char*)buffer, crypt.size()); overwrite((unsigned char*)buffer, crypt.size());
delete [] buffer; delete [] buffer;