overworked password generation dialog, enabled yarrow and entropy collection,

some work on the integration plugins, plugin settings tab is finished

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@119 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
tarek_saidi
2006-11-26 22:15:00 +00:00
parent 7e54d5f317
commit 08d9ff59c9
16 changed files with 1008 additions and 773 deletions

View File

@@ -80,9 +80,6 @@ Please move the mouse and/or press some keys until enought entropy for a reseed
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="format" >
<string>%v Bits</string>
</property>
</widget>
</item>
<item>

View File

@@ -32,382 +32,429 @@
<property name="windowTitle" >
<string>Password Generator</string>
</property>
<widget class="QProgressBar" name="Progress_Quali" >
<property name="geometry" >
<rect>
<x>130</x>
<y>400</y>
<width>180</width>
<height>15</height>
</rect>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<property name="spacing" >
<number>6</number>
</property>
</widget>
<widget class="QLineEdit" name="Edit_dest" >
<property name="geometry" >
<rect>
<x>130</x>
<y>370</y>
<width>250</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="Label_Bits" >
<property name="geometry" >
<rect>
<x>320</x>
<y>399</y>
<width>60</width>
<height>16</height>
</rect>
</property>
<property name="text" >
<string/>
</property>
</widget>
<widget class="QPushButton" name="ButtonOK" >
<property name="geometry" >
<rect>
<x>263</x>
<y>440</y>
<width>90</width>
<height>25</height>
</rect>
</property>
<property name="text" >
<string>Accep&amp;t</string>
</property>
</widget>
<widget class="QPushButton" name="Button_Cancel" >
<property name="geometry" >
<rect>
<x>360</x>
<y>440</y>
<width>90</width>
<height>25</height>
</rect>
</property>
<property name="text" >
<string>&amp;Cancel</string>
</property>
</widget>
<widget class="QPushButton" name="ButtonGenerate" >
<property name="geometry" >
<rect>
<x>381</x>
<y>370</y>
<width>70</width>
<height>21</height>
</rect>
</property>
<property name="text" >
<string>Generate</string>
</property>
</widget>
<widget class="QLabel" name="textLabel4" >
<property name="geometry" >
<rect>
<x>20</x>
<y>370</y>
<width>110</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>New Password:</string>
</property>
</widget>
<widget class="QLabel" name="textLabel5" >
<property name="geometry" >
<rect>
<x>20</x>
<y>400</y>
<width>110</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Quality:</string>
</property>
</widget>
<widget class="Line" name="line3" >
<property name="geometry" >
<rect>
<x>0</x>
<y>420</y>
<width>460</width>
<height>20</height>
</rect>
</property>
<property name="frameShape" >
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QGroupBox" name="groupBox1" >
<property name="geometry" >
<rect>
<x>10</x>
<y>60</y>
<width>440</width>
<height>280</height>
</rect>
</property>
<property name="title" >
<string>Options</string>
</property>
<widget class="QLineEdit" name="Edit_chars" >
<property name="geometry" >
<rect>
<x>30</x>
<y>170</y>
<width>400</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QSpinBox" name="Spin_Num" >
<property name="geometry" >
<rect>
<x>120</x>
<y>220</y>
<width>310</width>
<height>21</height>
</rect>
</property>
<property name="maximum" >
<number>1000</number>
</property>
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>20</number>
</property>
</widget>
<widget class="QCheckBox" name="checkBox1" >
<property name="geometry" >
<rect>
<x>120</x>
<y>40</y>
<width>131</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>&amp;Upper Letters</string>
</property>
<property name="shortcut" >
<string>Alt+U</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkBox2" >
<property name="geometry" >
<rect>
<x>120</x>
<y>60</y>
<width>140</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>&amp;Lower Letters</string>
</property>
<property name="shortcut" >
<string>Alt+L</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkBox3" >
<property name="geometry" >
<rect>
<x>120</x>
<y>80</y>
<width>140</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>&amp;Numbers</string>
</property>
<property name="shortcut" >
<string>Alt+N</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkBox4" >
<property name="geometry" >
<rect>
<x>120</x>
<y>100</y>
<width>140</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>&amp;Special Characters</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
<widget class="QCheckBox" name="checkBox6" >
<property name="geometry" >
<rect>
<x>260</x>
<y>60</y>
<width>170</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>Minus</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox7" >
<property name="geometry" >
<rect>
<x>260</x>
<y>80</y>
<width>170</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>U&amp;nderline</string>
</property>
<property name="shortcut" >
<string>Alt+N</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox8" >
<property name="geometry" >
<rect>
<x>260</x>
<y>100</y>
<width>170</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>h&amp;igher ANSI-Characters</string>
</property>
<property name="shortcut" >
<string>Alt+H</string>
</property>
</widget>
<widget class="QRadioButton" name="Radio_2" >
<property name="geometry" >
<rect>
<x>10</x>
<y>150</y>
<width>420</width>
<height>16</height>
</rect>
</property>
<property name="text" >
<string>Use &amp;only following characters:</string>
</property>
<property name="shortcut" >
<string>Alt+O</string>
</property>
</widget>
<widget class="QLabel" name="textLabel1" >
<property name="geometry" >
<rect>
<x>10</x>
<y>220</y>
<width>110</width>
<height>21</height>
</rect>
</property>
<property name="text" >
<string>Length:</string>
</property>
</widget>
<widget class="QRadioButton" name="Radio_1" >
<property name="geometry" >
<rect>
<x>10</x>
<y>20</y>
<width>420</width>
<height>21</height>
</rect>
</property>
<property name="text" >
<string>Use follo&amp;wing character groups:</string>
</property>
<property name="shortcut" >
<string>Alt+W</string>
</property>
</widget>
<widget class="QCheckBox" name="checkBox5" >
<property name="geometry" >
<rect>
<x>260</x>
<y>40</y>
<width>170</width>
<height>20</height>
</rect>
</property>
<property name="text" >
<string>White &amp;Spaces</string>
</property>
<property name="shortcut" >
<string>Alt+S</string>
</property>
</widget>
<widget class="QCheckBox" name="Check_strongrandom" >
<property name="geometry" >
<rect>
<x>120</x>
<y>250</y>
<width>310</width>
<height>21</height>
</rect>
</property>
<property name="text" >
<string>Force entropy collection</string>
</property>
<property name="shortcut" >
<string>Alt+M</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</widget>
<widget class="QLabel" name="Banner" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>460</width>
<height>50</height>
</rect>
</property>
<property name="pixmap" >
<pixmap/>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>50</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox1" >
<property name="title" >
<string>Options</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>10</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QRadioButton" name="Radio_1" >
<property name="text" >
<string>Use follo&amp;wing character groups:</string>
</property>
<property name="shortcut" >
<string>Alt+W</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkBox1" >
<property name="text" >
<string>&amp;Upper Letters</string>
</property>
<property name="shortcut" >
<string>Alt+U</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox2" >
<property name="text" >
<string>&amp;Lower Letters</string>
</property>
<property name="shortcut" >
<string>Alt+L</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox3" >
<property name="text" >
<string>&amp;Numbers</string>
</property>
<property name="shortcut" >
<string>Alt+N</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox4" >
<property name="text" >
<string>&amp;Special Characters</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="checkBox5" >
<property name="text" >
<string>White &amp;Spaces</string>
</property>
<property name="shortcut" >
<string>Alt+S</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox6" >
<property name="text" >
<string>Minus</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox7" >
<property name="text" >
<string>U&amp;nderline</string>
</property>
<property name="shortcut" >
<string>Alt+N</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QRadioButton" name="Radio_2" >
<property name="text" >
<string>Use &amp;only following characters:</string>
</property>
<property name="shortcut" >
<string>Alt+O</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>30</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="Edit_chars" >
<property name="maxLength" >
<number>255</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="textLabel1" >
<property name="text" >
<string>Length:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="Spin_Num" >
<property name="maximum" >
<number>10000</number>
</property>
<property name="minimum" >
<number>1</number>
</property>
<property name="value" >
<number>20</number>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="textLabel5" >
<property name="text" >
<string>Quality:</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="Progress_Quali" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="maximum" >
<number>128</number>
</property>
<property name="value" >
<number>0</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="Check_CollectEntropy" >
<property name="text" >
<string>Enable entropy collection</string>
</property>
<property name="shortcut" >
<string>Alt+M</string>
</property>
<property name="checked" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="Check_CollectOncePerSession" >
<property name="text" >
<string>Collect only once per session</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="textLabel4" >
<property name="text" >
<string>New Password:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="Edit_dest" />
</item>
<item>
<widget class="QPushButton" name="ButtonGenerate" >
<property name="text" >
<string>Generate</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line3" >
<property name="frameShape" >
<enum>QFrame::HLine</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="DialogButtons" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::NoButton</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
@@ -419,15 +466,11 @@
<tabstop>checkBox5</tabstop>
<tabstop>checkBox6</tabstop>
<tabstop>checkBox7</tabstop>
<tabstop>checkBox8</tabstop>
<tabstop>Radio_2</tabstop>
<tabstop>Edit_chars</tabstop>
<tabstop>Spin_Num</tabstop>
<tabstop>Check_strongrandom</tabstop>
<tabstop>Check_CollectEntropy</tabstop>
<tabstop>Edit_dest</tabstop>
<tabstop>ButtonGenerate</tabstop>
<tabstop>ButtonOK</tabstop>
<tabstop>Button_Cancel</tabstop>
</tabstops>
<resources/>
<connections/>

