[Lprof-devel] lprof/src/libqtlcmswidgets qtlcmswidgets.cpp, 1.42.2.3, 1.42.2.4

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

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

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


Index: qtlcmswidgets.cpp
===================================================================
RCS file: /cvsroot/lprof/lprof/src/libqtlcmswidgets/qtlcmswidgets.cpp,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -C2 -d -r1.42.2.3 -r1.42.2.4
*** qtlcmswidgets.cpp	25 Jun 2009 13:32:07 -0000	1.42.2.3
--- qtlcmswidgets.cpp	30 Jun 2009 00:00:09 -0000	1.42.2.4
***************
*** 48,53 ****
  #include <qcursor.h>
  #include <QPolygon>
! 
! 
  
  #include <setjmp.h>
--- 48,52 ----
  #include <qcursor.h>
  #include <QPolygon>
! #include <QFileDialog>
  
  #include <setjmp.h>
***************
*** 160,166 ****
  {
      QString fn;
!     Q3FileDialog fd;
! 
!     fd.setShowHiddenFiles(TRUE);
  
      if (lUseLineEdit)
--- 159,163 ----
  {
      QString fn;
!   	QFileDialog fd;
  
      if (lUseLineEdit)
***************
*** 168,191 ****
          if (lForOutput)
          {
!             fn = fd.getSaveFileName(Dir,
!                                     FileMask,
!                                     this,
!                                     /*QString::null */ "",
!                                     Prompt->text());
          }
          else
          {
!                 fn = fd.getOpenFileName(Dir,
!                                         FileMask,
!                                         this,
!                                         /* QString::null */ "",
!                                         Prompt->text());
          }
      }
      else
      {
!         fn = fd.getExistingDirectory(Dir, this, "",
!                                      QTranslator::tr("Select ") + getPrompt() + 
!                                          QTranslator::tr(" directory"), TRUE);
      }
  
--- 165,179 ----
          if (lForOutput)
          {
! 			fn =  fd.getSaveFileName(this, Prompt->text(), Dir, FileMask);
          }
          else
          {
! 				fn = fd.getOpenFileName(this, Prompt->text(), Dir, FileMask);
          }
      }
      else
      {
! 		fn = fd.getExistingDirectory(this, QTranslator::tr("Select ") + getPrompt() + QTranslator::tr(" directory"),
! 												Dir, QFileDialog::ShowDirsOnly);
      }
  
***************
*** 679,683 ****
  {
      QTableWidgetItem* Item = new QTableWidgetItem(s,0);						
! 	Item->setFlags(Qt::ItemIsSelectable);													
  	Grid -> setItem(row, col, Item);
  }
--- 667,671 ----
  {
      QTableWidgetItem* Item = new QTableWidgetItem(s,0);						
! 	Item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);													
  	Grid -> setItem(row, col, Item);
  }
***************
*** 696,704 ****
      QColor ColorInside(Scale(Inside[0]), Scale(Inside[1]), Scale(Inside[2]));
      QPixmap* pix = new QPixmap(34, 32);
! 
      QPainter Painter(pix);
  
! 
!     Painter.fillRect(0, 0, 2,  32, Qt::white);
      Painter.fillRect(2, 0, 32, 32, ColorFrame);
      Painter.fillRect(8, 6, 20, 20, ColorInside);
--- 684,693 ----
      QColor ColorInside(Scale(Inside[0]), Scale(Inside[1]), Scale(Inside[2]));
      QPixmap* pix = new QPixmap(34, 32);
! 	
! 	pix->fill(Qt::white);
! 	
      QPainter Painter(pix);
  
! 	Painter.fillRect(0, 0, 2,  32, Qt::white);
      Painter.fillRect(2, 0, 32, 32, ColorFrame);
      Painter.fillRect(8, 6, 20, 20, ColorInside);
***************
*** 710,716 ****
  {
      QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB);
- 
      QTableWidgetItem* Item = new QTableWidgetItem(QIcon(*Pixmap), QString::null, 0);
! 	Item->setFlags(Qt::ItemIsSelectable);
      Grid -> setItem(row, col, Item);
  
--- 699,704 ----
  {
      QPixmap* Pixmap = CreateProofPixmap(LabProof, RGB);
      QTableWidgetItem* Item = new QTableWidgetItem(QIcon(*Pixmap), QString::null, 0);
! 	Item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
      Grid -> setItem(row, col, Item);