From 0634d15abb45942ed882b4e09e6891ac3eb488a7 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Thu, 2 Oct 2014 00:49:20 +0200
Subject: [PATCH 1/3] Fix update dialog layout on WIn

---
 interface/ui/updateDialog.ui | 71 +++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/interface/ui/updateDialog.ui b/interface/ui/updateDialog.ui
index b0f1e63cb9..0e0eb57e56 100644
--- a/interface/ui/updateDialog.ui
+++ b/interface/ui/updateDialog.ui
@@ -60,10 +60,7 @@
     </property>
     <property name="font">
      <font>
-      <family>Arial</family>
-      <pointsize>36</pointsize>
-      <stylestrategy>PreferAntialias</stylestrategy>
-      <kerning>false</kerning>
+      <pointsize>20</pointsize>
      </font>
     </property>
     <property name="styleSheet">
@@ -77,10 +74,10 @@
   <widget class="QLabel" name="updateContent">
    <property name="geometry">
     <rect>
-     <x>100</x>
-     <y>110</y>
-     <width>561</width>
-     <height>61</height>
+     <x>50</x>
+     <y>90</y>
+     <width>641</width>
+     <height>141</height>
     </rect>
    </property>
    <property name="font">
@@ -103,8 +100,8 @@
     <rect>
      <x>360</x>
      <y>240</y>
-     <width>364</width>
-     <height>40</height>
+     <width>374</width>
+     <height>42</height>
     </rect>
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -115,15 +112,15 @@
       </property>
       <property name="styleSheet">
        <string notr="true">    background-color: #333333;
-    border-width: 0;
-    border-radius: 9px;
-    border-radius: 9px;
-    font-family: Arial;
-    font-size: 18px;
-    font-weight: 100;
-    color: #b7b7b7;
-    width: 120px;
-    height: 40px;</string>
+border-width: 0;
+border-radius: 9px;
+border-radius: 9px;
+font-family: Arial;
+font-size: 18px;
+font-weight: 100;
+color: #b7b7b7;
+width: 120px;
+height: 40px;</string>
       </property>
       <property name="text">
        <string>Download</string>
@@ -137,15 +134,15 @@
       </property>
       <property name="styleSheet">
        <string notr="true">    background-color: #333333;
-    border-width: 0;
-    border-radius: 9px;
-    border-radius: 9px;
-    font-family: Arial;
-    font-size: 18px;
-    font-weight: 100;
-    color: #b7b7b7;
-    width: 120px;
-    height: 40px;</string>
+border-width: 0;
+border-radius: 9px;
+border-radius: 9px;
+font-family: Arial;
+font-size: 18px;
+font-weight: 100;
+color: #b7b7b7;
+width: 120px;
+height: 40px;</string>
       </property>
       <property name="text">
        <string>Skip Version</string>
@@ -159,15 +156,15 @@
       </property>
       <property name="styleSheet">
        <string notr="true">    background-color: #333333;
-    border-width: 0;
-    border-radius: 9px;
-    border-radius: 9px;
-    font-family: Arial;
-    font-size: 18px;
-    font-weight: 100;
-    color: #b7b7b7;
-    width: 120px;
-    height: 40px;</string>
+border-width: 0;
+border-radius: 9px;
+border-radius: 9px;
+font-family: Arial;
+font-size: 18px;
+font-weight: 100;
+color: #b7b7b7;
+width: 120px;
+height: 40px;</string>
       </property>
       <property name="text">
        <string>Close</string>

From e1581852966e3d0e6ef68540171a09f835ef4267 Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Fri, 3 Oct 2014 13:20:02 +0200
Subject: [PATCH 2/3] layout changes on update dialog

---
 interface/ui/updateDialog.ui | 56 ++----------------------------------
 1 file changed, 3 insertions(+), 53 deletions(-)

diff --git a/interface/ui/updateDialog.ui b/interface/ui/updateDialog.ui
index 0e0eb57e56..25d9936b36 100644
--- a/interface/ui/updateDialog.ui
+++ b/interface/ui/updateDialog.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>750</width>
-    <height>300</height>
+    <height>243</height>
    </rect>
   </property>
   <property name="cursor">
