Apply via patch -p < this_file
*** ./qt/qtProfileChecker/qtprofilecheckerdialogbase.ui.orig	Wed Jun 19 11:59:40 2002
--- ./qt/qtProfileChecker/qtprofilecheckerdialogbase.ui	Thu Jan  9 17:59:07 2003
***************
*** 1432,1438 ****
                                  </property>
                                  <property>
                                      <name>FileMask</name>
!                                     <string>*.icm;*.icc;*.pf</string>
                                  </property>
                                  <property>
                                      <name>Prompt</name>
--- 1432,1438 ----
                                  </property>
                                  <property>
                                      <name>FileMask</name>
!                                     <string>*.icm;*.icc;*.pf;*.ICM;*.ICC;*.PF</string>
                                  </property>
                                  <property>
                                      <name>Prompt</name>
*** ./qt/qtProfileChecker/makefile.orig	Wed Jun 19 11:59:40 2002
--- ./qt/qtProfileChecker/makefile	Thu Jan  9 18:10:09 2003
***************
*** 18,25 ****
  
  
  # some settings
! INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt  $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  BINDIR   = ../../
--- 18,26 ----
  
  
  # some settings
! INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt  $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
! 
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  BINDIR   = ../../
*** ./qt/qtMonitorProfiler/Makefile.orig	Tue Jun 25 07:44:54 2002
--- ./qt/qtMonitorProfiler/Makefile	Fri Aug  2 15:16:10 2002
***************
*** 18,25 ****
  
  
  # some settings
! INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt  $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  BINDIR   = ../../
--- 18,25 ----
  
  
  # some settings
! INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt  $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  BINDIR   = ../../
*** ./qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui.orig	Wed Jun 19 11:59:55 2002
--- ./qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui	Thu Jan  9 18:00:54 2003
***************
*** 1261,1267 ****
                                  </property>
                                  <property>
                                      <name>FileMask</name>
!                                     <string>IT8/CGATS.5 files (*.it? *.cgs);;All files (*.*)</string>
                                  </property>
                                  <property>
                                      <name>Prompt</name>
--- 1261,1267 ----
                                  </property>
                                  <property>
                                      <name>FileMask</name>
!                                     <string>IT8/CGATS.5 files (*.it? *.cgs *.IT? *.CGS);;All files (*.*)</string>
                                  </property>
                                  <property>
                                      <name>Prompt</name>
***************
*** 1353,1359 ****
                                  </property>
                                  <property>
                                      <name>FileMask</name>
!                                     <string>icc profiles (*.icc *.icm);;All files (*.*)</string>
                                  </property>
                                  <property>
                                      <name>Prompt</name>
--- 1353,1359 ----
                                  </property>
                                  <property>
                                      <name>FileMask</name>
!                                     <string>icc profiles (*.icc *.icm *.ICC *.ICM);;All files (*.*)</string>
                                  </property>
                                  <property>
                                      <name>Prompt</name>
*** ./qt/qtScannerProfiler/Makefile.orig	Tue Jun 25 07:46:03 2002
--- ./qt/qtScannerProfiler/Makefile	Fri Aug  2 15:16:54 2002
***************
*** 18,25 ****
  
  
  # some settings
! INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt  $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  BINDIR   = ../../
--- 18,25 ----
  
  
  # some settings
! INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt  $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  BINDIR   = ../../
*** ./qt/qtMeasurementTool/qtmeasurementtooldialog.cpp.orig	Wed Jun 19 11:59:30 2002
--- ./qt/qtMeasurementTool/qtmeasurementtooldialog.cpp	Fri Jan 24 18:42:26 2003
***************
*** 39,44 ****
--- 39,45 ----
  #include "qtlcmswidgets.h"
  #include "qtmeasurementtooldialog.h"
  
+ 
  #ifdef USE_KDE
  #include <kfiledialog.h>
  #endif
***************
*** 402,407 ****
--- 403,409 ----
  {
    QCanvasView::resizeEvent( e );
    canvas()->resize(width()-4,height()-4);
+   MeasurementDialog.Reload();
  }
  
  void FigureEditor::contentsMousePressEvent(QMouseEvent* e)
***************
*** 429,442 ****
  
      }
      else
      if (e -> button() & Qt::RightButton) {
!         
              sizing = (GridItem*) *it;                   
              contentsMouseMoveEvent(e);
      }
      else 
      if (e -> button() & Qt::LeftButton) {
- 
              moving = (GridItem*) *it;
              moving_start = e->pos();
      }
