Attachment #21900 for bug #34471

Lines 1-6 Link Here

(-)lprof-1.09.orig/ICCtoIT8/Makefile (-1 / +1 lines)
1	SHELL = /bin/sh	1	SHELL = /bin/sh
2		2
3	CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I/usr/include -I/usr/local/include	3	CFLAGS = -g -O4 -fomit-frame-pointer -Wall -I../include -I../../lcms-1.09/include -I/usr/include -I/usr/local/include
4	BASEDIR = $(DESTDIR)/usr	4	BASEDIR = $(DESTDIR)/usr
5	BINDIR = ..	5	BINDIR = ..
6		6




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:


Lines 17-24 Link Here

(-)lprof-1.09.orig/qt/qtMeasurementTool/makefile (-2 / +2 lines)
17	endif	17	endif
18		18
19	# some settings	19	# some settings
20	INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)	20	INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
21	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)	21	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
22	CFLAGS = -O4 -Wall $(KDEFLAGS)	22	CFLAGS = -O4 -Wall $(KDEFLAGS)
23	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm	23	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
24		24

Lines 39-44 Link Here

(-)lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialog.cpp (-4 / +17 lines)
39	#include "qtlcmswidgets.h"	39	#include "qtlcmswidgets.h"
40	#include "qtmeasurementtooldialog.h"	40	#include "qtmeasurementtooldialog.h"
41		41
		42
42	#ifdef USE_KDE	43	#ifdef USE_KDE
43	#include <kfiledialog.h>	44	#include <kfiledialog.h>
44	#endif	45	#endif
Lines 402-407 Link Here
402	{	403	{
403	QCanvasView::resizeEvent( e );	404	QCanvasView::resizeEvent( e );
404	canvas()->resize(width()-4,height()-4);	405	canvas()->resize(width()-4,height()-4);
		406	MeasurementDialog.Reload();
405	}	407	}
406		408
407	void FigureEditor::contentsMousePressEvent(QMouseEvent* e)	409	void FigureEditor::contentsMousePressEvent(QMouseEvent* e)
Lines 429-442 Link Here
429		431
430	}	432	}
431	else	433	else
		434	#if 0
432	if (e -> button() & Qt::RightButton) {	435	if (e -> button() & Qt::RightButton) {
433		436	#else
		437	if (e -> state() & Qt::ShiftButton) {
		438	#endif
434	sizing = (GridItem) it;	439	sizing = (GridItem) it;
435	contentsMouseMoveEvent(e);	440	contentsMouseMoveEvent(e);
436	}	441	}
437	else	442	else
438	if (e -> button() & Qt::LeftButton) {	443	if (e -> button() & Qt::LeftButton) {
439
440	moving = (GridItem) it;	444	moving = (GridItem) it;
441	moving_start = e->pos();	445	moving_start = e->pos();
442	}	446	}
Lines 450-455 Link Here
450		454
451	void FigureEditor::contentsMouseMoveEvent(QMouseEvent* e)	455	void FigureEditor::contentsMouseMoveEvent(QMouseEvent* e)
452	{	456	{
		457
453	if ( moving ) {	458	if ( moving ) {
454		459
455	moving->moveBy(e->pos().x() - moving_start.x(),	460	moving->moveBy(e->pos().x() - moving_start.x(),
Lines 529-535 Link Here
529		534
530	Canvas = new QCanvas(w-4, h-4);	535	Canvas = new QCanvas(w-4, h-4);
531	Canvas -> setAdvancePeriod(30);	536	Canvas -> setAdvancePeriod(30);
532	FigEditor = new FigureEditor(*Canvas, CanvasFrame);	537	FigEditor = new FigureEditor(this, Canvas, CanvasFrame);
533	FigEditor -> clear();	538	FigEditor -> clear();
534	// FigEditor-> resize(w, h);	539	// FigEditor-> resize(w, h);
535	CanvasFrameLayout->addWidget(FigEditor);	540	CanvasFrameLayout->addWidget(FigEditor);
Lines 839-844 Link Here
839		844
840	}	845	}
841		846
		847	void qtMeasurementToolDialog::Reload()
		848	{
		849	TheImage -> Reload(fn, MonitorProfileSelector ->getFilename(),
		850	InputProfileSelector->getFilename(),
		851	Canvas);
		852	}
		853
		854
842		855
843	// ------------------------------------------------------------------------------ Slots	856	// ------------------------------------------------------------------------------ Slots
844		857
Lines 910-916 Link Here
910		923
911	} else	924	} else
912	{	925	{
913	Status->setText("Click & drag mouse to place the grid: Left - Move, Right - Size, Ctrl - UnShear. PICK when finished.");	926	Status->setText("Click & drag mouse to place the grid: Left - Move, Shift - Size, Ctrl - UnShear. PICK when finished.");
914	PickBtn->show();	927	PickBtn->show();
915	ProofToggle -> show();	928	ProofToggle -> show();
916	}	929	}




};


class qtMeasurementToolDialog;

// This class implements a visual dragger for pick templates



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:

	GridItem* sizing;
	GridItem* unshearing;
    QPoint moving_start;
    qtMeasurementToolDialog &MeasurementDialog;	
};




	BOOL LoadConfig();
	void SaveConfig();
	void Reload();


public slots:





                                        </property>
                                        <property>
                                            <name>FileMask</name>
                                            <string>*.itx;*.ITX</string>
                                        </property>
                                        <property>
                                            <name>Prompt</name>

                                        </property>
                                        <property>
                                            <name>FileMask</name>
                                            <string>*.icc; *.icm; *.ICC; *.ICM</string>
                                        </property>
                                        <property>
                                            <name>Prompt</name>

                                        </property>
                                        <property>
                                            <name>FileMask</name>
                                            <string>*.icc;*.icm;*.ICC;*.ICM</string>
                                        </property>
                                        <property>
                                            <name>Prompt</name>

Lines 18-25 Link Here

(-)lprof-1.09.orig/qt/qtMonitorProfiler/Makefile (-2 / +2 lines)
18		18
19		19
20	# some settings	20	# some settings
21	INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)	21	INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
22	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)	22	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
23	CFLAGS = -O4 -Wall $(KDEFLAGS)	23	CFLAGS = -O4 -Wall $(KDEFLAGS)
24	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm	24	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
25	BINDIR = ../../	25	BINDIR = ../../

