[Lprof-devel] lprof/src/libqtlcmswidgets qtcietonge.cpp, 1.3, 1.3.2.1 qtlcmswidgets.cpp, 1.42.2.5,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
      Tag: GSoC-2009
	qtcietonge.cpp qtlcmswidgets.cpp qtlcmswidgets.h 
Log Message:

Index: qtlcmswidgets.h
===================================================================
RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.h,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -d -r1.15.2.3 -r1.15.2.4
*** qtlcmswidgets.h	25 Jun 2009 13:32:07 -0000	1.15.2.3
--- qtlcmswidgets.h	3 Jul 2009 16:10:56 -0000	1.15.2.4
***************
*** 46,53 ****
  #include <QTableView>
  #include <QTableWidget>
! /*
! #include <q3hbox.h>
! #include <q3table.h>
! */
  // Base selector implements a selector for IT8 files and icc profiles
  // This is not intended to be a good hierarchy but a flexible widget
--- 46,50 ----
  #include <QTableView>
  #include <QTableWidget>
! 
  // Base selector implements a selector for IT8 files and icc profiles
  // This is not intended to be a good hierarchy but a flexible widget

Index: qtcietonge.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtcietonge.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** qtcietonge.cpp	6 Mar 2008 21:18:58 -0000	1.3
--- qtcietonge.cpp	3 Jul 2009 16:10:56 -0000	1.3.2.1
***************
*** 213,217 ****
      outline.setColor(Qt::white);
      path.addPolygon(tongePoly);
!     painter.setBackgroundColor(Qt::black);
      painter.setPen(outline);
      painter.drawPath(path);
--- 213,217 ----
      outline.setColor(Qt::white);
      path.addPolygon(tongePoly);
!     painter.setBackground(Qt::black);
      painter.setPen(outline);
      painter.drawPath(path);

Index: qtlcmswidgets.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v
retrieving revision 1.42.2.5
retrieving revision 1.42.2.6
diff -C2 -d -r1.42.2.5 -r1.42.2.6
*** qtlcmswidgets.cpp	1 Jul 2009 18:34:01 -0000	1.42.2.5
--- qtlcmswidgets.cpp	3 Jul 2009 16:10:56 -0000	1.42.2.6
***************
*** 42,53 ****

  #include <qapplication.h>
- #include <q3filedialog.h>
- #include <q3textview.h>
- #include <q3textstream.h>
  #include <qvariant.h>
  #include <qcursor.h>
  #include <QPolygon>
  #include <QFileDialog>
! 
  #include <setjmp.h>

--- 42,50 ----

  #include <qapplication.h>
  #include <qvariant.h>
  #include <qcursor.h>
  #include <QPolygon>
  #include <QFileDialog>
! #include <QTextStream>
  #include <setjmp.h>

***************
*** 135,139 ****
      if (lUseLineEdit) return LineEdit -> text();

!     int Key = Combo->currentItem();
      if (Key < 0) return QString::null;

--- 132,136 ----
      if (lUseLineEdit) return LineEdit -> text();

!     int Key = Combo->currentIndex();
      if (Key < 0) return QString::null;

***************
*** 152,156 ****
      for (unsigned int i = 0; i < FileNames.count(); i++)
      {
!         if (FileNames[i] == name) Combo->setCurrentItem(i);
      }
  }
--- 149,153 ----
      for (unsigned int i = 0; i < FileNames.count(); i++)
      {
!         if (FileNames[i] == name) Combo->setCurrentIndex(i);
      }
  }
***************
*** 230,234 ****

      fd.setFilter(QDir::Files | QDir::Hidden);
!     fd.setNameFilter(FileMask);

      const QFileInfoList& files = fd.entryInfoList();
--- 227,231 ----

      fd.setFilter(QDir::Files | QDir::Hidden);
!     fd.setNameFilters(FileMask.split(QString::fromLocal8Bit(" ")));

      const QFileInfoList& files = fd.entryInfoList();
***************
*** 303,307 ****
      }

!     Combo->insertStringList(Descriptions);
      QApplication::restoreOverrideCursor();
  }