--- 431,446 ----
  
      }
      else
+ #if 0
      if (e -> button() & Qt::RightButton) {
! #else
!     if (e -> state() & Qt::ShiftButton) {
! #endif
              sizing = (GridItem*) *it;                   
              contentsMouseMoveEvent(e);
      }
      else 
      if (e -> button() & Qt::LeftButton) {
              moving = (GridItem*) *it;
              moving_start = e->pos();
      }
***************
*** 450,455 ****
--- 454,460 ----
  
  void FigureEditor::contentsMouseMoveEvent(QMouseEvent* e)
  {
+ 
      if ( moving ) {
  
          moving->moveBy(e->pos().x() - moving_start.x(),
***************
*** 529,535 ****
  
      Canvas = new QCanvas(w-4, h-4); 
      Canvas -> setAdvancePeriod(30);   
!     FigEditor = new FigureEditor(*Canvas, CanvasFrame);
      FigEditor -> clear();
      //  FigEditor-> resize(w, h);
      CanvasFrameLayout->addWidget(FigEditor);
--- 534,540 ----
  
      Canvas = new QCanvas(w-4, h-4); 
      Canvas -> setAdvancePeriod(30);   
!     FigEditor = new FigureEditor(*this, *Canvas, CanvasFrame);
      FigEditor -> clear();
      //  FigEditor-> resize(w, h);
      CanvasFrameLayout->addWidget(FigEditor);
***************
*** 839,844 ****
--- 844,857 ----
  
  }
  
+ void qtMeasurementToolDialog::Reload()
+ {
+     TheImage -> Reload(fn, MonitorProfileSelector ->getFilename(),
+                                  InputProfileSelector->getFilename(),  
+                                  Canvas);
+ }
+ 
+ 
  
  // ------------------------------------------------------------------------------ Slots
  
***************
*** 910,916 ****
  
              } else
              {
!                 Status->setText("Click & drag mouse to place the grid: Left - Move, Right - Size, Ctrl - UnShear. PICK when finished.");
                  PickBtn->show();                                        
                  ProofToggle -> show();
              }
--- 923,929 ----
  
              } else
              {
!                 Status->setText("Click & drag mouse to place the grid: Left - Move, Shift - Size, Ctrl - UnShear. PICK when finished.");
                  PickBtn->show();                                        
                  ProofToggle -> show();
              }
*** ./qt/qtMeasurementTool/qtmeasurementtooldialog.h.orig	Wed Jun 19 11:59:30 2002
--- ./qt/qtMeasurementTool/qtmeasurementtooldialog.h	Fri Jan 24 18:41:26 2003
***************
*** 148,153 ****
--- 148,154 ----
  };
  
  
+ class qtMeasurementToolDialog;
  
  // This class implements a visual dragger for pick templates
  
***************
*** 157,163 ****
  
  public:
  
! 	FigureEditor(QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f) {}    
      void clear();
      void resizeEvent( QResizeEvent* e );
  protected:
--- 158,164 ----
  
  public:
  
! 	 FigureEditor(qtMeasurementToolDialog &measurement_dialog, QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f), MeasurementDialog(measurement_dialog) {}
      void clear();
      void resizeEvent( QResizeEvent* e );
  protected:
***************
*** 174,180 ****
  	GridItem* sizing;
  	GridItem* unshearing;
      QPoint moving_start;
! 	
  };
  
  
--- 175,181 ----
  	GridItem* sizing;
  	GridItem* unshearing;
      QPoint moving_start;
!     qtMeasurementToolDialog &MeasurementDialog;	
  };
  
  
***************
*** 201,208 ****
  
  	BOOL LoadConfig();
  	void SaveConfig();
! 
! 
  
  public slots:
  
--- 202,208 ----
  
  	BOOL LoadConfig();
  	void SaveConfig();
! 	void Reload();
  
  public slots:
  
*** ./qt/qtMeasurementTool/makefile.orig	Tue Jun 25 07:42:07 2002
--- ./qt/qtMeasurementTool/makefile	Fri Aug  2 15:16:10 2002
***************
*** 17,24 ****
  endif
  
  # some settings
! INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  
--- 17,24 ----
  endif
  
  # some settings
! INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
! LIBS     = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
  CFLAGS   = -O4 -Wall $(KDEFLAGS)
  POSTLIB  = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
  
*** ./qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui.orig	Wed Jun 19 11:59:30 2002
--- ./qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui	Thu Jan  9 18:05:12 2003
***************
*** 1674,1680 ****
                                          </property>
                                          <property>
                                              <name>FileMask</name>