Lines 1261-1267 Link Here

(-)lprof-1.09.orig/qt/qtMonitorProfiler/qtmonitorprofilerdialogbase.ui (-2 / +2 lines)
1261	</property>	1261	</property>
1262	<property>	1262	<property>
1263	<name>FileMask</name>	1263	<name>FileMask</name>
1264	<string>IT8/CGATS.5 files (.it? .cgs);;All files (.)</string>	1264	<string>IT8/CGATS.5 files (.it? .cgs .IT? .CGS);;All files (.)</string>
1265	</property>	1265	</property>
1266	<property>	1266	<property>
1267	<name>Prompt</name>	1267	<name>Prompt</name>
Lines 1353-1359 Link Here
1353	</property>	1353	</property>
1354	<property>	1354	<property>
1355	<name>FileMask</name>	1355	<name>FileMask</name>
1356	<string>icc profiles (.icc .icm);;All files (.)</string>	1356	<string>icc profiles (.icc .icm .ICC .ICM);;All files (.)</string>
1357	</property>	1357	</property>
1358	<property>	1358	<property>
1359	<name>Prompt</name>	1359	<name>Prompt</name>

Lines 18-25 Link Here

(-)lprof-1.09.orig/qt/qtProfileChecker/makefile (-2 / +3 lines)
18		18
19		19
20	# some settings	20	# some settings
21	INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)	21	INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
22	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)	22	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
		23
23	CFLAGS = -O4 -Wall $(KDEFLAGS)	24	CFLAGS = -O4 -Wall $(KDEFLAGS)
24	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm	25	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
25	BINDIR = ../../	26	BINDIR = ../../

Lines 1432-1438 Link Here

(-)lprof-1.09.orig/qt/qtProfileChecker/qtprofilecheckerdialogbase.ui (-1 / +1 lines)
1432	</property>	1432	</property>
1433	<property>	1433	<property>
1434	<name>FileMask</name>	1434	<name>FileMask</name>
1435	<string>.icm;.icc;*.pf</string>	1435	<string>.icm;.icc;.pf;.ICM;.ICC;.PF</string>
1436	</property>	1436	</property>
1437	<property>	1437	<property>
1438	<name>Prompt</name>	1438	<name>Prompt</name>

Lines 18-25 Link Here

(-)lprof-1.09.orig/qt/qtScannerProfiler/Makefile (-2 / +2 lines)
18		18
19		19
20	# some settings	20	# some settings
21	INCLUDES = -I../../include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)	21	INCLUDES = -I../../include -I../../../lcms-1.09/include -I$(QTDIR)/include -I. -I.. -I$(QTDIR)/include/qt $(KDEINCLUDE)
22	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR)	22	LIBS = -L$(QTDIR)/lib -L../../src $(KDELIBDIR) -L../../../lcms-1.09/src
23	CFLAGS = -O4 -Wall $(KDEFLAGS)	23	CFLAGS = -O4 -Wall $(KDEFLAGS)
24	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm	24	POSTLIB = $(KDEPOSTLIB) -lqt -llprof -llcms -lm
25	BINDIR = ../../	25	BINDIR = ../../

Lines 1-6 Link Here