View File

@@ -52,8 +52,17 @@
</item>
<item>
<widget class="QTabWidget" name="tabWidget4" >
<property name="whatsThis" >
<string>The integration plugins provide features like usage of the native file dialogs and message boxes of the particular desktop environments.</string>
</property>
<property name="tabPosition" >
<enum>QTabWidget::North</enum>
</property>
<property name="tabShape" >
<enum>QTabWidget::Rounded</enum>
</property>
<property name="currentIndex" >
<number>3</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab" >
<attribute name="title" >
@@ -453,7 +462,7 @@
</widget>
<widget class="QWidget" name="tab_2" >
<attribute name="title" >
<string>Intergration Plug-ins</string>
<string>Desktop Integration</string>
</attribute>
<layout class="QVBoxLayout" >
<property name="margin" >
@@ -463,7 +472,7 @@
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label_3" >
<widget class="QLabel" name="Label_IntPlugin_Error" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
@@ -473,7 +482,10 @@
</sizepolicy>
</property>
<property name="text" >
<string>&lt; some text about plugin usage ></string>
<string/>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
@@ -498,21 +510,21 @@
<number>6</number>
</property>
<item>
<widget class="QRadioButton" name="radioButton" >
<widget class="QRadioButton" name="Radio_IntPlugin_None" >
<property name="text" >
<string>None</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_2" >
<widget class="QRadioButton" name="Radio_IntPlugin_Gnome" >
<property name="text" >
<string>Gnome Desktop Integration (Gtk 2.x)</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_3" >
<widget class="QRadioButton" name="Radio_IntPlugin_Kde" >
<property name="text" >
<string>KDE 4 Desktop Integration</string>
</property>
@@ -529,6 +541,13 @@
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="Label_IntPlugin_Info" >
<property name="text" >
<string>You need to restart the program before the changes take effect.</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
@@ -543,7 +562,7 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="Button_ConfigureDesktopPlugin" >
<widget class="QPushButton" name="IntPlugin_Button_Config" >
<property name="text" >
<string>Configure...</string>
</property>
@@ -551,6 +570,19 @@
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab" >
@@ -652,7 +684,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>