From 9b25cc235d5cccd33651ea2cd575617b53a74be8 Mon Sep 17 00:00:00 2001
From: tarek_saidi <tarek_saidi@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Thu, 29 Mar 2007 19:25:56 +0000
Subject: [PATCH] visual layout fixes for MacOS X

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@132 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/dialogs/CollectEntropyDlg.cpp |   2 +
 src/dialogs/PasswordGenDlg.cpp    |   5 +-
 src/forms/CollectEntropyDlg.ui    |  24 ++++--
 src/forms/PasswordGenDlg.ui       | 128 +++++++++++++-----------------
 src/mainwindow.cpp                |   1 +
 5 files changed, 78 insertions(+), 82 deletions(-)

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 @@
   </property>
   <property name="sizePolicy" >
    <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+    <hsizetype>5</hsizetype>
+    <vsizetype>5</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -23,12 +23,6 @@
     <height>230</height>
    </size>
   </property>
-  <property name="maximumSize" >
-   <size>
-    <width>432</width>
-    <height>230</height>
-   </size>
-  </property>
   <property name="windowTitle" >
    <string>Random Number Generator</string>
   </property>
@@ -84,6 +78,20 @@ Please move the mouse and/or press some keys until enought entropy for a reseed
    </item>
    <item>
     <widget class="QStackedWidget" name="stackedWidget" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>1</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>16</width>
+       <height>45</height>
+      </size>
+     </property>
      <property name="currentIndex" >
       <number>0</number>
      </property>
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 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>460</width>
-    <height>470</height>
+    <width>462</width>
+    <height>458</height>
    </rect>
   </property>
   <property name="sizePolicy" >
    <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+    <hsizetype>4</hsizetype>
+    <vsizetype>4</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize" >
-   <size>
-    <width>460</width>
-    <height>470</height>
-   </size>
-  </property>
-  <property name="maximumSize" >
-   <size>
-    <width>460</width>
-    <height>470</height>
-   </size>
-  </property>
   <property name="windowTitle" >
    <string>Password Generator</string>
   </property>
@@ -62,7 +50,7 @@
      </property>
      <layout class="QVBoxLayout" >
       <property name="margin" >
-       <number>10</number>
+       <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
@@ -102,40 +90,37 @@
          </spacer>
         </item>
         <item>
-         <layout class="QVBoxLayout" >
+         <layout class="QGridLayout" >
           <property name="margin" >
            <number>0</number>
           </property>
           <property name="spacing" >
-           <number>0</number>
+           <number>6</number>
           </property>
-          <item>
-           <widget class="QCheckBox" name="checkBox1" >
+          <item row="1" column="0" >
+           <widget class="QCheckBox" name="checkBox2" >
             <property name="text" >
-             <string>&amp;Upper Letters</string>
+             <string>&amp;Lower Letters</string>
             </property>
             <property name="shortcut" >
-             <string>Alt+U</string>
+             <string>Alt+L</string>
             </property>
             <property name="checked" >
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="checkBox2" >
+          <item row="2" column="1" >
+           <widget class="QCheckBox" name="checkBox7" >
             <property name="text" >
-             <string>&amp;Lower Letters</string>
+             <string>U&amp;nderline</string>
             </property>
             <property name="shortcut" >
-             <string>Alt+L</string>
-            </property>
-            <property name="checked" >
-             <bool>true</bool>
+             <string>Alt+N</string>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="2" column="0" >
            <widget class="QCheckBox" name="checkBox3" >
             <property name="text" >
              <string>&amp;Numbers</string>
@@ -148,66 +133,46 @@
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="checkBox4" >
+          <item row="0" column="1" >
+           <widget class="QCheckBox" name="checkBox5" >
             <property name="text" >
-             <string>&amp;Special Characters</string>
+             <string>White &amp;Spaces</string>
             </property>
-            <property name="checked" >
-             <bool>true</bool>
+            <property name="shortcut" >
+             <string>Alt+S</string>
             </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" >
+          <item row="0" column="0" >
+           <widget class="QCheckBox" name="checkBox1" >
             <property name="text" >
-             <string>White &amp;Spaces</string>
+             <string>&amp;Upper Letters</string>
             </property>
             <property name="shortcut" >
-             <string>Alt+S</string>
+             <string>Alt+U</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="1" column="1" >
            <widget class="QCheckBox" name="checkBox6" >
             <property name="text" >
              <string>Minus</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="checkBox7" >
+          <item row="3" column="0" >
+           <widget class="QCheckBox" name="checkBox4" >
             <property name="text" >
-             <string>U&amp;nderline</string>
+             <string>&amp;Special Characters</string>
             </property>
-            <property name="shortcut" >
-             <string>Alt+N</string>
+            <property name="checked" >
+             <bool>true</bool>
             </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>
@@ -217,8 +182,8 @@
           </property>
           <property name="sizeHint" >
            <size>
-            <width>40</width>
-            <height>20</height>
+            <width>101</width>
+            <height>108</height>
            </size>
           </property>
          </spacer>
@@ -273,10 +238,13 @@
         <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>
+        <property name="sizeType" >
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
         <property name="sizeHint" >
          <size>
           <width>20</width>
-          <height>20</height>
+          <height>25</height>
          </size>
         </property>
        </spacer>
@@ -382,6 +350,22 @@
           </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="QCheckBox" name="Check_CollectOncePerSession" >
           <property name="text" >
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());