Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3533 from stojce/20091

Browse source 
CR for Job #20091 - Windows : Popup to download update is unreadable on Windows (see attached screenshot)
This commit is contained in:
AndrewMeadows 2014-10-06 07:53:44 -07:00
commit a91d66d8bb
2 changed files with 42 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/UpdateDialog.cpp
View file

@ -23,8 +23,8 @@ UpdateDialog::UpdateDialog(QWidget *parent, const QString& releaseNotes, const Q
Ui::Dialog dialogUI; Ui::Dialog dialogUI;
dialogUI.setupUi(this); dialogUI.setupUi(this);
QString updateRequired = QString("You are currently running build %1, the latest build released is %2. \ 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.") "\n\nPlease download and install the most recent release to access the latest features and bug fixes.")
.arg(Application::getInstance()->applicationVersion(), latestVersion); .arg(Application::getInstance()->applicationVersion(), latestVersion);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);

130
interface/ui/updateDialog.ui
View file

@ -10,7 +10,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>750</width> <width>750</width>
<height>300</height> <height>213</height>
</rect> </rect>
</property> </property>
<property name="cursor"> <property name="cursor">
@ -22,75 +22,25 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string> <string notr="true">background-color: rgb(255, 255, 255);</string>
</property> </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>
<family>Arial</family>
<pointsize>36</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
<kerning>false</kerning>
</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"> <widget class="QLabel" name="updateContent">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>100</x> <x>50</x>
<y>110</y> <y>20</y>
<width>561</width> <width>641</width>
<height>61</height> <height>111</height>
</rect> </rect>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Arial</family> <family>Arial</family>
<pointsize>18</pointsize> <pointsize>-1</pointsize>
<weight>50</weight>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="styleSheet">
<string notr="true">font-family: Arial;
font-size: 20px;</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -102,9 +52,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>360</x> <x>360</x>
<y>240</y> <y>160</y>
<width>364</width> <width>374</width>
<height>40</height> <height>42</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@ -115,15 +65,15 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"> background-color: #333333; <string notr="true"> background-color: #333333;
border-width: 0; border-width: 0;
border-radius: 9px; border-radius: 9px;
border-radius: 9px; border-radius: 9px;
font-family: Arial; font-family: Arial;
font-size: 18px; font-size: 18px;
font-weight: 100; font-weight: 100;
color: #b7b7b7; color: #b7b7b7;
width: 120px; width: 120px;
height: 40px;</string> height: 40px;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Download</string> <string>Download</string>
@ -137,15 +87,15 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"> background-color: #333333; <string notr="true"> background-color: #333333;
border-width: 0; border-width: 0;
border-radius: 9px; border-radius: 9px;
border-radius: 9px; border-radius: 9px;
font-family: Arial; font-family: Arial;
font-size: 18px; font-size: 18px;
font-weight: 100; font-weight: 100;
color: #b7b7b7; color: #b7b7b7;
width: 120px; width: 120px;
height: 40px;</string> height: 40px;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Skip Version</string> <string>Skip Version</string>
@ -159,15 +109,15 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"> background-color: #333333; <string notr="true"> background-color: #333333;
border-width: 0; border-width: 0;
border-radius: 9px; border-radius: 9px;
border-radius: 9px; border-radius: 9px;
font-family: Arial; font-family: Arial;
font-size: 18px; font-size: 18px;
font-weight: 100; font-weight: 100;
color: #b7b7b7; color: #b7b7b7;
width: 120px; width: 120px;
height: 40px;</string> height: 40px;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Close</string> <string>Close</string>