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

[svn at pcbsd.org]

Author: kris
Date: 2008-06-19 07:56:07 -0700 (Thu, 19 Jun 2008)
New Revision: 2126

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

Fixed a bug in PCInstall where the promo ad's didn't load / display



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2008-06-19 14:09:29 UTC (rev 2125)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2008-06-19 14:56:07 UTC (rev 2126)
@@ -21,8 +21,8 @@
 
 void PCInstall::ProgramInit()
 {
-    //QFont f( "Sans Serif", 10);
-    //setFont( f);    
+//    QFont f( "Dejavu", 10);
+//    setFont( f);    
 
     // Set the variable to regenerate the custom slices
     regenCustomSlices = 1;
@@ -2472,11 +2472,13 @@
     }
     
     
-    	  QImage *Icon = new QImage(FileName);
-	  QPixmap PixmapIcon;
-	  PixmapIcon.convertFromImage(Icon->scaled(450,215));
-	  frameDisplayAd1->setPaletteBackgroundPixmap(PixmapIcon);
-	  frameDisplayAd2->setPaletteBackgroundPixmap(PixmapIcon);
+    	  //QImage *Icon = new QImage(FileName);
+	  //QPixmap PixmapIcon(FileName);
+	  //PixmapIcon.convertFromImage(Icon->scaled(450,215));
+	  //frameDisplayAd1->setPaletteBackgroundPixmap(PixmapIcon.scaled(450,215));
+	  frameDisplayAd2->setStyleSheet(QString::fromUtf8("background-image: url(" + FileName + ");"));
+	  frameDisplayAd1->setStyleSheet(QString::fromUtf8("background-image: url(" + FileName + ");"));
+	  //frameDisplayAd2->setPaletteBackgroundPixmap(PixmapIcon.scaled(450,215));
     
     QTimer::singleShot( 15000, this, SLOT(changePromoAd()) );
     

Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui	2008-06-19 14:09:29 UTC (rev 2125)
+++ pcbsd/trunk/PCInstall/pcinstall.ui	2008-06-19 14:56:07 UTC (rev 2126)
@@ -4593,6 +4593,14 @@
    </widget>
   </widget>
   <widget class="QWidget" name="WizardPage" >
+   <property name="geometry" >
+    <rect>
+     <x>6</x>
+     <y>36</y>
+     <width>988</width>
+     <height>647</height>
+    </rect>
+   </property>
    <attribute name="title" >
     <string>System Components</string>
    </attribute>
@@ -6028,17 +6036,20 @@
       <bool>false</bool>
      </property>
     </widget>
-    <widget class="Q3Frame" name="frameDisplayAd2" >
+    <widget class="QFrame" name="frameDisplayAd2" >
      <property name="geometry" >
       <rect>
        <x>70</x>
        <y>60</y>
-       <width>450</width>
-       <height>215</height>
+       <width>455</width>
+       <height>218</height>
       </rect>
      </property>
+     <property name="styleSheet" >
+      <string notr="true" />
+     </property>
      <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow" >
       <enum>QFrame::Raised</enum>
@@ -6046,10 +6057,10 @@
      <widget class="QLabel" name="textLabelAd2" >
       <property name="geometry" >
        <rect>
-        <x>10</x>
-        <y>180</y>
-        <width>430</width>
-        <height>31</height>
+        <x>20</x>
+        <y>190</y>
+        <width>421</width>
+        <height>20</height>
        </rect>
       </property>
       <property name="text" >
@@ -6058,9 +6069,6 @@
       <property name="alignment" >
        <set>Qt::AlignCenter</set>
       </property>
-      <property name="wordWrap" >
-       <bool>false</bool>
-      </property>
      </widget>
     </widget>
    </widget>
@@ -6484,14 +6492,6 @@
    </widget>
   </widget>
   <widget class="QWidget" name="WizardPage" >
-   <property name="geometry" >
-    <rect>
-     <x>6</x>
-     <y>36</y>
-     <width>988</width>
-     <height>647</height>
-    </rect>
-   </property>
    <attribute name="title" >
     <string>Upgrading PC-BSD</string>
    </attribute>
@@ -6971,20 +6971,20 @@
       <bool>false</bool>
      </property>
     </widget>
-    <widget class="Q3Frame" name="frameDisplayAd1" >
+    <widget class="QFrame" name="frameDisplayAd1" >
      <property name="geometry" >
       <rect>
        <x>60</x>
-       <y>50</y>
-       <width>450</width>
-       <height>215</height>
+       <y>60</y>
+       <width>455</width>
+       <height>218</height>
       </rect>
      </property>
-     <property name="font" >
-      <font/>
+     <property name="styleSheet" >
+      <string notr="true" />
      </property>
      <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow" >
       <enum>QFrame::Raised</enum>
@@ -6992,24 +6992,18 @@
      <widget class="QLabel" name="textLabelAd1" >
       <property name="geometry" >
        <rect>
-        <x>10</x>
-        <y>180</y>
-        <width>430</width>
-        <height>31</height>
+        <x>20</x>
+        <y>190</y>
+        <width>421</width>
+        <height>20</height>
        </rect>
       </property>
-      <property name="font" >
-       <font/>
-      </property>
       <property name="text" >
        <string/>
       </property>
       <property name="alignment" >
        <set>Qt::AlignCenter</set>
       </property>
-      <property name="wordWrap" >
-       <bool>false</bool>
-      </property>
      </widget>
     </widget>
    </widget>
@@ -7469,12 +7463,6 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Q3Frame</class>
-   <extends>QFrame</extends>
-   <header>Qt3Support/Q3Frame</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>Q3Wizard</class>
    <extends>QDialog</extends>
    <header>q3wizard.h</header>