--- 300,304 ----
      }

!     Combo->insertItems(50,Descriptions);
      QApplication::restoreOverrideCursor();
  }
***************
*** 314,319 ****
      QFile inFile(FileName);
      inFile.open(QIODevice::ReadOnly);
!     Q3TextStream stream(&inFile);
!     
      stream >> Description;
      if(Description == QString::fromLocal8Bit("HCT"))
--- 311,316 ----
      QFile inFile(FileName);
      inFile.open(QIODevice::ReadOnly);
!      QTextStream stream(&inFile);
! 	
      stream >> Description;
      if(Description == QString::fromLocal8Bit("HCT"))
***************
*** 338,343 ****
      QFile inFile(FileName);
      inFile.open(QIODevice::ReadOnly);
!     Q3TextStream stream(&inFile);
!     
      stream >> inString;

--- 335,340 ----
      QFile inFile(FileName);
      inFile.open(QIODevice::ReadOnly);
!     QTextStream stream(&inFile);
! 	
      stream >> inString;

***************
*** 349,356 ****
          QString gmDescription;

!         startOfFileName = FileName.findRev(QString::fromLocal8Bit("/"), -1);
          gmFilename = FileName;		
          gmFilename.remove(0, startOfFileName + 1);
!         gmFilename.remove(gmFilename.findRev(QString::fromLocal8Bit("."), -1), 4);

          while(!stream.atEnd())
--- 346,353 ----
          QString gmDescription;

!         startOfFileName = FileName.lastIndexOf(QString::fromLocal8Bit("/"), -1);
          gmFilename = FileName;		
          gmFilename.remove(0, startOfFileName + 1);
!         gmFilename.remove(gmFilename.lastIndexOf(QString::fromLocal8Bit("."), -1), 4);

          while(!stream.atEnd())
***************
*** 388,393 ****
      QString inString;
      inFile.open(QIODevice::ReadOnly);
!     Q3TextStream stream(&inFile);
!     stream >> inString;
      inFile.close();

--- 385,391 ----
      QString inString;
      inFile.open(QIODevice::ReadOnly);
!     QTextStream stream(&inFile);
!     
! 	stream >> inString;
      inFile.close();

***************
*** 426,430 ****

      fd.setFilter(QDir::Files | QDir::Hidden);
!     fd.setNameFilter(FileMask);

      const QFileInfoList& files = fd.entryInfoList();
--- 424,428 ----

      fd.setFilter(QDir::Files | QDir::Hidden);
!     fd.setNameFilters(FileMask.split(QString::fromLocal8Bit(" ")));

      const QFileInfoList& files = fd.entryInfoList();
***************
*** 481,486 ****
                              Backing = QString::fromLocal8Bit(" ") + Backing + QString::fromLocal8Bit(" backing ");
                          QString temp = QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "DESCRIPTOR"));
!                         if (temp.find(QString::fromLocal8Bit("(")) > -1 && temp.findRev(QString::fromLocal8Bit(")")) == temp.length() - 1)
!                             other = QString::fromLocal8Bit(" ") + temp.mid(temp.find(QString::fromLocal8Bit("(")) + 1, temp.length() - temp.find(QString::fromLocal8Bit("(")) - 2) + QString::fromLocal8Bit(" ");
                          QString numFields = QString::fromLocal8Bit(" Number of Fields ") + QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "NUMBER_OF_FIELDS")); 

--- 479,484 ----
                              Backing = QString::fromLocal8Bit(" ") + Backing + QString::fromLocal8Bit(" backing ");
                          QString temp = QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "DESCRIPTOR"));
!                         if (temp.indexOf(QString::fromLocal8Bit("(")) > -1 && temp.lastIndexOf(QString::fromLocal8Bit(")")) == temp.length() - 1)
!                             other = QString::fromLocal8Bit(" ") + temp.mid(temp.indexOf(QString::fromLocal8Bit("(")) + 1, temp.length() - temp.indexOf(QString::fromLocal8Bit("(")) - 2) + QString::fromLocal8Bit(" ");
                          QString numFields = QString::fromLocal8Bit(" Number of Fields ") + QString::fromLocal8Bit(cmsxIT8GetProperty(hIT8, "NUMBER_OF_FIELDS")); 

