diff --git a/src/dialogs/CollectEntropyDlg.cpp b/src/dialogs/CollectEntropyDlg.cpp
index 2373443..d55d14a 100644
--- a/src/dialogs/CollectEntropyDlg.cpp
+++ b/src/dialogs/CollectEntropyDlg.cpp
@@ -26,6 +26,8 @@
CollectEntropyDlg::CollectEntropyDlg(QWidget* parent):QDialog(parent){
setupUi(this);
+ setMinimumSize(size());
+ setMaximumSize(size());
createBanner(&BannerPixmap,getPixmap("dice"),tr("Entropy Collection"),width());
KeyEntropyBuffer=new unsigned char[105];
MouseEntropyBuffer=new quint16[210];
diff --git a/src/dialogs/PasswordGenDlg.cpp b/src/dialogs/PasswordGenDlg.cpp
index 403fe5a..dfadcbf 100755
--- a/src/dialogs/PasswordGenDlg.cpp
+++ b/src/dialogs/PasswordGenDlg.cpp
@@ -37,8 +37,9 @@ CGenPwDialog::CGenPwDialog(QWidget* parent, bool StandAloneMode,Qt::WFlags fl)
: QDialog(parent,fl)
{
setupUi(this);
- createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width());
-
+ setMinimumSize(size());
+ setMaximumSize(size());
+ createBanner(&BannerPixmap,getPixmap("dice"),tr("Password Generator"),width());
connect(ButtonGenerate,SIGNAL(clicked()),this,SLOT(OnGeneratePw()));
connect(Radio_1,SIGNAL(toggled(bool)),this,SLOT(OnRadio1StateChanged(bool)));
connect(Radio_2,SIGNAL(toggled(bool)),this,SLOT(OnRadio2StateChanged(bool)));
diff --git a/src/forms/CollectEntropyDlg.ui b/src/forms/CollectEntropyDlg.ui
index 1421bf1..be914e4 100644
--- a/src/forms/CollectEntropyDlg.ui
+++ b/src/forms/CollectEntropyDlg.ui
@@ -11,8 +11,8 @@
- 0
- 0
+ 5
+ 5
0
0
@@ -23,12 +23,6 @@
230
-
-
- 432
- 230
-
-
Random Number Generator
@@ -84,6 +78,20 @@ Please move the mouse and/or press some keys until enought entropy for a reseed
-
+
+
+ 5
+ 1
+ 0
+ 0
+
+
+
+
+ 16
+ 45
+
+
0
diff --git a/src/forms/PasswordGenDlg.ui b/src/forms/PasswordGenDlg.ui
index 73f65bb..7047782 100644
--- a/src/forms/PasswordGenDlg.ui
+++ b/src/forms/PasswordGenDlg.ui
@@ -5,30 +5,18 @@
0
0
- 460
- 470
+ 462
+ 458
- 0
- 0
+ 4
+ 4
0
0
-
-
- 460
- 470
-
-
-
-
- 460
- 470
-
-
Password Generator
@@ -62,7 +50,7 @@
- 10
+ 9
6
@@ -102,27 +90,14 @@
-
-
+
0
- 0
+ 6
-
-
-
-
- &Upper Letters
-
-
- Alt+U
-
-
- true
-
-
-
- -
+
-
&Lower Letters
@@ -135,7 +110,17 @@
- -
+
-
+
+
+ U&nderline
+
+
+ Alt+N
+
+
+
+ -
&Numbers
@@ -148,7 +133,37 @@
- -
+
-
+
+
+ White &Spaces
+
+
+ Alt+S
+
+
+
+ -
+
+
+ &Upper Letters
+
+
+ Alt+U
+
+
+ true
+
+
+
+ -
+
+
+ Minus
+
+
+
+ -
&Special Characters
@@ -160,56 +175,6 @@
- -
-
-
- 0
-
-
- 0
-
-
-
-
-
- White &Spaces
-
-
- Alt+S
-
-
-
- -
-
-
- Minus
-
-
-
- -
-
-
- U&nderline
-
-
- Alt+N
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
@@ -217,8 +182,8 @@
- 40
- 20
+ 101
+ 108
@@ -273,10 +238,13 @@
Qt::Vertical
+
+ QSizePolicy::Fixed
+
20
- 20
+ 25
@@ -382,6 +350,22 @@
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
-
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e31e47d..99afe24 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -77,6 +77,7 @@ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,QWidget *parent, Qt:
Start=true;
ShutingDown=false;
setupUi(this);
+ setUnifiedTitleAndToolBarOnMac(true);
AutoType::MainWin=this;
setGeometry(settings->value("Ui/MainWindowGeometry",QVariant(geometry())).toRect());
VSplitter->restoreState(settings->value("Ui/VSplitterPos").toByteArray());