[Lprof-devel] lprof/src/moncalcontrolqt moncalcontrol.cpp, 1.37.2.2, 1.37.2.3 moncalcontrol.h, 1.22.2.1, 1.22.2.2 moncalcontrolbase.ui, 1.21.2.1, 1.21.2.2

[Amit K. <ami...@us...>]

Update of /cvsroot/lprof/lprof/src/moncalcontrolqt
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4835/moncalcontrolqt

Modified Files:
      Tag: GSoC-2009
	moncalcontrol.cpp moncalcontrol.h moncalcontrolbase.ui 
Log Message:



Index: moncalcontrolbase.ui
===================================================================
RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrolbase.ui,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -d -r1.21.2.1 -r1.21.2.2
*** moncalcontrolbase.ui	1 Jul 2009 18:34:02 -0000	1.21.2.1
--- moncalcontrolbase.ui	3 Jul 2009 16:10:56 -0000	1.21.2.2
***************
*** 11,14 ****
--- 11,20 ----
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
    <property name="minimumSize">
     <size>
***************
*** 26,29 ****
--- 32,39 ----
     <string>Monitor Calibration and Measurement</string>
    </property>
+   <property name="windowIcon">
+    <iconset resource="../../lprof.qrc">
+     <normaloff>:/src/images/lcms.png</normaloff>:/src/images/lcms.png</iconset>
+   </property>
    <property name="wizardStyle">
     <enum>QWizard::ModernStyle</enum>
***************
*** 33,36 ****
--- 43,52 ----
    </property>
    <widget class="QWizardPage" name="Settings">
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
     <attribute name="pageId">
      <string>0</string>
***************
*** 858,864 ****
       <rect>
        <x>10</x>
!       <y>386</y>
        <width>521</width>
!       <height>81</height>
       </rect>
      </property>
--- 874,880 ----
       <rect>
        <x>10</x>
!       <y>400</y>
        <width>521</width>
!       <height>67</height>
       </rect>
      </property>
***************
*** 1006,1010 ****
     </widget>
    </widget>
!   <widget class="QWizardPage" name="Calibrate">
     <attribute name="pageId">
      <string>2</string>
--- 1022,1026 ----
     </widget>
    </widget>
!   <widget class="customPage" name="Calibrate">
     <attribute name="pageId">
      <string>2</string>
***************
*** 1204,1208 ****
     </widget>
    </widget>
!   <widget class="QWizardPage" name="Measure">
     <attribute name="pageId">
      <string>3</string>
--- 1220,1224 ----
     </widget>
    </widget>
!   <widget class="customPage" name="Measure">
     <attribute name="pageId">
      <string>3</string>
***************
*** 1407,1410 ****
--- 1423,1432 ----
     <container>1</container>
    </customwidget>
+   <customwidget>
+    <class>customPage</class>
+    <extends>QWizardPage</extends>
+    <header>custompage.h</header>
+    <container>1</container>
+   </customwidget>
   </customwidgets>
   <resources>

Index: moncalcontrol.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/moncalcontrolqt/moncalcontrol.cpp,v
retrieving revision 1.37.2.2
retrieving revision 1.37.2.3
diff -C2 -d -r1.37.2.2 -r1.37.2.3
*** moncalcontrol.cpp	1 Jul 2009 18:34:02 -0000	1.37.2.2
--- moncalcontrol.cpp	3 Jul 2009 16:10:56 -0000	1.37.2.3
***************
*** 422,426 ****
      slotGo();
      if (cd.data.OK)	
! 			warning1->setText(QString::fromLocal8Bit("Display is calibrated. You can now proceed to next page."));
  }
  
--- 422,426 ----
      slotGo();
      if (cd.data.OK)	
! 			Calibrate->pageCompleted(true);
  }
  
***************
*** 431,435 ****
      slotGo();
      if (cd.data.OK)
! 			warning2->setText(QString::fromLocal8Bit("Measurment sheet is created. You can now finish."));
  }
  
--- 431,435 ----
      slotGo();
      if (cd.data.OK)
! 			Measure->pageCompleted(true);
  }
  
***************
*** 731,751 ****
      pal.setColor(textLabelHeading5 ->  backgroundRole(), Qt::white);
      textLabelHeading5 -> setPalette(pal);
- 		
- 		warning1 = new QLabel(page(2));
-         warning1->setObjectName(QString::fromUtf8("warning"));
-         warning1->setGeometry(QRect(10, 380, 605, 41));
- 		QFont font1;
-         font1.setPointSize(10);
-         font1.setBold(true);
-         font1.setWeight(75);
-         warning1->setFont(font1);
-         warning1->setCursor(QCursor(Qt::ArrowCursor));
- 		warning1->setText(QString::fromLocal8Bit("Warning! display is not calibrated. You must calibrate it before going to next page."));
- 		warning2 = new QLabel(page(3));
-         warning2->setObjectName(QString::fromUtf8("warning"));
-         warning2->setGeometry(QRect(10, 380, 650, 41));
-         warning2->setFont(font1);
-         warning2->setCursor(QCursor(Qt::ArrowCursor));
- 		warning2->setText(QString::fromLocal8Bit("Warning! Measurment sheet is not created. You must create it before finishing."));
  }
  
--- 731,734 ----