diff options
Diffstat (limited to 'examples/widgets')
-rw-r--r-- | examples/widgets/desktop/systray/window.cpp | 12 | ||||
-rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.cpp | 10 | ||||
-rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.h | 4 |
3 files changed, 18 insertions, 8 deletions
diff --git a/examples/widgets/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp index 518f03d4b5..ac05f16341 100644 --- a/examples/widgets/desktop/systray/window.cpp +++ b/examples/widgets/desktop/systray/window.cpp @@ -161,10 +161,16 @@ void Window::iconActivated(QSystemTrayIcon::ActivationReason reason) void Window::showMessage() { showIconCheckBox->setChecked(true); - QSystemTrayIcon::MessageIcon icon = QSystemTrayIcon::MessageIcon( + QSystemTrayIcon::MessageIcon msgIcon = QSystemTrayIcon::MessageIcon( typeComboBox->itemData(typeComboBox->currentIndex()).toInt()); - trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), icon, + if (msgIcon == QSystemTrayIcon::NoIcon) { + QIcon icon(iconComboBox->itemIcon(iconComboBox->currentIndex())); + trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), icon, durationSpinBox->value() * 1000); + } else { + trayIcon->showMessage(titleEdit->text(), bodyEdit->toPlainText(), msgIcon, + durationSpinBox->value() * 1000); + } } //! [5] @@ -216,6 +222,8 @@ void Window::createMessageGroupBox() typeComboBox->addItem(style()->standardIcon( QStyle::SP_MessageBoxCritical), tr("Critical"), QSystemTrayIcon::Critical); + typeComboBox->addItem(QIcon(), tr("Custom icon"), + QSystemTrayIcon::NoIcon); typeComboBox->setCurrentIndex(1); durationLabel = new QLabel(tr("Duration:")); diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp index 06ffac3728..5aecea4968 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.cpp +++ b/examples/widgets/painting/fontsampler/mainwindow.cpp @@ -210,9 +210,9 @@ QMap<QString, StyleItems> MainWindow::currentPageMap() return pageMap; } -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void MainWindow::on_printAction_triggered() { +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) pageMap = currentPageMap(); if (pageMap.count() == 0) @@ -229,10 +229,12 @@ void MainWindow::on_printAction_triggered() printer.setFromTo(1, pageMap.keys().count()); printDocument(&printer); +#endif // QT_NO_PRINTER } void MainWindow::printDocument(QPrinter *printer) { +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) printer->setFromTo(1, pageMap.count()); QProgressDialog progress(tr("Preparing font samples..."), tr("&Cancel"), @@ -261,10 +263,12 @@ void MainWindow::printDocument(QPrinter *printer) } painter.end(); +#endif // QT_NO_PRINTER } void MainWindow::on_printPreviewAction_triggered() { +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) pageMap = currentPageMap(); if (pageMap.count() == 0) @@ -275,10 +279,12 @@ void MainWindow::on_printPreviewAction_triggered() connect(&preview, SIGNAL(paintRequested(QPrinter*)), this, SLOT(printDocument(QPrinter*))); preview.exec(); +#endif // QT_NO_PRINTER } void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer) { +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) QString family = pageMap.keys()[index]; StyleItems items = pageMap[family]; @@ -341,5 +347,5 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer) } painter->restore(); -} #endif // QT_NO_PRINTER +} diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/examples/widgets/painting/fontsampler/mainwindow.h index ada0d47354..6d73e84ea3 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.h +++ b/examples/widgets/painting/fontsampler/mainwindow.h @@ -74,15 +74,11 @@ public: public slots: void on_clearAction_triggered(); void on_markAction_triggered(); -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void on_printAction_triggered(); void on_printPreviewAction_triggered(); -#endif void on_unmarkAction_triggered(); -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void printDocument(QPrinter *printer); void printPage(int index, QPainter *painter, QPrinter *printer); -#endif void showFont(QTreeWidgetItem *item); void updateStyles(QTreeWidgetItem *item, int column); |