Commit e05f2f2fabbb495d795c4672f94746f410336dc8

Initial qt3to4 porting. Commented wtuff that didn't compile.
src/Makefile
(0 / 163)
  
1
2ifeq ($(PREFIX),)
3 PREFIX = /usr/local
4endif
5
6
7####### Compiler, tools and options
8
9CC = gcc
10CXX = g++
11LEX = flex
12YACC = yacc
13CFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
14CXXFLAGS = -pipe -Wall -W -O2 -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
15LEXFLAGS =
16YACCFLAGS= -d
17INCPATH = -I$(QTDIR)/mkspecs/default -I. -I$(QTDIR)/include
18LINK = g++
19LFLAGS =
20LIBS = $(SUBLIBS) -Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt-mt -lXext -lX11 -lm -lpthread
21AR = ar cqs
22RANLIB =
23MOC = $(QTDIR)/bin/moc
24UIC = $(QTDIR)/bin/uic
25QMAKE = qmake
26TAR = tar -cf
27GZIP = gzip -9f
28COPY = cp -f
29COPY_FILE= $(COPY) -p
30COPY_DIR = $(COPY) -pR
31DEL_FILE = rm -f
32SYMLINK = ln -sf
33DEL_DIR = rmdir
34MOVE = mv -f
35CHK_DIR_EXISTS= test -d
36MKDIR = mkdir -p
37
38####### Output directory
39
40OBJECTS_DIR = ./
41
42####### Files
43
44HEADERS = quax.h
45SOURCES = quax.cpp \
46 main.cpp
47OBJECTS = quax.o \
48 main.o
49FORMS =
50UICDECLS =
51UICIMPLS =
52SRCMOC = moc_quax.cpp
53OBJMOC = moc_quax.o
54DIST = src.pro
55QMAKE_TARGET = quax
56DESTDIR =
57TARGET = quax
58
59####### Implicit rules
60
61.SUFFIXES: .c .cpp .cc .cxx .C
62
63.cpp.o:
64 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
65
66.cc.o:
67 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
68
69.cxx.o:
70 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
71
72.C.o:
73 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
74
75.c.o:
76 $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
77
78####### Build rules
79
80all: $(TARGET)
81
82$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
83 $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
84
85mocables: $(SRCMOC)
86
87$(MOC):
88 ( cd $(QTDIR)/src/moc ; $(MAKE) )
89
90dist:
91 @mkdir -p .tmp/quax && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/quax/ && ( cd `dirname .tmp/quax` && $(TAR) quax.tar quax && $(GZIP) quax.tar ) && $(MOVE) `dirname .tmp/quax`/quax.tar.gz . && $(DEL_FILE) -r .tmp/quax
92
93mocclean:
94 -$(DEL_FILE) $(OBJMOC)
95 -$(DEL_FILE) $(SRCMOC)
96
97uiclean:
98
99yaccclean:
100lexclean:
101clean: mocclean
102 -$(DEL_FILE) $(OBJECTS)
103 -$(DEL_FILE) *~ core *.core
104 -$(DEL_FILE) $(TARGET)
105
106
107####### Sub-libraries
108
109distclean: clean
110
111
112FORCE:
113
114####### Compile
115
116quax.o: quax.cpp mag.xpm \
117 mag-alpha.xpm \
118 exit.xpm \
119 viewmag.xpm \
120 viewmagin.xpm \
121 viewmagout.xpm \
122 look.xpm \
123 left.xpm \
124 right.xpm \
125 icon.xpm \
126 help.xpm \
127 quax.h \
128 ../config.h
129
130main.o: main.cpp quax.h \
131 ../config.h
132
133moc_quax.o: moc_quax.cpp quax.h ../config.h
134
135moc_quax.cpp: $(MOC) quax.h
136 $(MOC) quax.h -o moc_quax.cpp
137
138####### Install
139
140install_man:
141 @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/share/man/man1/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/share/man/man1/
142 -$(COPY_FILE) "quax.1" "$(INSTALL_ROOT)$(PREFIX)/share/man/man1/"
143
144
145uninstall_man:
146 -$(DEL_FILE) -r "$(INSTALL_ROOT)$(PREFIX)/share/man/man1/quax.1"
147 -$(DEL_DIR) "$(INSTALL_ROOT)$(PREFIX)/share/man/man1/"
148
149
150install_target:
151 @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/bin/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/bin/
152 $(DEL_FILE) "$(INSTALL_ROOT)$(PREFIX)/bin/$(QMAKE_TARGET)"
153 -$(COPY) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)$(PREFIX)/bin/$(QMAKE_TARGET)"
154 -strip "$(INSTALL_ROOT)$(PREFIX)/bin/$(QMAKE_TARGET)"
155
156uninstall_target:
157 -$(DEL_FILE) "$(INSTALL_ROOT)$(PREFIX)/bin/$(QMAKE_TARGET)"
158 -$(DEL_DIR) "$(INSTALL_ROOT)$(PREFIX)/bin/"
159
160
161install: all install_man install_target
162
163uninstall: uninstall_man uninstall_target
src/quax.cpp
(63 / 48)
  
