[Lprof-devel] lprof/src/monqt monitorvalues.cpp, 1.28.2.1, 1.28.2.2 monitorvaluesbase.ui, 1.18, 1.18.2.1

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

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

Modified Files:
      Tag: GSoC-2009
	monitorvalues.cpp monitorvaluesbase.ui 
Log Message:
With these changes lprof is now ported


Index: monitorvalues.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvalues.cpp,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -C2 -d -r1.28.2.1 -r1.28.2.2
*** monitorvalues.cpp	30 Jun 2009 00:00:10 -0000	1.28.2.1
--- monitorvalues.cpp	5 Jul 2009 20:33:17 -0000	1.28.2.2
***************
*** 44,52 ****
  #include "qmessagebox.h"
  #include <qstringlist.h>
! #include <q3buttongroup.h>
  #include <qlayout.h>
  #include <qradiobutton.h>
  #include <qcheckbox.h>
! #include <q3groupbox.h>
  #include <qpushbutton.h>
  #include <qspinbox.h>
--- 44,52 ----
  #include "qmessagebox.h"
  #include <qstringlist.h>
! #include <QButtonGroup>
  #include <qlayout.h>
  #include <qradiobutton.h>
  #include <qcheckbox.h>
! #include <QGroupBox>
  #include <qpushbutton.h>
  #include <qspinbox.h>
***************
*** 54,65 ****
  #include <qlabel.h>
  #include <qslider.h>
! #include <q3filedialog.h>
! #include <q3multilineedit.h>
  #include <qtabwidget.h>
! #include <q3textview.h>
! #include <q3progressbar.h>
  #include <qdir.h>
  #include <qapplication.h>
! #include <q3table.h>
  #include <qvalidator.h>
  #include <qimage.h>
--- 54,65 ----
  #include <qlabel.h>
  #include <qslider.h>
! #include <QFileDialog>
! #include <QTextEdit>
  #include <qtabwidget.h>
! #include <QProgressBar>
  #include <qdir.h>
  #include <qapplication.h>
! #include <QTableWidget>
! #include <QTableView>
  #include <qvalidator.h>
  #include <qimage.h>
***************
*** 150,154 ****
  
  MonitorValues::MonitorValues(QWidget *parent )
