From fa4290ef3e8c396b886b03fbf213352c68647550 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sat, 30 Aug 2008 19:07:37 +0000 Subject: [PATCH] disable font manip. --- build_num | 2 +- doc/ChangeLog | 4 ++++ src/gui/instDialog.cpp | 48 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/build_num b/build_num index d15a6c665..d58ae3512 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 498 +#define BUILD_NUM 499 diff --git a/doc/ChangeLog b/doc/ChangeLog index f217d8218..ebba20ae6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,9 @@ 2008-08-30 Vadim Kurland + * instDialog.cpp (instDialog::fillCompileSelectList): disabled + font manipulations in install/compile dialog, it did not work + right on windows + * InterfaceDialog: layout adjustment for bug #2078671: "fwbuilder 3.0.0 build 487 - add/edit interface". Layout did not work quite right with QT4 themes Plastique and Oxygen with default font size diff --git a/src/gui/instDialog.cpp b/src/gui/instDialog.cpp index d4e6d5f60..e8fe4b738 100644 --- a/src/gui/instDialog.cpp +++ b/src/gui/instDialog.cpp @@ -202,8 +202,10 @@ instDialog::~instDialog() void setSuccessState(QTreeWidgetItem *item) { +// disable font manipulation, it does not work right on windows +#if 0 QBrush b = item->foreground(1); -// b.setColor(Qt::green); + b.setColor(Qt::green); item->setForeground(1,b); item->setForeground(0,b); @@ -211,10 +213,13 @@ void setSuccessState(QTreeWidgetItem *item) f.setBold(false); item->setFont(1,f); item->setFont(0,f); +#endif } void setFailureState(QTreeWidgetItem *item) { +// disable font manipulation, it does not work right on windows +#if 0 QBrush b = item->foreground(1); b.setColor(Qt::red); item->setForeground(1,b); @@ -224,22 +229,29 @@ void setFailureState(QTreeWidgetItem *item) f.setBold(false); item->setFont(1,f); item->setFont(0,f); +#endif } void setErrorState(QTreeWidgetItem *item) { +// disable font manipulation, it does not work right on windows +#if 0 QFont f = item->font(1); f.setBold(false); item->setFont(1,f); item->setFont(0,f); +#endif } void setInProcessState(QTreeWidgetItem *item) { +// disable font manipulation, it does not work right on windows +#if 0 QFont f = item->font(1); f.setBold(true); item->setFont(1,f); item->setFont(0,f); +#endif } void instDialog::nextClicked() @@ -514,7 +526,15 @@ void instDialog::fillCompileSelectList() temp.setColor(QPalette::Window, Qt::white); l->setPalette(temp); - if (lm>lc && lm>li) {font=l->font();font.setBold(true);l->setFont(font);} +// disable font manipulation, it does not work right on windows +#if 0 + if (lm>lc && lm>li) { + font=l->font(); + font.setBold(true); + l->setFont(font); + } +#endif + l->setText((lm)?dt.toString():QString("---")); m_dialog->selectTable->setCellWidget(row,4,l); @@ -523,7 +543,17 @@ void instDialog::fillCompileSelectList() temp = l->palette(); temp.setColor(QPalette::Window, Qt::white); l->setPalette(temp); - if (lc>lm && lc>li) {font=l->font();font.setBold(true);l->setFont(font);} + +// disable font manipulation, it does not work right on windows +#if 0 + if (lc>lm && lc>li) + { + font=l->font(); + font.setBold(true); + l->setFont(font); + } +#endif + l->setText((lm)?dt.toString():QString("---")); m_dialog->selectTable->setCellWidget(row,5,l); @@ -532,7 +562,17 @@ void instDialog::fillCompileSelectList() temp = l->palette(); temp.setColor(QPalette::Window, Qt::white); l->setPalette(temp); - if (li>lc && li>lm) {font=l->font();font.setBold(true);l->setFont(font);} + +// disable font manipulation, it does not work right on windows +#if 0 + if (li>lc && li>lm) + { + font=l->font(); + font.setBold(true); + l->setFont(font); + } +#endif + l->setText((lm)?dt.toString():QString("---")); m_dialog->selectTable->setCellWidget(row,6,l);