***************
*** 513,517 ****
      }
      if (OK)
!         Combo->insertStringList(Descriptions);
      QApplication::restoreOverrideCursor();
  }
--- 511,515 ----
      }
      if (OK)
!         Combo->insertItems(51,Descriptions);
      QApplication::restoreOverrideCursor();
  }
***************
*** 548,552 ****

      fd.setFilter(QDir::Files | QDir::Hidden);
!     fd.setNameFilter(FileMask);

      const QFileInfoList& files = fd.entryInfoList();
--- 546,550 ----

      fd.setFilter(QDir::Files | QDir::Hidden);
!     fd.setNameFilters(FileMask.split(QString::fromLocal8Bit(" ")));

      const QFileInfoList& files = fd.entryInfoList();
***************
*** 607,611 ****
      cmsSetErrorHandler(NULL);

!     Combo->insertStringList(Descriptions);

      QApplication::restoreOverrideCursor();
--- 605,609 ----
      cmsSetErrorHandler(NULL);

!     Combo->insertItems(52,Descriptions);

      QApplication::restoreOverrideCursor();
***************
*** 981,999 ****

  	CorrByItem[0] = CHK_CORR_NONE;
! 	corrCombo->insertItem(QTranslator::tr("No Correction"));

  	CorrByItem[1] = CHK_CORR_LUMINANCE;
! 	corrCombo->insertItem(QTranslator::tr("Luminance Correction"));

  	CorrByItem[2] = CHK_CORR_MATRIX;
! 	corrCombo->insertItem(QTranslator::tr("Matrix Correction"));

  	CorrByItem[3] = CHK_CORR_WP_WVK;
! 	corrCombo->insertItem(QTranslator::tr("Whitepoint Correction (Wrong von Kries)"));

  	CorrByItem[4] = CHK_CORR_WP_BDF;
! 	corrCombo->insertItem(QTranslator::tr("Whitepoint Correction (Bradford)"));

! 	corrCombo->setCurrentItem(0);
      }
  }
--- 979,997 ----

  	CorrByItem[0] = CHK_CORR_NONE;
! 	corrCombo->insertItem(50,QTranslator::tr("No Correction"));

  	CorrByItem[1] = CHK_CORR_LUMINANCE;
! 	corrCombo->insertItem(51,QTranslator::tr("Luminance Correction"));

  	CorrByItem[2] = CHK_CORR_MATRIX;
! 	corrCombo->insertItem(52,QTranslator::tr("Matrix Correction"));

  	CorrByItem[3] = CHK_CORR_WP_WVK;
! 	corrCombo->insertItem(53,QTranslator::tr("Whitepoint Correction (Wrong von Kries)"));

  	CorrByItem[4] = CHK_CORR_WP_BDF;
! 	corrCombo->insertItem(54,QTranslator::tr("Whitepoint Correction (Bradford)"));

! 	corrCombo->setCurrentIndex(0);
      }
  }
***************
*** 1009,1013 ****

      CheckerCorrection corr = CorrectionCombo ?
! 	CorrByItem[CorrectionCombo->currentItem()] :
          CHK_CORR_NONE;

--- 1007,1011 ----

      CheckerCorrection corr = CorrectionCombo ?
! 	CorrByItem[CorrectionCombo->currentIndex()] :
          CHK_CORR_NONE;

[Lprof-devel] lprof/src/libqtlcmswidgets qtcietonge.cpp, 1.3, 1.3.2.1 qtlcmswidgets.cpp, 1.42.2.5,

[Lprof-devel] lprof/src/libqtlcmswidgets qtcietonge.cpp, 1.3, 1.3.2.1 qtlcmswidgets.cpp, 1.42.2.5, 1.42.2.6 qtlcmswidgets.h, 1.15.2.3, 1.15.2.4