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

Size of the EntryEdit dialog is saved

Browse Source 
Some small GUI improvements

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@157 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 17 years ago
parent 619eaa1552
commit 8b08b321a5
13 changed files with 218 additions and 202 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. 21
      src/KpxConfig.cpp
  2. 3
      src/KpxConfig.h
  3. 5
      src/dialogs/AboutDlg.cpp
  4. 28
      src/dialogs/AboutDlg.h
  5. 22
      src/dialogs/EditEntryDlg.cpp
  6. 7
      src/dialogs/EditEntryDlg.h
  7. 5
      src/dialogs/PasswordDlg.cpp
  8. 7
      src/dialogs/SettingsDlg.cpp
  9. 3
      src/dialogs/SettingsDlg.h
  10. 4
      src/forms/AboutDlg.ui
  11. 133
      src/forms/DatabaseSettingsDlg.ui
  12. 180
      src/forms/EditEntryDlg.ui
  13. 2
      src/lib/EntryView.cpp

21
src/KpxConfig.cpp
Unescape View File

@ -25,6 +25,7 @@
#include <QApplication> #include <QApplication>
#include <QSettings> #include <QSettings>
#include <QDir> #include <QDir>
#include <QLayout>
KpxConfig::KpxConfig(const QString& filePath) : settings(filePath,QSettings::IniFormat){ KpxConfig::KpxConfig(const QString& filePath) : settings(filePath,QSettings::IniFormat){
configFile=filePath; configFile=filePath;
@ -214,6 +215,26 @@ QString KpxConfig::keyTypeToString(tKeyType keyType){
return res; return res;
} }
QRect KpxConfig::dialogGeometry(const QWidget* widget){
Q_ASSERT(widget->parentWidget()!=NULL && widget->parentWidget()->window()!=NULL);
QSize size = settings.value(QString("UI/%1Size").arg(widget->objectName()),widget->size()).toSize();
QSize minSize = widget->minimumSize();
if (size.width() < minSize.width() || size.height() < minSize.height())
size = minSize;
if (minSize.isNull() && widget->layout()!=NULL){
minSize = widget->layout()->minimumSize();
if (size.width() < minSize.width() || size.height() < minSize.height())
size = minSize;
}
QRect rect(QPoint(), size);
rect.moveCenter( widget->parentWidget()->window()->geometry().center() );
return rect;
}
void KpxConfig::setDialogGeometry(const QWidget* widget){
settings.setValue(QString("UI/%1Size").arg(widget->objectName()),widget->size());
}
QString KpxConfig::detailViewTemplate(){ QString KpxConfig::detailViewTemplate(){
if (settings.contains("UI/DetailsView")){ if (settings.contains("UI/DetailsView")){

3
src/KpxConfig.h
Unescape View File

@ -166,6 +166,9 @@ public:
unsigned fileDlgHistorySize(); unsigned fileDlgHistorySize();
void clearFileDlgHistory(){settings.remove("FileDlgHistory");}; void clearFileDlgHistory(){settings.remove("FileDlgHistory");};
QRect dialogGeometry(const QWidget* widget);
void setDialogGeometry(const QWidget* widget);
QString detailViewTemplate(); QString detailViewTemplate();
QString defaultDetailViewTemplate(); QString defaultDetailViewTemplate();
void setDetailViewTemplate(const QString& value); void setDetailViewTemplate(const QString& value);

5
src/dialogs/AboutDlg.cpp
Unescape View File

@ -71,11 +71,6 @@ void AboutDialog::paintEvent(QPaintEvent *event){
painter.drawPixmap(QPoint(0,0),BannerPixmap); painter.drawPixmap(QPoint(0,0),BannerPixmap);
} }
void AboutDialog::OnClose()
{
close();
}
void AboutDialog::loadLicFromFile(){ void AboutDialog::loadLicFromFile(){
QString filename; QString filename;
filename = AppDir+"/../share/keepass/license.html"; filename = AppDir+"/../share/keepass/license.html";

28
src/dialogs/AboutDlg.h
Unescape View File

@ -26,23 +26,21 @@
#include "main.h" #include "main.h"
class AboutDialog : public QDialog, public Ui_AboutDlg class AboutDialog : public QDialog, public Ui_AboutDlg
{ {
Q_OBJECT Q_OBJECT
public:
AboutDialog(QWidget* parent); public:
AboutDialog(QWidget* parent);
public slots: private slots:
virtual void OnClose(); void OnHomepageClicked();
void OnHomepageClicked(); void OnEMailClicked();
void OnEMailClicked();
private: private:
QPixmap BannerPixmap; QPixmap BannerPixmap;
inline void loadLicFromFile(); inline void loadLicFromFile();
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(QPaintEvent*);
}; };
#endif #endif

22
src/dialogs/EditEntryDlg.cpp
Unescape View File

@ -41,16 +41,19 @@
CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent, bool modal, Qt::WFlags fl) CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent, bool modal, bool newEntry)
: QDialog(parent,fl) : QDialog(parent)
{ {
Q_ASSERT(_db); Q_ASSERT(_db);
Q_ASSERT(_entry); Q_ASSERT(_entry);
entry=_entry; entry=_entry;
db=_db; db=_db;
pNewEntry=newEntry;
setupUi(this); setupUi(this);
ModFlag=false; ModFlag=false;
QMenu *ExpirePresetsMenu=new QMenu(); QMenu *ExpirePresetsMenu=new QMenu();
setGeometry( config->dialogGeometry(this) );
connect(Edit_Title, SIGNAL(textChanged(const QString&)), this, SLOT( OnTitleTextChanged(const QString&))); connect(Edit_Title, SIGNAL(textChanged(const QString&)), this, SLOT( OnTitleTextChanged(const QString&)));
connect(Edit_Password_w, SIGNAL(editingFinished()), this, SLOT(OnPasswordwLostFocus())); connect(Edit_Password_w, SIGNAL(editingFinished()), this, SLOT(OnPasswordwLostFocus()));
@ -67,6 +70,7 @@ CEditEntryDlg::CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* paren
connect(Button_Icons,SIGNAL(clicked()),this,SLOT(OnButtonIcons())); connect(Button_Icons,SIGNAL(clicked()),this,SLOT(OnButtonIcons()));
connect(ExpirePresetsMenu,SIGNAL(triggered(QAction*)),this,SLOT(OnExpirePreset(QAction*))); connect(ExpirePresetsMenu,SIGNAL(triggered(QAction*)),this,SLOT(OnExpirePreset(QAction*)));
connect(ButtonExpirePresets,SIGNAL(triggered(QAction*)),this,SLOT(OnCalendar())); connect(ButtonExpirePresets,SIGNAL(triggered(QAction*)),this,SLOT(OnCalendar()));
connect(this, SIGNAL(finished(int)), this, SLOT(OnClose()));
// QAction::data() contains the time until expiration in days. // QAction::data() contains the time until expiration in days.
ExpirePresetsMenu->addAction(tr("Today"))->setData(0); ExpirePresetsMenu->addAction(tr("Today"))->setData(0);
@ -144,17 +148,8 @@ CEditEntryDlg::~CEditEntryDlg()
} }
void CEditEntryDlg::showEvent(QShowEvent *event){
if(event->spontaneous()==false){
}
}
void CEditEntryDlg::resizeEvent(QResizeEvent *event){ void CEditEntryDlg::resizeEvent(QResizeEvent *event){
createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Edit Entry"),width()); createBanner(&BannerPixmap,getPixmap("keepassx_large"),pNewEntry?tr("New Entry"):tr("Edit Entry"),width());
QDialog::resizeEvent(event); QDialog::resizeEvent(event);
} }
@ -434,3 +429,6 @@ void CEditEntryDlg::OnCalendar(){
} }
} }
void CEditEntryDlg::OnClose(){
config->setDialogGeometry(this);
}

7
src/dialogs/EditEntryDlg.h
Unescape View File

@ -30,7 +30,7 @@ class CEditEntryDlg : public QDialog, public Ui_EditEntryDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent = 0, bool modal = FALSE, Qt::WFlags fl = 0); CEditEntryDlg(IDatabase* _db, IEntryHandle* _entry,QWidget* parent = 0, bool modal = FALSE, bool newEntry = FALSE);
~CEditEntryDlg(); ~CEditEntryDlg();
void InitGroupComboBox(); void InitGroupComboBox();
/* MX-TO-DO: Remove this declaration /* MX-TO-DO: Remove this declaration
@ -45,7 +45,7 @@ class CEditEntryDlg : public QDialog, public Ui_EditEntryDialog
QList<IGroupHandle*> groups; QList<IGroupHandle*> groups;
QPixmap BannerPixmap; QPixmap BannerPixmap;
public slots: private slots:
void OnTitleTextChanged(const QString&); void OnTitleTextChanged(const QString&);
void OnPasswordwLostFocus(); void OnPasswordwLostFocus();
void OnPasswordwTextChanged(); void OnPasswordwTextChanged();
@ -61,13 +61,14 @@ class CEditEntryDlg : public QDialog, public Ui_EditEntryDialog
void OnButtonOK(); void OnButtonOK();
void OnExpirePreset(QAction*); void OnExpirePreset(QAction*);
void OnCalendar(); void OnCalendar();
void OnClose();
private: private:
virtual void showEvent(QShowEvent *);
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(QPaintEvent*);
virtual void resizeEvent(QResizeEvent *); virtual void resizeEvent(QResizeEvent *);
int IconIndex; int IconIndex;
bool pNewEntry;
}; };
#endif #endif

5
src/dialogs/PasswordDlg.cpp
Unescape View File

@ -44,7 +44,10 @@ CPasswordDialog::CPasswordDialog(QWidget* parent,QString filename,IDatabase* DB,
Button_Bookmarks->setIcon(getIcon("bookmark")); Button_Bookmarks->setIcon(getIcon("bookmark"));
db=DB; db=DB;
LastFile=filename; LastFile=filename;
setWindowTitle(LastFile); if (ChangeKeyMode)
setWindowTitle(tr("Change Master Key"));
else
setWindowTitle(LastFile);
QString mountDir=config->mountDir(); QString mountDir=config->mountDir();
QDir media(mountDir); QDir media(mountDir);
if(media.exists()){ if(media.exists()){

7
src/dialogs/SettingsDlg.cpp
Unescape View File

@ -70,8 +70,6 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
connect(this,SIGNAL(rejected()),SLOT(resetGlobalShortcut())); connect(this,SIGNAL(rejected()),SLOT(resetGlobalShortcut()));
#endif #endif
createBanner(&BannerPixmap,getPixmap("appsettings"),tr("Settings"),width());
//General //General
CheckBox_OpenLast->setChecked(config->openLastFile()); CheckBox_OpenLast->setChecked(config->openLastFile());
CheckBox_RememberLastKey->setChecked(config->rememberLastKey()); CheckBox_RememberLastKey->setChecked(config->rememberLastKey());
@ -178,6 +176,11 @@ void CSettingsDlg::paintEvent(QPaintEvent *event){
painter.drawPixmap(QPoint(0,0),BannerPixmap); painter.drawPixmap(QPoint(0,0),BannerPixmap);
} }
void CSettingsDlg::resizeEvent(QResizeEvent* event){
createBanner(&BannerPixmap,getPixmap("appsettings"),tr("Settings"),width());
QDialog::resizeEvent(event);
}
void CSettingsDlg::OnOK() void CSettingsDlg::OnOK()
{ {
apply(); apply();

3
src/dialogs/SettingsDlg.h
Unescape View File

@ -36,7 +36,7 @@ class CSettingsDlg : public QDialog, public Ui_SettingsDialog
CSettingsDlg(QWidget* parent); CSettingsDlg(QWidget* parent);
~CSettingsDlg(); ~CSettingsDlg();
public slots: private slots:
virtual void OnCancel(); virtual void OnCancel();
virtual void OnOK(); virtual void OnOK();
virtual void OnTextColor(); virtual void OnTextColor();
@ -58,6 +58,7 @@ class CSettingsDlg : public QDialog, public Ui_SettingsDialog
private: private:
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(QPaintEvent*);
virtual void resizeEvent(QResizeEvent*);
void apply(); void apply();
QColor color1,color2,textcolor; QColor color1,color2,textcolor;
QPixmap BannerPixmap; QPixmap BannerPixmap;

4
src/forms/AboutDlg.ui
Unescape View File

@ -24,7 +24,7 @@
<property name="maximumSize" > <property name="maximumSize" >
<size> <size>
<width>419</width> <width>419</width>
<height>309</height> <height>305</height>
</size> </size>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -196,7 +196,7 @@
<item> <item>
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>Copyright (C) 2005 - 2007 KeePassX Team <string>Copyright (C) 2005 - 2008 KeePassX Team
KeePassX is distributed under the terms of the KeePassX is distributed under the terms of the
General Public License (GPL) version 2.</string> General Public License (GPL) version 2.</string>
</property> </property>

133
src/forms/DatabaseSettingsDlg.ui
Unescape View File

@ -30,84 +30,65 @@
<property name="windowTitle" > <property name="windowTitle" >
<string>Database Settings</string> <string>Database Settings</string>
</property> </property>
<widget class="QGroupBox" name="groupBox1" > <layout class="QVBoxLayout" >
<property name="geometry" > <item>
<rect> <spacer>
<x>10</x> <property name="orientation" >
<y>60</y> <enum>Qt::Vertical</enum>
<width>420</width> </property>
<height>110</height> <property name="sizeType" >
</rect> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="title" > <property name="sizeHint" >
<string>Encryption</string> <size>
</property> <width>20</width>
<widget class="QLabel" name="textLabel2" > <height>50</height>
<property name="geometry" > </size>
<rect> </property>
<x>10</x> </spacer>
<y>30</y> </item>
<width>90</width> <item>
<height>20</height> <widget class="QGroupBox" name="groupBox1" >
</rect> <property name="title" >
</property> <string>Encryption</string>
<property name="text" > </property>
<string>Algorithm:</string> <layout class="QGridLayout" >
</property> <property name="horizontalSpacing" >
</widget> <number>15</number>
<widget class="QComboBox" name="ComboAlgo" > </property>
<property name="geometry" > <item row="0" column="0" >
<rect> <widget class="QLabel" name="textLabel2" >
<x>109</x> <property name="text" >
<y>30</y> <string>Algorithm:</string>
<width>300</width> </property>
<height>21</height> </widget>
</rect> </item>
</property> <item row="0" column="1" >
</widget> <widget class="QComboBox" name="ComboAlgo" />
<widget class="QLineEdit" name="EditRounds" > </item>
<property name="geometry" > <item row="1" column="0" >
<rect> <widget class="QLabel" name="textLabel3" >
<x>180</x> <property name="text" >
<y>70</y> <string>Encryption Rounds:</string>
<width>230</width> </property>
<height>21</height> </widget>
</rect> </item>
</property> <item row="1" column="1" >
</widget> <widget class="QLineEdit" name="EditRounds" />
<widget class="QLabel" name="textLabel3" > </item>
<property name="geometry" > </layout>
<rect> </widget>
<x>10</x> </item>
<y>70</y> <item>
<width>150</width> <widget class="QDialogButtonBox" name="ButtonBox" >
<height>20</height> <property name="standardButtons" >
</rect> <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property> </property>
<property name="text" > </widget>
<string>Encryption Rounds:</string> </item>
</property> </layout>
</widget>
</widget>
<widget class="QDialogButtonBox" name="ButtonBox" >
<property name="geometry" >
<rect>
<x>12</x>
<y>180</y>
<width>411</width>
<height>27</height>
</rect>
</property>
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
</property>
</widget>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>ComboAlgo</tabstop>
<tabstop>EditRounds</tabstop>
</tabstops>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

180
src/forms/EditEntryDlg.ui
Unescape View File

@ -10,26 +10,6 @@
<height>526</height> <height>526</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>500</width>
<height>526</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>Edit Entry</string> <string>Edit Entry</string>
</property> </property>
@ -40,26 +20,48 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="bottomMargin" >
<number>9</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item rowspan="2" row="5" column="1" > <item rowspan="2" row="5" column="1" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QToolButton" name="ButtonGenPw" > <widget class="QToolButton" name="ButtonGenPw" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -86,16 +88,8 @@
</item> </item>
<item row="0" column="1" > <item row="0" column="1" >
<widget class="QToolButton" name="ButtonEchoMode" > <widget class="QToolButton" name="ButtonEchoMode" >
<property name="iconSize" >
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -112,6 +106,12 @@
<height>23</height> <height>23</height>
</size> </size>
</property> </property>
<property name="iconSize" >
<size>
<width>16</width>
<height>16</height>
</size>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
@ -122,9 +122,7 @@
<item row="7" column="0" > <item row="7" column="0" >
<widget class="QLabel" name="textLabel9" > <widget class="QLabel" name="textLabel9" >
<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>
@ -137,9 +135,7 @@
<item row="10" column="0" > <item row="10" column="0" >
<widget class="QLabel" name="textLabel12" > <widget class="QLabel" name="textLabel12" >
<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>
@ -152,9 +148,7 @@
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="textLabel4" > <widget class="QLabel" name="textLabel4" >
<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>
@ -167,9 +161,7 @@
<item row="3" column="0" > <item row="3" column="0" >
<widget class="QLabel" name="textLabel5" > <widget class="QLabel" name="textLabel5" >
<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>
@ -182,9 +174,7 @@
<item row="8" column="0" > <item row="8" column="0" >
<widget class="QLabel" name="textLabel10" > <widget class="QLabel" name="textLabel10" >
<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>
@ -204,9 +194,7 @@
<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" >
<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>
@ -219,9 +207,7 @@
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="textLabel3" > <widget class="QLabel" name="textLabel3" >
<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>
@ -240,9 +226,7 @@
<item row="6" column="0" > <item row="6" column="0" >
<widget class="QLabel" name="textLabel8" > <widget class="QLabel" name="textLabel8" >
<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>
@ -255,9 +239,7 @@
<item row="5" column="0" > <item row="5" column="0" >
<widget class="QLabel" name="textLabel6" > <widget class="QLabel" name="textLabel6" >
<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>
@ -270,9 +252,7 @@
<item row="9" column="0" > <item row="9" column="0" >
<widget class="QLabel" name="textLabel11" > <widget class="QLabel" name="textLabel11" >
<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>
@ -304,21 +284,28 @@
</item> </item>
<item row="10" column="1" > <item row="10" column="1" >
<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="QLineEdit" name="Edit_Attachment" > <widget class="QLineEdit" name="Edit_Attachment" >
<property name="enabled" > <property name="enabled" >
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -377,12 +364,21 @@
</item> </item>
<item row="9" column="1" > <item row="9" column="1" >
<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="QDateTimeEdit" name="DateTime_Expire" /> <widget class="QDateTimeEdit" name="DateTime_Expire" />
</item> </item>
@ -413,12 +409,21 @@
</item> </item>
<item row="7" column="1" > <item row="7" column="1" >
<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="QProgressBar" name="Progress_Quali" > <widget class="QProgressBar" name="Progress_Quali" >
<property name="minimumSize" > <property name="minimumSize" >
@ -458,18 +463,25 @@
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<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="QComboBox" name="Combo_Group" > <widget class="QComboBox" name="Combo_Group" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

2
src/lib/EntryView.cpp
Unescape View File

@ -239,7 +239,7 @@ void KeepassEntryView::OnNewEntry(){
} }
else else
NewEntry=db->newEntry(CurrentGroup); NewEntry=db->newEntry(CurrentGroup);
CEditEntryDlg dlg(db,NewEntry,this,true); CEditEntryDlg dlg(db,NewEntry,this,true,true);
if(!dlg.exec()){ if(!dlg.exec()){
db->deleteLastEntry(); db->deleteLastEntry();
} }