@@ -22,67 +22,17 @@
   <property name="styleSheet">
    <string notr="true">background-color: rgb(255, 255, 255);</string>
   </property>
-  <widget class="QFrame" name="frame">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>751</width>
-     <height>71</height>
-    </rect>
-   </property>
-   <property name="layoutDirection">
-    <enum>Qt::LeftToRight</enum>
-   </property>
-   <property name="autoFillBackground">
-    <bool>false</bool>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background-color: rgb(236, 236, 236);</string>
-   </property>
-   <property name="frameShape">
-    <enum>QFrame::StyledPanel</enum>
-   </property>
-   <property name="frameShadow">
-    <enum>QFrame::Plain</enum>
-   </property>
-   <property name="lineWidth">
-    <number>0</number>
-   </property>
-   <widget class="QLabel" name="updateDialog">
-    <property name="geometry">
-     <rect>
-      <x>240</x>
-      <y>10</y>
-      <width>271</width>
-      <height>41</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <pointsize>20</pointsize>
-     </font>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">color: rgb(51, 51, 51);</string>
-    </property>
-    <property name="text">
-     <string>Update Required</string>
-    </property>
-   </widget>
-  </widget>
   <widget class="QLabel" name="updateContent">
    <property name="geometry">
     <rect>
      <x>50</x>
-     <y>90</y>
+     <y>20</y>
      <width>641</width>
      <height>141</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <family>Arial</family>
      <pointsize>18</pointsize>
      <weight>50</weight>
      <bold>false</bold>
@@ -99,7 +49,7 @@
    <property name="geometry">
     <rect>
      <x>360</x>
-     <y>240</y>
+     <y>190</y>
      <width>374</width>
      <height>42</height>
     </rect>

From f2095dacbd4021c648730ee150e43163c633384d Mon Sep 17 00:00:00 2001
From: stojce <stojce@me.com>
Date: Fri, 3 Oct 2014 13:45:26 +0200
Subject: [PATCH 3/3] 	more dialog fixes

---
 interface/src/ui/UpdateDialog.cpp |  4 ++--
 interface/ui/updateDialog.ui      | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/interface/src/ui/UpdateDialog.cpp b/interface/src/ui/UpdateDialog.cpp
index ace022b683..33024586be 100644
--- a/interface/src/ui/UpdateDialog.cpp
+++ b/interface/src/ui/UpdateDialog.cpp
@@ -23,8 +23,8 @@ UpdateDialog::UpdateDialog(QWidget *parent, const QString& releaseNotes, const Q
     Ui::Dialog dialogUI;
     dialogUI.setupUi(this);
     
-    QString updateRequired = QString("You are currently running build %1, the latest build released is %2. \
-                                      Please download and install the most recent release to access the latest features and bug fixes.")
+    QString updateRequired = QString("You are currently running build %1, the latest build released is %2."
+                                     "\n\nPlease download and install the most recent release to access the latest features and bug fixes.")
                                       .arg(Application::getInstance()->applicationVersion(), latestVersion);
     
     setAttribute(Qt::WA_DeleteOnClose);
diff --git a/interface/ui/updateDialog.ui b/interface/ui/updateDialog.ui
index 25d9936b36..fc375e17c2 100644
--- a/interface/ui/updateDialog.ui
+++ b/interface/ui/updateDialog.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>750</width>
-    <height>243</height>
+    <height>213</height>
    </rect>
   </property>
   <property name="cursor">
@@ -28,16 +28,19 @@
      <x>50</x>
      <y>20</y>
      <width>641</width>
-     <height>141</height>
+     <height>111</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>18</pointsize>
-     <weight>50</weight>
-     <bold>false</bold>
+     <family>Arial</family>
+     <pointsize>-1</pointsize>
     </font>
    </property>
+   <property name="styleSheet">
+    <string notr="true">font-family: Arial;
+font-size: 20px;</string>
+   </property>
    <property name="text">
     <string/>
    </property>
@@ -49,7 +52,7 @@
    <property name="geometry">
     <rect>
      <x>360</x>
-     <y>190</y>
+     <y>160</y>
      <width>374</width>
      <height>42</height>
     </rect>