!                                             <string>*.itx</string>
                                          </property>
                                          <property>
                                              <name>Prompt</name>
--- 1674,1680 ----
                                          </property>
                                          <property>
                                              <name>FileMask</name>
!                                             <string>*.itx;*.ITX</string>
                                          </property>
                                          <property>
                                              <name>Prompt</name>
***************
*** 1861,1867 ****
                                          </property>
                                          <property>
                                              <name>FileMask</name>
!                                             <string>*.icc; *.icm</string>
                                          </property>
                                          <property>
                                              <name>Prompt</name>
--- 1861,1867 ----
                                          </property>
                                          <property>
                                              <name>FileMask</name>
!                                             <string>*.icc; *.icm; *.ICC; *.ICM</string>
                                          </property>
                                          <property>
                                              <name>Prompt</name>
***************
*** 1925,1931 ****
                                          </property>
                                          <property>
                                              <name>FileMask</name>
!                                             <string>*.icc;*.icm</string>
                                          </property>
                                          <property>
                                              <name>Prompt</name>
--- 1925,1931 ----
                                          </property>
                                          <property>
                                              <name>FileMask</name>
!                                             <string>*.icc;*.icm;*.ICC;*.ICM</string>
                                          </property>
                                          <property>
                                              <name>Prompt</name>
*** ./src/makefile.orig	Mon Jun 17 12:30:39 2002
--- ./src/makefile	Fri Aug  2 15:10:50 2002
***************
*** 1,6 ****
  SHELL = /bin/sh
  
! CFLAGS  = -g -O4 -I../include -fomit-frame-pointer -Wall 
  BASEDIR = $(DESTDIR)/usr
  BINDIR  = $(BASEDIR)/bin
  LIBDIR  = $(BASEDIR)/lib
--- 1,6 ----
  SHELL = /bin/sh
  
! CFLAGS  = -g -O4 -I../include -I../../lcms-1.09/include -fomit-frame-pointer -Wall 
  BASEDIR = $(DESTDIR)/usr
  BINDIR  = $(BASEDIR)/bin
  LIBDIR  = $(BASEDIR)/lib
*** ./Makefile.orig	Tue Jun 25 07:43:36 2002
--- ./Makefile	Fri Aug  2 15:11:26 2002
***************
*** 1,17 ****
  SHELL = /bin/sh
  
  init: FORCE
! 	@$(MAKE) -s all
  
  all install clean test:: 
  	@echo "little cms profiler construction set 1.09 being made $@."
  	@echo "please wait ..."
! 	cd src ; $(MAKE) $@ ; cd .. 
! 	cd ICCtoIT8 ; $(MAKE) $@ ; cd .. 
! 	cd qt/qtMeasurementTool; $(MAKE) $@ ; cd ../.. 	
! 	cd qt/qtMonitorProfiler; $(MAKE) $@ ; cd ../.. 	
! 	cd qt/qtScannerProfiler; $(MAKE) $@ ; cd ../.. 	
! 	cd qt/qtProfileChecker;  $(MAKE) $@ ; cd ../.. 	
  
  FORCE:
  
--- 1,17 ----
  SHELL = /bin/sh
  
  init: FORCE
! 	@$(MAKE) all
  
  all install clean test:: 
  	@echo "little cms profiler construction set 1.09 being made $@."
  	@echo "please wait ..."
! 	( cd src ; $(MAKE) )
! 	( cd ICCtoIT8 ; $(MAKE) )
! 	( cd qt/qtMeasurementTool; $(MAKE) $@ )
! 	( cd qt/qtMonitorProfiler; $(MAKE) $@ )
! 	( cd qt/qtScannerProfiler; $(MAKE) $@ )
! 	( cd qt/qtProfileChecker;  $(MAKE) $@ )
  
  FORCE:
  
*** ./ICCtoIT8/Makefile.orig	Tue Jun 18 06:33:32 2002
--- ./ICCtoIT8/Makefile	Fri Aug  2 15:10:50 2002
***************
*** 1,6 ****
  SHELL = /bin/sh
  
! CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include
  BASEDIR = $(DESTDIR)/usr
  BINDIR  = ..
  
--- 1,6 ----
  SHELL = /bin/sh
  
! CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I../../lcms-1.09/include -I/usr/include -I/usr/local/include
  BASEDIR = $(DESTDIR)/usr
  BINDIR  = ..