From 7e43faf243da067865e7d0640cde448bb55ca7d6 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Thu, 9 Dec 2010 01:08:46 +0000 Subject: Ported the final Qt3 methods. Turned off Qt3Support. --- muse2/CMakeLists.txt | 28 ---------------------------- muse2/ChangeLog | 1 + muse2/muse/arranger/tlist.cpp | 21 ++++++++++++++------- muse2/muse/arranger/trackinfo.cpp | 8 ++++++-- muse2/muse/globals.h | 2 -- muse2/muse/mixer/meter.cpp | 11 ++++++++--- muse2/muse/widgets/action.h | 1 - 7 files changed, 29 insertions(+), 43 deletions(-) (limited to 'muse2') diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt index 094f5ec3..d957e21c 100644 --- a/muse2/CMakeLists.txt +++ b/muse2/CMakeLists.txt @@ -93,31 +93,6 @@ else (APPLE) endif (APPLE) -## -## look for Qt3 -## - -# set(QT_MT_REQUIRED TRUE) -# -# find_package(Qt3) -# # IF(EXISTS "${CMAKE_ROOT}/Modules/FindQt3.cmake") -# # include ( "${CMAKE_ROOT}/Modules/FindQt3.cmake" ) -# # else (EXISTS "${CMAKE_ROOT}/Modules/FindQt3.cmake") -# # message(FATAL_ERROR "Fatal error: cmake module FindQt3 required.\n") -# #endif (EXISTS "${CMAKE_ROOT}/Modules/FindQt3.cmake") -# -# if (NOT QT_FOUND) -# message(FATAL_ERROR "Fatal error: QT (version >= 3.2.0) required.\n" -# # "Cmake tries to detect QT4 by searching for 'qmake' in your PATH\n" -# # "If you have QT4 installed, make sure qmake is found in your PATH." -# ) -# endif (NOT QT_FOUND) -# -# set (MUSE_QT_WRAP_CPP QT_WRAP_CPP) -# set (MUSE_QT_WRAP_UI QT_WRAP_UI) - -# include(${QT_USE_FILE}) - ## ## look for Qt4 ## @@ -128,9 +103,6 @@ set(QT_USE_QTDESIGNER TRUE) set(QT_USE_QTNSPLUGIN TRUE) set(QT_USE_QTSVG TRUE) -## QT3 Compatibility support required, for now. -set(QT_USE_QT3SUPPORT TRUE) - find_package(Qt4) if (NOT QT4_FOUND) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index fbe2488a..1d9d5003 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,5 +1,6 @@ 08.12.2010: - Ported many more Qt3 methods to Qt4. (Orcan) + - Turned off Qt3Support. Muse2 is now a pure Qt4 application. (Orcan) 07.12.2010: - Ported rack. TODO: Drag and drop needs a hand. It's not working. (Orcan) - Converted various Qt3 support methods to Qt4 in many files. (Orcan) diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 729e318f..0360be86 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -109,8 +109,11 @@ void TList::paintEvent(QPaintEvent* ev) { if (!pmValid) paint(ev->rect()); - /* Orcan - fixme */ - bitBlt(this, ev->rect().topLeft(), &pm, ev->rect(), true); //CopyROP, true); ddskrjo + // Orcan - check + //bitBlt(this, ev->rect().topLeft(), &pm, ev->rect(), true); //CopyROP, true); ddskrjo + QPainter p; + p.begin(this); + p.drawImage(ev->rect().topLeft(), pm.toImage(), ev->rect()); } //--------------------------------------------------------- @@ -1399,7 +1402,9 @@ void TList::setYPos(int y) int h = height(); QRect r; //printf("TList::setYPos y:%d delta:%d w:%d h:%d\n", y, delta, w, h); - + QPainter p; + p.begin(&pm); + if (delta >= h || delta <= -h) { //printf("TList::setYPos delta >= h || delta <= -h\n"); @@ -1407,14 +1412,16 @@ void TList::setYPos(int y) } else if (delta < 0) { // shift up //printf("TList::setYPos delta < 0 : shift up\n"); - /* Orcan - fixme */ - bitBlt(&pm, 0, 0, &pm, 0, -delta, w, h + delta, true); //CopyROP, true); ddskrjo + // Orcan - check + //bitBlt(&pm, 0, 0, &pm, 0, -delta, w, h + delta, true); //CopyROP, true); ddskrjo + p.drawImage(0, 0, pm.toImage(), 0, -delta, w, h + delta); r = QRect(0, h + delta, w, -delta); } else { // shift down //printf("TList::setYPos delta !< 0 : shift down\n"); - /* Orcan - fixme */ - bitBlt(&pm, 0, delta, &pm, 0, 0, w, h-delta, true); //CopyROP, true); ddskrjo + // Orcan - check + //bitBlt(&pm, 0, delta, &pm, 0, 0, w, h-delta, true); //CopyROP, true); ddskrjo + p.drawImage(0, delta, pm.toImage(), 0, 0, w, h-delta); // NOTE: June 2 2010: On my machine with an old NV V8200 + prop drivers (curr 96.43.11), // this is a problem. There is severe graphical corruption. // Not just here but several other windows (ex. ladspa browser), diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp index 6ca32a40..13197f50 100644 --- a/muse2/muse/arranger/trackinfo.cpp +++ b/muse2/muse/arranger/trackinfo.cpp @@ -347,8 +347,12 @@ void Arranger::genTrackInfo(QWidget* parent) QPixmap *noInfoPix = new QPixmap(160, 1000); //muse_leftside_logo_xpm); const QPixmap *logo = new QPixmap(*museLeftSideLogo); noInfoPix->fill(noTrackInfo->palette().color(QPalette::Window) ); - /* Orcan - fixme */ - copyBlt(noInfoPix, 10, 0, logo, 0,0, logo->width(), logo->height()); + // Orcan - check + //copyBlt(noInfoPix, 10, 0, logo, 0,0, logo->width(), logo->height()); + QPainter p; + p.begin(noInfoPix); + p.drawImage(10, 0, logo->toImage(), 0,0, logo->width(), logo->height()); + //noTrackInfo->setPaletteBackgroundPixmap(*noInfoPix); QPalette palette; palette.setBrush(noTrackInfo->backgroundRole(), QBrush(*noInfoPix)); diff --git a/muse2/muse/globals.h b/muse2/muse/globals.h index 9d45ee65..1de54abf 100644 --- a/muse2/muse/globals.h +++ b/muse2/muse/globals.h @@ -11,8 +11,6 @@ #include -#include - #include "value.h" #include "mtc.h" #include "route.h" diff --git a/muse2/muse/mixer/meter.cpp b/muse2/muse/mixer/meter.cpp index a25aef95..deb79d06 100644 --- a/muse2/muse/mixer/meter.cpp +++ b/muse2/muse/mixer/meter.cpp @@ -116,9 +116,14 @@ void Meter::paintEvent(QPaintEvent*) else yv = val == 0 ? h : int(((maxScale - val) * h)/range); - // ORCAN - FIXME */ - bitBlt(this, fw, fw, &bgPm, 0, 0, -1, yv, true); // CopyROP, true); ddskrjo - bitBlt(this, fw, fw+yv, &fgPm, 0, yv, -1, h-yv, true); //CopyROP, true); ddskrjo + // Orcan - check + //void bitBlt ( QImage * dst, int dx, int dy, const QImage * src, int sx = 0, int sy = 0, int sw = -1, int sh = -1, Qt::ImageConversionFlags flags = Qt::AutoColor ) + + //bitBlt(this, fw, fw, &bgPm, 0, 0, -1, yv, true); // CopyROP, true); ddskrjo + //bitBlt(this, fw, fw+yv, &fgPm, 0, yv, -1, h-yv, true); //CopyROP, true); ddskrjo + + p.drawImage(fw, fw, bgPm.toImage(), 0, 0, -1, yv ); + p.drawImage(fw, fw+yv, fgPm.toImage(), 0, yv, -1, h-yv); int ymax; if(mtype == DBMeter) diff --git a/muse2/muse/widgets/action.h b/muse2/muse/widgets/action.h index 32ec96ce..7fa040c4 100644 --- a/muse2/muse/widgets/action.h +++ b/muse2/muse/widgets/action.h @@ -8,7 +8,6 @@ #ifndef __ACTION_H__ #define __ACTION_H__ -//#include #include //--------------------------------------------------------- -- cgit v1.2.3