Master key transformations (rounds) are now computed in two threads (from KeePass 1.11)

Added a button to measure the number of rounds that can be calculated in 1 second
Don't try to open a URL when it's empty
Improved code formatting

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@194 b624d157-de02-0410-bad0-e51aec6abb33

src/dialogs/DatabaseSettingsDlg.cpp

@@ -20,6 +20,7 @@
  
 
 #include "DatabaseSettingsDlg.h"
+#include "Kdb3Database.h"
 
 
 CDbSettingsDlg::CDbSettingsDlg(QWidget* parent,IDatabase* db,  bool modal, Qt::WFlags fl)
@@ -34,9 +35,11 @@ CDbSettingsDlg::CDbSettingsDlg(QWidget* parent,IDatabase* db,  bool modal, Qt::W
 	ComboAlgo->insertItem(0,tr("AES(Rijndael):  256 Bit   (default)"));
 	ComboAlgo->insertItem(1,tr("Twofish:  256 Bit"));
 	ComboAlgo->setCurrentIndex(database->cryptAlgorithm()); //Achtung: AlgoID muss gleich dem ComboBox Index sein!
-	EditRounds->setText(QString::number(database->keyTransfRounds()));		
+	EditRounds->setText(QString::number( database->keyTransfRounds() ));
+	ButtonBench->setIcon(getIcon("alarmclock"));
 	connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) );
 	connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
+	connect( ButtonBench, SIGNAL( clicked() ), this, SLOT( OnBenchmark() ) );
 }
 
 CDbSettingsDlg::~CDbSettingsDlg()
@@ -76,3 +79,7 @@ void CDbSettingsDlg::OnOK()
 	database->setCryptAlgorithm((CryptAlgorithm)ComboAlgo->currentIndex());
 	done(1);
 }
+
+void CDbSettingsDlg::OnBenchmark(){
+	EditRounds->setText(QString::number( KeyTransformBenchmark::benchmark(1000) ));
+}

src/dialogs/DatabaseSettingsDlg.h

@@ -32,8 +32,9 @@ class CDbSettingsDlg : public QDialog, private Ui_DatabaseSettingsDlg
 		virtual void paintEvent(QPaintEvent *);
 
 	private slots:
-    	virtual void OnCancel();
-    	virtual void OnOK();
+    	void OnCancel();
+    	void OnOK();
+		void OnBenchmark();
 
 	private:
 		IKdbSettings* database;