(-)lprof-1.09.orig/src/makefile (-1 / +1 lines)
1	SHELL = /bin/sh	1	SHELL = /bin/sh
2		2
3	CFLAGS = -g -O4 -I../include -fomit-frame-pointer -Wall	3	CFLAGS = -g -O4 -I../include -I../../lcms-1.09/include -fomit-frame-pointer -Wall
4	BASEDIR = $(DESTDIR)/usr	4	BASEDIR = $(DESTDIR)/usr
5	BINDIR = $(BASEDIR)/bin	5	BINDIR = $(BASEDIR)/bin
6	LIBDIR = $(BASEDIR)/lib	6	LIBDIR = $(BASEDIR)/lib

Return to bug 34471

Lines 148-153 Link Here

(-)lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialog.h (-4 / +4 lines)
148	};	148	};
149		149
150		150
		151	class qtMeasurementToolDialog;
151		152
152	// This class implements a visual dragger for pick templates	153	// This class implements a visual dragger for pick templates
153		154
Lines 157-163 Link Here
157		158
158	public:	159	public:
159		160
160	FigureEditor(QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f) {}	161	FigureEditor(qtMeasurementToolDialog &measurement_dialog, QCanvas& c, QWidget* parent=0, const char* name=0, WFlags f=0) : QCanvasView(&c,parent,name,f), MeasurementDialog(measurement_dialog) {}
161	void clear();	162	void clear();
162	void resizeEvent( QResizeEvent* e );	163	void resizeEvent( QResizeEvent* e );
163	protected:	164	protected:
Lines 174-180 Link Here
174	GridItem* sizing;	175	GridItem* sizing;
175	GridItem* unshearing;	176	GridItem* unshearing;
176	QPoint moving_start;	177	QPoint moving_start;
177		178	qtMeasurementToolDialog &MeasurementDialog;
178	};	179	};
179		180
180		181
Lines 201-208 Link Here
201		202
202	BOOL LoadConfig();	203	BOOL LoadConfig();
203	void SaveConfig();	204	void SaveConfig();
204		205	void Reload();
205
206		206
207	public slots:	207	public slots:
208		208

Lines 1674-1680 Link Here

(-)lprof-1.09.orig/qt/qtMeasurementTool/qtmeasurementtooldialogbase.ui (-3 / +3 lines)
1674	</property>	1674	</property>
1675	<property>	1675	<property>
1676	<name>FileMask</name>	1676	<name>FileMask</name>
1677	<string>*.itx</string>	1677	<string>.itx;.ITX</string>
1678	</property>	1678	</property>
1679	<property>	1679	<property>
1680	<name>Prompt</name>	1680	<name>Prompt</name>
Lines 1861-1867 Link Here
1861	</property>	1861	</property>
1862	<property>	1862	<property>
1863	<name>FileMask</name>	1863	<name>FileMask</name>
1864	<string>.icc; .icm</string>	1864	<string>.icc; .icm; .ICC; .ICM</string>
1865	</property>	1865	</property>
1866	<property>	1866	<property>
1867	<name>Prompt</name>	1867	<name>Prompt</name>
Lines 1925-1931 Link Here
1925	</property>	1925	</property>
1926	<property>	1926	<property>
1927	<name>FileMask</name>	1927	<name>FileMask</name>
1928	<string>.icc;.icm</string>	1928	<string>.icc;.icm;.ICC;.ICM</string>
1929	</property>	1929	</property>
1930	<property>	1930	<property>
1931	<name>Prompt</name>	1931	<name>Prompt</name>

Lines 1-17 Link Here

(-)lprof-1.09.orig/Makefile (-7 / +7 lines)
1	SHELL = /bin/sh	1	SHELL = /bin/sh
2		2
3	init: FORCE	3	init: FORCE
4	@$(MAKE) -s all	4	@$(MAKE) all
5		5
6	all install clean test::	6	all install clean test::
7	@echo "little cms profiler construction set 1.09 being made $@."	7	@echo "little cms profiler construction set 1.09 being made $@."
8	@echo "please wait ..."	8	@echo "please wait ..."
9	cd src ; $(MAKE) $@ ; cd ..	9	( cd src ; $(MAKE) )
10	cd ICCtoIT8 ; $(MAKE) $@ ; cd ..	10	( cd ICCtoIT8 ; $(MAKE) )
11	cd qt/qtMeasurementTool; $(MAKE) $@ ; cd ../..	11	( cd qt/qtMeasurementTool; $(MAKE) $@ )
12	cd qt/qtMonitorProfiler; $(MAKE) $@ ; cd ../..	12	( cd qt/qtMonitorProfiler; $(MAKE) $@ )
13	cd qt/qtScannerProfiler; $(MAKE) $@ ; cd ../..	13	( cd qt/qtScannerProfiler; $(MAKE) $@ )
14	cd qt/qtProfileChecker; $(MAKE) $@ ; cd ../..	14	( cd qt/qtProfileChecker; $(MAKE) $@ )
15		15
16	FORCE:	16	FORCE:
17		17