!     : QDialog(parent, "", 0, Qt::WindowSystemMenuHint)
  {
      setupUi(this);
--- 150,154 ----
  
  MonitorValues::MonitorValues(QWidget *parent )
!     : QDialog(parent, Qt::WindowSystemMenuHint)
  {
      setupUi(this);
***************
*** 188,195 ****
      for (i=0; i < NPRIMARIES; i++)
      {
!         ComboPrimaries -> insertItem(tr(PrimTable[i].Name.toLocal8Bit()));
      }
  
!     ComboPrimaries -> setCurrentItem(mon.items.ppos);
  
      if (mon.items.ppos< (NPRIMARIES-1))
--- 188,195 ----
      for (i=0; i < NPRIMARIES; i++)
      {
!         ComboPrimaries -> insertItem((ComboPrimaries->count()+1), tr(PrimTable[i].Name.toLocal8Bit()));
      }
  
!     ComboPrimaries -> setCurrentIndex(mon.items.ppos);
  
      if (mon.items.ppos< (NPRIMARIES-1))
***************
*** 207,213 ****
      ComboBoxWP -> clear();
      for (i=0; i < NWHITES; i++)
!         ComboBoxWP -> insertItem(tr(WhitePoints[i].Name.toLocal8Bit()));
  
!     ComboBoxWP-> setCurrentItem(mon.items.wppos);
      slotChangeWhitePoint();
  
--- 207,213 ----
      ComboBoxWP -> clear();
      for (i=0; i < NWHITES; i++)
!         ComboBoxWP ->insertItem((ComboBoxWP ->count()+1), tr(WhitePoints[i].Name.toLocal8Bit()));
  
!     ComboBoxWP-> setCurrentIndex(mon.items.wppos);
      slotChangeWhitePoint();
  
***************
*** 245,249 ****
      // char buff[32];
  
!     int nSel = ComboPrimaries -> currentItem();
  
      BOOL IsUser = (nSel == NPRIMARIES - 1);
--- 245,249 ----
      // char buff[32];
  
!     int nSel = ComboPrimaries -> currentIndex();
  
      BOOL IsUser = (nSel == NPRIMARIES - 1);
***************
*** 301,305 ****
      cmsCIExyY wp;
  
!     int nSel = ComboBoxWP-> currentItem();
  
      if (nSel == NWHITES - 1)
--- 301,305 ----
      cmsCIExyY wp;
  
!     int nSel = ComboBoxWP-> currentIndex();
  
      if (nSel == NWHITES - 1)
***************
*** 340,349 ****
      mon.items.bgamma = GammaB -> value();
      mon.items.valid_mon=TRUE;
!     if (ComboBoxWP-> currentItem() == NWHITES -1)
          mon.items.temp=TempWhitePoint -> value();
      else
          mon.items.temp = 0;
!     mon.items.wppos=ComboBoxWP-> currentItem();
!     mon.items.ppos=ComboPrimaries -> currentItem();
      mon.put(mon);
  }
--- 340,349 ----
      mon.items.bgamma = GammaB -> value();
      mon.items.valid_mon=TRUE;
!     if (ComboBoxWP-> currentIndex() == NWHITES -1)
          mon.items.temp=TempWhitePoint -> value();
      else
          mon.items.temp = 0;
!     mon.items.wppos=ComboBoxWP-> currentIndex();
!     mon.items.ppos=ComboPrimaries -> currentIndex();
      mon.put(mon);
  }

Index: monitorvaluesbase.ui
===================================================================
RCS file: /cvsroot/lprof/lprof/src/monqt/monitorvaluesbase.ui,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** monitorvaluesbase.ui	1 Feb 2009 20:04:01 -0000	1.18
--- monitorvaluesbase.ui	5 Jul 2009 20:33:17 -0000	1.18.2.1
***************
*** 153,157 ****
     </item>
     <item row="1" column="0" >
!     <widget class="Q3GroupBox" name="GroupBox6" >
       <property name="sizePolicy" >
        <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
--- 153,157 ----
     </item>
     <item row="1" column="0" >
!     <widget class="QGroupBox" name="GroupBox6" >
       <property name="sizePolicy" >
        <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
***************
*** 243,247 ****
     </item>
     <item rowspan="2" row="1" column="1" >
!     <widget class="Q3ButtonGroup" name="ButtonGroup4_2" >
       <property name="sizePolicy" >
        <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
--- 243,247 ----
     </item>
     <item rowspan="2" row="1" column="1" >
!     <widget class="QGroupBox" name="ButtonGroup4_2" >
       <property name="sizePolicy" >
        <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
***************
*** 547,551 ****
     </item>
     <item row="2" column="0" >
!     <widget class="Q3GroupBox" name="GroupBox5_2" >
       <property name="sizePolicy" >
        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
--- 547,551 ----
     </item>
     <item row="2" column="0" >
!     <widget class="QGroupBox" name="GroupBox5_2" >
       <property name="sizePolicy" >
        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
***************
*** 1212,1229 ****
   </widget>
   <layoutdefault spacing="6" margin="11" />
-  <customwidgets>
-   <customwidget>
-    <class>Q3GroupBox</class>
-    <extends>QGroupBox</extends>
-    <header>Qt3Support/Q3GroupBox</header>
-    <container>1</container>
-   </customwidget>
-   <customwidget>
-    <class>Q3ButtonGroup</class>
-    <extends>Q3GroupBox</extends>
-    <header>Qt3Support/Q3ButtonGroup</header>
-    <container>1</container>
-   </customwidget>
-  </customwidgets>
   <resources>
    <include location="../../lprof.qrc" />
--- 1212,1215 ----