2626#include <qglobal.h>
2727
2828#if QT_VERSION >= 300
29#include <qprocess.h>
29#include <q3process.h>
3030#else
31#include <qwmatrix.h>
31#include <qmatrix.h>
3232#include <qbitmap.h>
33#include <qaccel.h>
33#include <q3accel.h>
3434#endif
3535
3636#include <qtooltip.h>
4040
4141
4242#include "quax.h"
43//Added by qt3to4:
44#include <QTimerEvent>
45#include <QKeyEvent>
46#include <QLabel>
47#include <QPixmap>
48#include <Q3Frame>
49#include <Q3PopupMenu>
50#include <QMouseEvent>
51#include <QEvent>
52#include <QPaintEvent>
53#include <QWheelEvent>
54#include <QDesktopWidget>
4355
4456
45Quax::Quax() : QWidget(0,0,WStyle_Customize|WStyle_NoBorder|WType_TopLevel) {
57Quax::Quax() : QWidget(0,0,Qt::WStyle_Customize|Qt::WStyle_NoBorder|Qt::WType_TopLevel) {
4658
4759 QPixmap icon=QPixmap(icon_xpm);
4860 setIcon(icon);
4961
5062#ifdef _OS_WIN32_
51 hand_cursor = QCursor(ArrowCursor);
63 hand_cursor = QCursor(Qt::ArrowCursor);
5264#else
5365 // "borrowed" from kcursor.cpp from kdelibs
5466 static const unsigned char HAND_BITS[] = {
9999 setMaximumHeight(150);
100100 setMinimumWidth(150);
101101 setMaximumWidth(150);
102 setBackgroundMode(NoBackground);
102 /// setBackgroundMode(NoBackground);
103103
104104 // set the shape
105105 pix=QPixmap(mag_xpm);
106106 pix_alpha=QPixmap(mag_alpha_xpm);
107 setMask(*pix_alpha.mask());
107 /// setMask(*pix_alpha.mask());
108108#if QT_VERSION > 300
109109 setErasePixmap(pix);
110110#else
113113
114114
115115 pix_cursor.resize(14,14);
116 pixelColorIcon = new QIconSet();
116 pixelColorIcon = new QIcon();
117117 colorStringDecimal = QString("255, 255, 255");
118118 colorStringHexaLower = QString("#ffffff");
119119 colorStringHexaUpper = QString("#FFFFFF");
127127
128128
129129 // build RMB popup menu
130 menu = new QPopupMenu(this);
130 menu = new Q3PopupMenu(this);
131131
132 menuzoom = new QPopupMenu(this);
132 menuzoom = new Q3PopupMenu(this);
133133 menuzoom->setCheckable(true);
134134 for (int i=ZOOM_SCALE_MIN; i<=ZOOM_SCALE_MAX; i++) {
135135 zoomid[i]=menuzoom->insertItem(QObject::tr("1:%1").arg(i),this,SLOT(zoomTo(int)));
139139 menuzoom->insertItem(QPixmap(viewmagin_xpm),QObject::tr("Zoom In"),this,SLOT(zoomIn()),QKeySequence(QObject::tr("+","Zoom In")));
140140 menuzoom->insertItem(QPixmap(viewmagout_xpm),QObject::tr("Zoom Out"),this,SLOT(zoomOut()),QKeySequence(QObject::tr("-","Zoom Out")));
141141#else
142 menuzoom->insertItem(QPixmap(viewmagin_xpm),QObject::tr("Zoom In"),this,SLOT(zoomIn()),QAccel::stringToKey(QObject::tr("+","Zoom In")));
143 menuzoom->insertItem(QPixmap(viewmagout_xpm),QObject::tr("Zoom Out"),this,SLOT(zoomOut()),QAccel::stringToKey(QObject::tr("-","Zoom Out")));
142 menuzoom->insertItem(QPixmap(viewmagin_xpm),QObject::tr("Zoom In"),this,SLOT(zoomIn()),Q3Accel::stringToKey(QObject::tr("+","Zoom In")));
143 menuzoom->insertItem(QPixmap(viewmagout_xpm),QObject::tr("Zoom Out"),this,SLOT(zoomOut()),Q3Accel::stringToKey(QObject::tr("-","Zoom Out")));
144144#endif
145145
146 menulook = new QPopupMenu(this);
146 menulook = new Q3PopupMenu(this);
147147 menulook->setCheckable(true);
148148#if QT_VERSION >= 300
149149 lookid[1]=menulook->insertItem(QObject::tr("North-West"),this,SLOT(rotateNorthWest()),QKeySequence(QObject::tr("U","North-West")));
151151 lookid[2]=menulook->insertItem(QObject::tr("North-East"),this,SLOT(rotateNorthEast()),QKeySequence(QObject::tr("I","North-East")));
152152 lookid[3]=menulook->insertItem(QObject::tr("South-East"),this,SLOT(rotateSouthEast()),QKeySequence(QObject::tr("K","South-East")));
153153#else
154 lookid[1]=menulook->insertItem(QObject::tr("North-West"),this,SLOT(rotateNorthWest()),QAccel::stringToKey(QObject::tr("u","North-West")));
155 lookid[0]=menulook->insertItem(QObject::tr("South-West"),this,SLOT(rotateSouthWest()),QAccel::stringToKey(QObject::tr("j","South-West")));
156 lookid[2]=menulook->insertItem(QObject::tr("North-East"),this,SLOT(rotateNorthEast()),QAccel::stringToKey(QObject::tr("i","North-East")));
157 lookid[3]=menulook->insertItem(QObject::tr("South-East"),this,SLOT(rotateSouthEast()),QAccel::stringToKey(QObject::tr("k","South-East")));
154 lookid[1]=menulook->insertItem(QObject::tr("North-West"),this,SLOT(rotateNorthWest()),Q3Accel::stringToKey(QObject::tr("u","North-West")));
155 lookid[0]=menulook->insertItem(QObject::tr("South-West"),this,SLOT(rotateSouthWest()),Q3Accel::stringToKey(QObject::tr("j","South-West")));
156 lookid[2]=menulook->insertItem(QObject::tr("North-East"),this,SLOT(rotateNorthEast()),Q3Accel::stringToKey(QObject::tr("i","North-East")));
157 lookid[3]=menulook->insertItem(QObject::tr("South-East"),this,SLOT(rotateSouthEast()),Q3Accel::stringToKey(QObject::tr("k","South-East")));
158158#endif
159159 menulook->insertSeparator();
160160#if QT_VERSION >= 300
161161 menulook->insertItem(QPixmap(left_xpm),QObject::tr("Rotate Left"),this,SLOT(rotateLeft()),QKeySequence(QObject::tr("L","Rotate Left")));
162162 menulook->insertItem(QPixmap(right_xpm),QObject::tr("Rotate Right"),this,SLOT(rotateRight()),QKeySequence(QObject::tr("R","Rotate Right")));
163163#else
164 menulook->insertItem(QPixmap(left_xpm),QObject::tr("Rotate Left"),this,SLOT(rotateLeft()),QAccel::stringToKey(QObject::tr("l","Rotate Left")));
165 menulook->insertItem(QPixmap(right_xpm),QObject::tr("Rotate Right"),this,SLOT(rotateRight()),QAccel::stringToKey(QObject::tr("r","Rotate Right")));
164 menulook->insertItem(QPixmap(left_xpm),QObject::tr("Rotate Left"),this,SLOT(rotateLeft()),Q3Accel::stringToKey(QObject::tr("l","Rotate Left")));
165 menulook->insertItem(QPixmap(right_xpm),QObject::tr("Rotate Right"),this,SLOT(rotateRight()),Q3Accel::stringToKey(QObject::tr("r","Rotate Right")));
166166#endif
167167
168 menucolor = new QPopupMenu(this);
168 menucolor = new Q3PopupMenu(this);
169169 colorid[1]=menucolor->insertItem(colorStringDecimal,this,SLOT(copyColor(int)));
170170#if QT_VERSION >= 300
171171 colorid[2]=menucolor->insertItem(colorStringHexaLower,this,SLOT(copyColor(int)),QKeySequence(QObject::tr("Ctrl+C","Copy Color")));
172172#else
173 colorid[2]=menucolor->insertItem(colorStringHexaLower,this,SLOT(copyColor(int)),QAccel::stringToKey(QObject::tr("Ctrl+c","Copy Color")));
173 colorid[2]=menucolor->insertItem(colorStringHexaLower,this,SLOT(copyColor(int)),Q3Accel::stringToKey(QObject::tr("Ctrl+c","Copy Color")));
174174#endif
175175 colorid[3]=menucolor->insertItem(colorStringHexaUpper,this,SLOT(copyColor(int)));
176176
180180#if QT_VERSION >= 300
181181 menu->insertItem(QPixmap(help_xpm),QObject::tr("Help"),this,SLOT(help()),QKeySequence(QObject::tr("H","Help")));
182182#else
183 menu->insertItem(QPixmap(help_xpm),QObject::tr("Help"),this,SLOT(help()),QAccel::stringToKey(QObject::tr("h","Help")));
183 menu->insertItem(QPixmap(help_xpm),QObject::tr("Help"),this,SLOT(help()),Q3Accel::stringToKey(QObject::tr("h","Help")));
184184#endif
185185 menu->insertSeparator();
186186 menu->insertItem(QObject::tr("About Quax"),this,SLOT(about()));
189189#if QT_VERSION >= 300
190190 menu->insertItem(QPixmap(exit_xpm),QObject::tr("Quit"),qApp,SLOT(quit()),QKeySequence(QObject::tr("Q","Quit")));
191191#else
192 menu->insertItem(QPixmap(exit_xpm),QObject::tr("Quit"),qApp,SLOT(quit()),QAccel::stringToKey(QObject::tr("q","Quit")));
192 menu->insertItem(QPixmap(exit_xpm),QObject::tr("Quit"),qApp,SLOT(quit()),Q3Accel::stringToKey(QObject::tr("q","Quit")));
193193#endif
194194
195195 menuzoom->setItemChecked(zoomid[zoom],true);
197197 connect(menu,SIGNAL(aboutToShow()),this,SLOT(updateMenuColor()));
198198
199199 // set the color tooltip
200 colorTip = new QLabel(0,0,WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM);
200 colorTip = new QLabel; /// (0,0,WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM);
201201 colorTip->setMargin(1);
202202 colorTip->setIndent(0);
203 colorTip->setAutoMask(false);
203 /// colorTip->setAutoMask(false);
204204 colorTip->setLineWidth(1);
205205#if QT_VERSION >= 300
206 colorTip->setAlignment(QLabel::AlignAuto | QLabel::AlignTop);
206 colorTip->setAlignment(Qt::AlignLeft | Qt::AlignTop);
207207#else
208208 colorTip->setAlignment(Qt::AlignLeft | Qt::AlignTop);
209209#endif
210 colorTip->setAutoResize(true);
211 colorTip->setFrameStyle(QFrame::Box | QFrame::Plain);
210 /// colorTip->setAutoResize(true);
211 colorTip->setFrameStyle(Q3Frame::Box | Q3Frame::Plain);
212212 colorTip->setPalette(QToolTip::palette());
213213 colorTip->setTextFormat(Qt::RichText);
214214
364364 }
365365 p.end();
366366
367 QWMatrix m;
367 QMatrix m;
368368 m.scale((double)zoom,(double)zoom);
369369 pix_zoom=pix_grab.xForm(m);
370370 repaint(false);
382382 colorStringHexaUpper = colorStringHexaLower.upper();
383383
384384 // make a little pixmap with grabbed color
385 QWMatrix m;
385 QMatrix m;
386386 m.scale((double)14,(double)14);
387387 pix_cursor=pix_grab.xForm(m);
388388}
389389
390390void Quax::displayColorTip() {
391return;
392/*
391393 grabForPixel();
392 QMimeSourceFactory::defaultFactory()->setPixmap("pixel",pix_cursor);
394 Q3MimeSourceFactory::defaultFactory()->setPixmap("pixel",pix_cursor);
393395 colorTip->setText("<qml>&nbsp;<img height=\"14\" width=\"14\" src=\"pixel\">&nbsp;<tt>" + colorStringHexaUpper + "</tt></qml>");
394396
395397 int x_pos, y_pos;
412412 }
413413 colorTip->move(x_pos,y_pos);
414414 if (colorTip->isHidden()) colorTip->show();
415 */
415416}
416417
417418
418419void Quax::mousePressEvent(QMouseEvent *e) {
419420 switch (e->button()) {
420 case LeftButton:
421 case Qt::LeftButton:
421422 if (colorTipShowed) {
422423 copyColor(0);
423424 setCursor(copy_cursor);
428428 dragOffset = QCursor::pos() - QPoint(geometry().left(),geometry().top());
429429 }
430430 break;
431 case RightButton:
431 case Qt::RightButton:
432432 menu->popup(QCursor::pos());
433433 break;
434434 default:
438438
439439void Quax::mouseReleaseEvent(QMouseEvent *e) {
440440 switch (e->button()) {
441 case LeftButton:
441 case Qt::LeftButton:
442442 if (colorTipShowed) {
443443 setCursor(cross_cursor);
444444 } else {
502502
503503
504504 switch (e->key()) {
505 case Key_Left:
505 case Qt::Key_Left:
506506 dist.setX(-1);
507507 break;
508 case Key_Right:
508 case Qt::Key_Right:
509509 dist.setX(1);
510510 break;
511 case Key_Up:
511 case Qt::Key_Up:
512512 dist.setY(-1);
513513 break;
514 case Key_Down:
514 case Qt::Key_Down:
515515 dist.setY(1);
516516 break;
517 case Key_Equal:
517 case Qt::Key_Equal:
518518 zoomIn();
519519 break;
520 case Key_Underscore:
520 case Qt::Key_Underscore:
521521 zoomOut();
522522 break;
523523 default:
524524 e->ignore();
525525 return;
526526 }
527 if (e->state() & ShiftButton) {
527 if (e->state() & Qt::ShiftButton) {
528528 dist *= 10;
529529 }
530530 move(pos()+dist);
536536#else
537537 QString helpApp = "kfmclient";
538538
539 QProcess *proc = new QProcess(this);
539 Q3Process *proc = new Q3Process(this);
540540 proc->addArgument(helpApp);
541541 proc->addArgument("openURL");
542542 proc->addArgument("help:quax");
546546 QObject::tr("<qml>There was an error executing <b>%1</b> application. "
547547 "Please check your KDE installation. You may try to open an <b>xterm</b> "
548548 "window and run <tt>man quax</tt> from there.</qml>").arg(helpApp),
549 QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
549 QMessageBox::Ok, Qt::NoButton, Qt::NoButton);
550550 }
551551#endif
552552#endif
647647}
648648
649649void Quax::rotate(int pos) {
650 QWMatrix m;
650 QMatrix m;
651651 m.rotate(pos*90.0);
652652 setBackgroundPixmap(pix.xForm(m));
653 setMask(*(pix_alpha.xForm(m)).mask());
653 /// setMask(*(pix_alpha.xForm(m)).mask());
654654}
655655
656656
678678void Quax::updateMenuColor() {
679679 grabForPixel();
680680#if QT_VERSION > 300
681 pixelColorIcon->clearGenerated();
681 ///pixelColorIcon->clearGenerated();
682682#endif
683 pixelColorIcon->reset(pix_cursor,QIconSet::Small);
683 pixelColorIcon->reset(pix_cursor,QIcon::Small);
684684
685 menu->changeItem(colorid[0],QIconSet(pix_cursor),QObject::tr("Copy Color"));
685 menu->changeItem(colorid[0],QIcon(pix_cursor),QObject::tr("Copy Color"));
686686 menucolor->changeItem(colorid[1],colorStringDecimal);
687687 menucolor->changeItem(colorid[2],colorStringHexaLower);
688688 menucolor->changeItem(colorid[3],colorStringHexaUpper);
src/quax.h
(13 / 6)
  
2525#include <qpainter.h>
2626#include <qmap.h>
2727
28#include <qiconset.h>
28#include <qicon.h>
2929#include <qwidget.h>
3030#include <qlabel.h>
3131#include <qmessagebox.h>
32#include <qapp.h>
33#include <qwmatrix.h>
34#include <qpopupmenu.h>
3532#include <qapplication.h>
33#include <qmatrix.h>
34#include <q3popupmenu.h>
35#include <qapplication.h>
36//Added by qt3to4:
37#include <QWheelEvent>
38#include <QEvent>
39#include <QMouseEvent>
40#include <QTimerEvent>
41#include <QKeyEvent>
42#include <QPaintEvent>
3643
3744#define PIX_CURSOR_SCALE 10
3845#define ZOOM_SCALE_MIN 2
133133 QString colorStringDecimal, ///< the current color under mouse as decimals comma seperated
134134 colorStringHexaLower, ///< the current color under mouse as web RGB with lower hexadecimals
135135 colorStringHexaUpper; ///< the current color under mouse as web RGB with upper hexadecimals
136 QIconSet *pixelColorIcon; ///< The icon set which is used in QML content from @ref colorTip
136 QIcon *pixelColorIcon; ///< The icon set which is used in QML content from @ref colorTip
137137 QLabel *colorTip; ///< The tool tip for displaying current color under mouse
138 QPopupMenu *menu, ///< The main menu of Quax
138 Q3PopupMenu *menu, ///< The main menu of Quax
139139 *menuzoom, ///< Menu for zoom levels and zoom in and zoom out items
140140 *menulook, ///< The "Look at" menu
141141 *menucolor; ///< Menu for coying textual representation into clipboard
src/quax.pro
(26 / 0)
  
1######################################################################
2# Automatically generated by qmake (2.01a) Tue Aug 25 17:35:31 2009
3######################################################################
4
5TEMPLATE = app
6TARGET =
7DEPENDPATH += .
8INCLUDEPATH += .
9
10# Input
11HEADERS += quax.h \
12 ../config.h \
13 mag.xpm \
14 mag-alpha.xpm \
15 exit.xpm \
16 viewmag.xpm \
17 viewmagin.xpm \
18 viewmagout.xpm \
19 look.xpm \
20 left.xpm \
21 right.xpm \
22 icon.xpm \
23 help.xpm
24SOURCES += main.cpp quax.cpp
25#The following line was inserted by qt3to4
26QT += qt3support

Comments

Add a new comment:

Login or create an account to post a comment

Add your comment