[PC-BSD Commits] r2656 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: kris
Date: 2008-08-26 08:55:34 -0700 (Tue, 26 Aug 2008)
New Revision: 2656

Modified:
   pcbsd/trunk/PCInstall/pcinstall.cpp
   pcbsd/trunk/PCInstall/pcinstall.ui
Log:

Updated the installer a bit more, this fixes graphics corruption beneath the 
promo ad display



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-08-26 14:48:34 UTC (rev 2655)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-08-26 15:55:34 UTC (rev 2656)
@@ -2506,7 +2506,7 @@
 	    PromoAd++;
                     break;
 	case 4:
-	    FileName = "/usr/local/pcbsd/graphics/schools-universities.png";	 
+	    FileName = "/usr/local/pcbsd/graphics/schools-universities.png";
 	    textLabelAd1->setText(tr("Ideal for schools and universities"));
 	    textLabelAd2->setText(tr("Ideal for schools and universities"));
 	    PromoAd++;
@@ -2554,13 +2554,10 @@
     }
     
     
-	  frameDisplayAd2->setStyleSheet(QString::fromUtf8("background-image: url(" + FileName + ");"));
-	  frameDisplayAd1->setStyleSheet(QString::fromUtf8("background-image: url(" + FileName + ");"));
 
-          textLabelAd1->setStyleSheet(QString::fromUtf8("background-color: white"));
-	  textLabelAd2->setStyleSheet(QString::fromUtf8("background-color: white"));
-    
-    
+   frameDisplayAd1->setStyleSheet(QString::fromUtf8("background-image: url(" + FileName + ");"));
+   frameDisplayAd2->setStyleSheet(QString::fromUtf8("background-image: url(" + FileName + ");"));
+
     QTimer::singleShot( 15000, this, SLOT(changePromoAd()) );
     
     

Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui	2008-08-26 14:48:34 UTC (rev 2655)
+++ pcbsd/trunk/PCInstall/pcinstall.ui	2008-08-26 15:55:34 UTC (rev 2656)
@@ -5570,14 +5570,6 @@
    </widget>
   </widget>
   <widget class="QWidget" name="WizardPage" >
-   <property name="geometry" >
-    <rect>
-     <x>6</x>
-     <y>34</y>
-     <width>988</width>
-     <height>651</height>
-    </rect>
-   </property>
    <attribute name="title" >
     <string>Installing PC-BSD</string>
    </attribute>
@@ -6042,7 +6034,7 @@
        <x>70</x>
        <y>60</y>
        <width>455</width>
-       <height>218</height>
+       <height>171</height>
       </rect>
      </property>
      <property name="styleSheet" >
@@ -6054,29 +6046,26 @@
      <property name="frameShadow" >
       <enum>QFrame::Raised</enum>
      </property>
-     <widget class="QLabel" name="textLabelAd2" >
-      <property name="geometry" >
-       <rect>
-        <x>20</x>
-        <y>190</y>
-        <width>421</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="autoFillBackground" >
-       <bool>false</bool>
-      </property>
-      <property name="styleSheet" >
-       <string notr="true" >background-color: rgb(255, 255, 255);</string>
-      </property>
-      <property name="text" >
-       <string/>
-      </property>
-      <property name="alignment" >
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
     </widget>
+    <widget class="QLabel" name="textLabelAd2" >
+     <property name="geometry" >
+      <rect>
+       <x>70</x>
+       <y>240</y>
+       <width>455</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="autoFillBackground" >
+      <bool>false</bool>
+     </property>
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
    </widget>
   </widget>
   <widget class="QWidget" name="WizardPage" >
@@ -6498,6 +6487,14 @@
    </widget>
   </widget>
   <widget class="QWidget" name="WizardPage" >
+   <property name="geometry" >
+    <rect>
+     <x>6</x>
+     <y>34</y>
+     <width>988</width>
+     <height>651</height>
+    </rect>
+   </property>
    <attribute name="title" >
     <string>Upgrading PC-BSD</string>
    </attribute>
@@ -6983,7 +6980,7 @@
        <x>60</x>
        <y>60</y>
        <width>455</width>
-       <height>218</height>
+       <height>171</height>
       </rect>
      </property>
      <property name="styleSheet" >
@@ -6995,29 +6992,26 @@
      <property name="frameShadow" >
       <enum>QFrame::Raised</enum>
      </property>
-     <widget class="QLabel" name="textLabelAd1" >
-      <property name="geometry" >
-       <rect>
-        <x>20</x>
-        <y>190</y>
-        <width>421</width>
-        <height>20</height>
-       </rect>
-      </property>
-      <property name="autoFillBackground" >
-       <bool>false</bool>
-      </property>
-      <property name="styleSheet" >
-       <string notr="true" >background-color: rgb(255, 255, 255);</string>
-      </property>
-      <property name="text" >
-       <string/>
-      </property>
-      <property name="alignment" >
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
     </widget>
+    <widget class="QLabel" name="textLabelAd1" >
+     <property name="geometry" >
+      <rect>
+       <x>60</x>
+       <y>240</y>
+       <width>455</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="autoFillBackground" >
+      <bool>false</bool>
+     </property>
+     <property name="text" >
+      <string/>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
    </widget>
   </widget>
   <widget class="QWidget" name="WizardPage" >