From 76af109659d866291bf6318ef7d30b4b767a2822 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 23 Feb 2009 16:25:53 +0100 Subject: [PATCH 1/5] Fixes: Resolve --- src/plugins/coreplugin/manhattanstyle.cpp | 78 +++++++++++++---------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 2bd86a68888..629b20f0fb4 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -205,7 +205,7 @@ QSize ManhattanStyle::sizeFromContents(ContentsType type, const QStyleOption *op if (type == CT_Splitter && widget && widget->property("minisplitter").toBool()) return QSize(1, 1); else if (type == CT_ComboBox && panelWidget(widget)) - newSize += QSize(10, 0); + newSize += QSize(14, 0); return newSize; } @@ -503,7 +503,7 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption shade = QColor(0, 0, 0, 50); #ifndef Q_WS_MAC else if (option->state & State_MouseOver) - shade = QColor(255, 255, 255, 10); + shade = QColor(255, 255, 255, 12); #endif else if (option->state & State_On) shade = QColor(0, 0, 0, 50); @@ -517,14 +517,11 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption painter->drawLine(rect.topRight(), rect.bottomRight()); painter->drawLine(rect.bottomLeft(), rect.bottomRight()); } - #ifndef Q_WS_MAC - else if (option->state & State_Enabled && - option->state & State_MouseOver) { - QColor lighter(255, 255, 255, 35); + else if (option->state & State_Enabled && + option->state & State_MouseOver) { + QColor lighter(255, 255, 255, 37); painter->fillRect(rect, lighter); - painter->drawLine(rect.topRight(), rect.bottomRight()); } -#endif } } break; @@ -668,11 +665,7 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption imagePainter.translate(sx + bsx, sy + bsy); if (!(option->state & State_Enabled)) { - imagePainter.translate(1, 1); - imagePainter.setBrush(option->palette.light().color()); - imagePainter.setPen(option->palette.light().color()); - imagePainter.drawPolygon(a); - imagePainter.translate(-1, -1); + QColor foreGround(150, 150, 150, 150); imagePainter.setBrush(option->palette.mid().color()); imagePainter.setPen(option->palette.mid().color()); } else { @@ -779,18 +772,19 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt editRect.translate(-4 - cb->iconSize.width(), 0); else editRect.translate(cb->iconSize.width() + 4, 0); + + // Reserve some space for the down-arrow + editRect.adjust(0, 0, -13, 0); } customPal.setBrush(QPalette::All, QPalette::ButtonText, QColor(0, 0, 0, 70)); - // Reserve some space for the down-arrow - QRect rect = editRect.adjusted(0, 0, -8, 0); - QString text = option->fontMetrics.elidedText(cb->currentText, Qt::ElideRight, rect.width()); - drawItemText(painter, rect.translated(0, 1), + QString text = option->fontMetrics.elidedText(cb->currentText, Qt::ElideRight, editRect.width()); + drawItemText(painter, editRect.translated(0, 1), visualAlignment(option->direction, Qt::AlignLeft | Qt::AlignVCenter), customPal, cb->state & State_Enabled, text, QPalette::ButtonText); customPal.setBrush(QPalette::All, QPalette::ButtonText, StyleHelper::panelTextColor()); - drawItemText(painter, rect, + drawItemText(painter, editRect, visualAlignment(option->direction, Qt::AlignLeft | Qt::AlignVCenter), customPal, cb->state & State_Enabled, text, QPalette::ButtonText); } else { @@ -1013,40 +1007,56 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti break; case CC_ComboBox: - { + if (const QStyleOptionComboBox *cb = qstyleoption_cast(option)) { painter->save(); + bool isEmpty = cb->currentText.isEmpty() && cb->currentIcon.isNull(); + bool reverse = option->direction == Qt::RightToLeft; // Draw tool button QLinearGradient grad(option->rect.topRight(), option->rect.bottomRight()); - grad.setColorAt(0, Qt::transparent); - grad.setColorAt(0.4, QColor(255, 255, 255, 30)); - grad.setColorAt(1, Qt::transparent); + grad.setColorAt(0, QColor(255, 255, 255, 20)); + grad.setColorAt(0.4, QColor(255, 255, 255, 60)); + grad.setColorAt(0.7, QColor(255, 255, 255, 50)); + grad.setColorAt(1, QColor(255, 255, 255, 40)); painter->setPen(QPen(grad, 0)); painter->drawLine(rect.topRight(), rect.bottomRight()); - grad.setColorAt(0, Qt::transparent); - grad.setColorAt(0.4, QColor(0, 0, 0, 30)); - grad.setColorAt(1, Qt::transparent); + grad.setColorAt(0, QColor(0, 0, 0, 20)); + grad.setColorAt(0.4, QColor(0, 0, 0, 70)); + grad.setColorAt(0.7, QColor(0, 0, 0, 70)); + grad.setColorAt(1, QColor(0, 0, 0, 40)); painter->setPen(QPen(grad, 0)); - painter->drawLine(rect.topRight() - QPoint(1,0), rect.bottomRight() - QPoint(1,0)); - drawPrimitive(PE_PanelButtonTool, option, painter, widget); + if (!reverse) + painter->drawLine(rect.topRight() - QPoint(1,0), rect.bottomRight() - QPoint(1,0)); + else + painter->drawLine(rect.topLeft(), rect.bottomLeft()); + QStyleOption toolbutton = *option; + toolbutton.rect.adjust(0, 0, -2, 0); + if (isEmpty) + toolbutton.state &= ~(State_Enabled | State_Sunken); + drawPrimitive(PE_PanelButtonTool, &toolbutton, painter, widget); // Draw arrow int menuButtonWidth = 12; - bool reverse = option->direction == Qt::RightToLeft; int left = !reverse ? rect.right() - menuButtonWidth : rect.left(); int right = !reverse ? rect.right() : rect.left() + menuButtonWidth; - QRect arrowRect((left + right) / 2 - 5, rect.center().y() - 3, 9, 9); + QRect arrowRect((left + right) / 2 + (reverse ? 6 : -6), rect.center().y() - 3, 9, 9); if (option->state & State_On) arrowRect.translate(d->style->pixelMetric(PM_ButtonShiftHorizontal, option, widget), d->style->pixelMetric(PM_ButtonShiftVertical, option, widget)); + QStyleOption arrowOpt = *option; arrowOpt.rect = arrowRect; - QPalette pal = option->palette; - pal.setBrush(QPalette::All, QPalette::ButtonText, StyleHelper::panelTextColor()); - arrowOpt.palette = pal; - - drawPrimitive(PE_IndicatorArrowDown, &arrowOpt, painter, widget); + if (isEmpty) + arrowOpt.state &= ~(State_Enabled | State_Sunken); + if (styleHint(SH_ComboBox_Popup, option, widget)) { + arrowOpt.rect.translate(0, -3); + drawPrimitive(PE_IndicatorArrowUp, &arrowOpt, painter, widget); + arrowOpt.rect.translate(0, 6); + drawPrimitive(PE_IndicatorArrowDown, &arrowOpt, painter, widget); + } else { + drawPrimitive(PE_IndicatorArrowDown, &arrowOpt, painter, widget); + } painter->restore(); } break; From 512c5a062d234c912412405d5abdcab139614608 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Mon, 23 Feb 2009 17:11:41 +0100 Subject: [PATCH 2/5] Fixes: Clean up manhattan toolbuttons Details: Simplified painting a bit. Cleaner lines. --- src/plugins/coreplugin/manhattanstyle.cpp | 27 ++++++++--------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 629b20f0fb4..92952d9d894 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -498,24 +498,14 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption QColor shadow(0, 0, 0, 30); painter->setPen(shadow); if (pressed) { - QColor shade(0, 0, 0, 50); - if (option->state & State_Sunken) - shade = QColor(0, 0, 0, 50); -#ifndef Q_WS_MAC - else if (option->state & State_MouseOver) - shade = QColor(255, 255, 255, 12); -#endif - else if (option->state & State_On) - shade = QColor(0, 0, 0, 50); - else - shade = QColor(0, 0, 0, 0); - painter->fillRect(rect.adjusted(1, 1, -1, -1), shade); - painter->drawLine(rect.topLeft(), rect.topRight()); + QColor shade(0, 0, 0, 40); + painter->fillRect(rect, shade); + painter->drawLine(rect.topLeft() + QPoint(1, 0), rect.topRight() - QPoint(1, 0)); painter->drawLine(rect.topLeft(), rect.bottomLeft()); + painter->drawLine(rect.topRight(), rect.bottomRight()); + // painter->drawLine(rect.bottomLeft() + QPoint(1, 0), rect.bottomRight() - QPoint(1, 0)); QColor highlight(255, 255, 255, 30); painter->setPen(highlight); - painter->drawLine(rect.topRight(), rect.bottomRight()); - painter->drawLine(rect.bottomLeft(), rect.bottomRight()); } else if (option->state & State_Enabled && option->state & State_MouseOver) { @@ -1020,7 +1010,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti grad.setColorAt(1, QColor(255, 255, 255, 40)); painter->setPen(QPen(grad, 0)); painter->drawLine(rect.topRight(), rect.bottomRight()); - grad.setColorAt(0, QColor(0, 0, 0, 20)); + grad.setColorAt(0, QColor(0, 0, 0, 30)); grad.setColorAt(0.4, QColor(0, 0, 0, 70)); grad.setColorAt(0.7, QColor(0, 0, 0, 70)); grad.setColorAt(1, QColor(0, 0, 0, 40)); @@ -1030,11 +1020,12 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti else painter->drawLine(rect.topLeft(), rect.bottomLeft()); QStyleOption toolbutton = *option; - toolbutton.rect.adjust(0, 0, -2, 0); if (isEmpty) toolbutton.state &= ~(State_Enabled | State_Sunken); + painter->save(); + painter->setClipRect(toolbutton.rect.adjusted(0, 0, -2, 0)); drawPrimitive(PE_PanelButtonTool, &toolbutton, painter, widget); - + painter->restore(); // Draw arrow int menuButtonWidth = 12; int left = !reverse ? rect.right() - menuButtonWidth : rect.left(); From f7ed313f7a667c669b4d73a2e238c29de51513cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Mon, 23 Feb 2009 18:45:57 +0100 Subject: [PATCH 3/5] Upgrade qtlibspatcher to patch Qt 4.5.0 Was failing because it still tried to patch Qt 4.4.3 --- src/tools/qtlibspatcher/qtlibspatchermain.cpp | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/tools/qtlibspatcher/qtlibspatchermain.cpp b/src/tools/qtlibspatcher/qtlibspatchermain.cpp index 56c7aeb104d..f1780973cf4 100644 --- a/src/tools/qtlibspatcher/qtlibspatchermain.cpp +++ b/src/tools/qtlibspatcher/qtlibspatchermain.cpp @@ -47,8 +47,8 @@ const char * const oldInstallBase = QT_INSTALL_DIR; const char * const oldSourceBase = QT_INSTALL_DIR; #else - const char * const oldSourceBase = "/home/berlin/dev/qt-4.4.3-temp/qt-x11-opensource-src-4.4.3"; - const char * const oldInstallBase = "/home/berlin/dev/qt-4.4.3-shipping/qt"; + const char * const oldSourceBase = "/home/berlin/dev/qt-4.5.0-temp/qt-x11-opensource-src-4.5.0"; + const char * const oldInstallBase = "/home/berlin/dev/qt-4.5.0-shipping/qt"; #endif @@ -437,24 +437,24 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath) {"/examples/script/defaultprototypes/defaultprototypes.debug", "/examples/script/defaultprototypes"}, {"/examples/script/qscript/qscript.debug", "/examples/script/qscript"}, {"/examples/script/tetrix/tetrix.debug", "/examples/script/tetrix"}, - {"/lib/libQtTest.so.4.4.3.debug", "/lib"}, - {"/lib/libQtDesignerComponents.so.4.4.3.debug", "/lib"}, - {"/lib/libQtScript.so.4.4.3.debug", "/lib"}, - {"/lib/libQtDesigner.so.4.4.3.debug", "/lib"}, - {"/lib/libQtGui.so.4.4.3.debug", "/lib"}, - {"/lib/libQtSvg.so.4.4.3.debug", "/lib"}, - {"/lib/libQtXml.so.4.4.3.debug", "/lib"}, - {"/lib/libQtCLucene.so.4.4.3.debug", "/lib"}, - {"/lib/libQtCore.so.4.4.3.debug", "/lib"}, - {"/lib/libQtDBus.so.4.4.3.debug", "/lib"}, - {"/lib/libQtXmlPatterns.so.4.4.3.debug", "/lib"}, - {"/lib/libQtHelp.so.4.4.3.debug", "/lib"}, - {"/lib/libQtSql.so.4.4.3.debug", "/lib"}, - {"/lib/libQtNetwork.so.4.4.3.debug", "/lib"}, - {"/lib/libQtOpenGL.so.4.4.3.debug", "/lib"}, - {"/lib/libQt3Support.so.4.4.3.debug", "/lib"}, - {"/lib/libQtAssistantClient.so.4.4.3.debug", "/lib"}, - {"/lib/libQtWebKit.so.4.4.3.debug", "/lib"}, + {"/lib/libQtTest.so.4.5.0.debug", "/lib"}, + {"/lib/libQtDesignerComponents.so.4.5.0.debug", "/lib"}, + {"/lib/libQtScript.so.4.5.0.debug", "/lib"}, + {"/lib/libQtDesigner.so.4.5.0.debug", "/lib"}, + {"/lib/libQtGui.so.4.5.0.debug", "/lib"}, + {"/lib/libQtSvg.so.4.5.0.debug", "/lib"}, + {"/lib/libQtXml.so.4.5.0.debug", "/lib"}, + {"/lib/libQtCLucene.so.4.5.0.debug", "/lib"}, + {"/lib/libQtCore.so.4.5.0.debug", "/lib"}, + {"/lib/libQtDBus.so.4.5.0.debug", "/lib"}, + {"/lib/libQtXmlPatterns.so.4.5.0.debug", "/lib"}, + {"/lib/libQtHelp.so.4.5.0.debug", "/lib"}, + {"/lib/libQtSql.so.4.5.0.debug", "/lib"}, + {"/lib/libQtNetwork.so.4.5.0.debug", "/lib"}, + {"/lib/libQtOpenGL.so.4.5.0.debug", "/lib"}, + {"/lib/libQt3Support.so.4.5.0.debug", "/lib"}, + {"/lib/libQtAssistantClient.so.4.5.0.debug", "/lib"}, + {"/lib/libQtWebKit.so.4.5.0.debug", "/lib"}, {"/demos/spreadsheet/spreadsheet.debug", "/demos/spreadsheet"}, {"/demos/composition/composition.debug", "/demos/composition"}, {"/demos/gradients/gradients.debug", "/demos/gradients"}, @@ -533,24 +533,24 @@ bool patchDebugLibrariesWithQtPath(const char *baseQtPath) {"/examples/script/calculator/calculator.debug", "/tools/designer/src/uitools"}, {"/examples/script/tetrix/tetrix.debug", "/tools/designer/src/uitools"}, - {"/lib/libQtTest.so.4.4.3.debug", "/src/testlib"}, - {"/lib/libQtDesignerComponents.so.4.4.3.debug", "/tools/designer/src/components"}, - {"/lib/libQtScript.so.4.4.3.debug", "/src/script"}, - {"/lib/libQtDesigner.so.4.4.3.debug", "/tools/designer/src/lib"}, - {"/lib/libQtGui.so.4.4.3.debug", "/src/gui"}, - {"/lib/libQtSvg.so.4.4.3.debug", "/src/svg"}, - {"/lib/libQtXml.so.4.4.3.debug", "/src/xml"}, - {"/lib/libQtCLucene.so.4.4.3.debug", "/tools/assistant/lib/fulltextsearch"}, - {"/lib/libQtCore.so.4.4.3.debug", "/src/corelib"}, - {"/lib/libQtDBus.so.4.4.3.debug", "/src/dbus"}, - {"/lib/libQtXmlPatterns.so.4.4.3.debug", "/src/xmlpatterns"}, - {"/lib/libQtHelp.so.4.4.3.debug", "/tools/assistant/lib"}, - {"/lib/libQtSql.so.4.4.3.debug", "/src/sql"}, - {"/lib/libQtNetwork.so.4.4.3.debug", "/src/network"}, - {"/lib/libQtOpenGL.so.4.4.3.debug", "/src/opengl"}, - {"/lib/libQt3Support.so.4.4.3.debug", "/src/qt3support"}, - {"/lib/libQtAssistantClient.so.4.4.3.debug", "/tools/assistant/compat/lib"}, - {"/lib/libQtWebKit.so.4.4.3.debug", "/src/3rdparty/webkit/WebCore"}, + {"/lib/libQtTest.so.4.5.0.debug", "/src/testlib"}, + {"/lib/libQtDesignerComponents.so.4.5.0.debug", "/tools/designer/src/components"}, + {"/lib/libQtScript.so.4.5.0.debug", "/src/script"}, + {"/lib/libQtDesigner.so.4.5.0.debug", "/tools/designer/src/lib"}, + {"/lib/libQtGui.so.4.5.0.debug", "/src/gui"}, + {"/lib/libQtSvg.so.4.5.0.debug", "/src/svg"}, + {"/lib/libQtXml.so.4.5.0.debug", "/src/xml"}, + {"/lib/libQtCLucene.so.4.5.0.debug", "/tools/assistant/lib/fulltextsearch"}, + {"/lib/libQtCore.so.4.5.0.debug", "/src/corelib"}, + {"/lib/libQtDBus.so.4.5.0.debug", "/src/dbus"}, + {"/lib/libQtXmlPatterns.so.4.5.0.debug", "/src/xmlpatterns"}, + {"/lib/libQtHelp.so.4.5.0.debug", "/tools/assistant/lib"}, + {"/lib/libQtSql.so.4.5.0.debug", "/src/sql"}, + {"/lib/libQtNetwork.so.4.5.0.debug", "/src/network"}, + {"/lib/libQtOpenGL.so.4.5.0.debug", "/src/opengl"}, + {"/lib/libQt3Support.so.4.5.0.debug", "/src/qt3support"}, + {"/lib/libQtAssistantClient.so.4.5.0.debug", "/tools/assistant/compat/lib"}, + {"/lib/libQtWebKit.so.4.5.0.debug", "/src/3rdparty/webkit/WebCore"}, {"/demos/composition/composition.debug", "/demos/shared"}, {"/demos/gradients/gradients.debug", "/demos/shared"}, From e55e1a596c818758c97703fd5ec3072831576f69 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 23 Feb 2009 21:15:32 +0100 Subject: [PATCH 4/5] make the testcase output some html to check for overquoting --- tests/manual/gdbdebugger/simple/app.cpp | 5 ++++- tests/manual/gdbdebugger/simple/app/app.pro | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/manual/gdbdebugger/simple/app.cpp b/tests/manual/gdbdebugger/simple/app.cpp index 76eadf2d9fd..2a605e26a20 100644 --- a/tests/manual/gdbdebugger/simple/app.cpp +++ b/tests/manual/gdbdebugger/simple/app.cpp @@ -215,14 +215,17 @@ void testIO() qDebug() << "qDebug() 1"; qDebug() << "qDebug() 2"; qDebug() << "qDebug() 3"; + qDebug() << "qDebug "; std::cout << "std::cout @@ 1" << std::endl; std::cout << "std::cout @@ 2\n"; std::cout << "std::cout @@ 3" << std::endl; + std::cout << "std::cout \n"; std::cerr << "std::cerr 1\n"; std::cerr << "std::cerr 2\n"; std::cerr << "std::cerr 3\n"; + std::cerr << "std::cerr \n"; } void testQLinkedList() @@ -961,7 +964,7 @@ void testHidden() int main(int argc, char *argv[]) { - //testIO(); + testIO(); testHidden(); testArray(); diff --git a/tests/manual/gdbdebugger/simple/app/app.pro b/tests/manual/gdbdebugger/simple/app/app.pro index bf168bab106..2210857b6a2 100644 --- a/tests/manual/gdbdebugger/simple/app/app.pro +++ b/tests/manual/gdbdebugger/simple/app/app.pro @@ -7,3 +7,5 @@ DESTDIR = .. # Input SOURCES += ../app.cpp QT += network + +message("this says ") From c0f2f81c6817a6a1639d27d15b8b58f64b848e5e Mon Sep 17 00:00:00 2001 From: Berlin Date: Tue, 24 Feb 2009 09:58:59 +0100 Subject: [PATCH 5/5] Fixed qtlibspatcher wrapper script to pass on parameters Done with hjk --- src/tools/qtlibspatcher/qtlibspatcher.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/qtlibspatcher/qtlibspatcher.sh b/src/tools/qtlibspatcher/qtlibspatcher.sh index 3f04fafb101..91fea94318f 100755 --- a/src/tools/qtlibspatcher/qtlibspatcher.sh +++ b/src/tools/qtlibspatcher/qtlibspatcher.sh @@ -1,2 +1,2 @@ -#!/bin/sh -LD_LIBRARY_PATH=`cd .. && pwd`/lib ./qtlibspatcher +#!/bin/bash +LD_LIBRARY_PATH=`cd .. && pwd`/lib ./qtlibspatcher "$@"