diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h index a590bae..b0924b4 100644 --- a/sources/awesome-widget/awesome-widget.h +++ b/sources/awesome-widget/awesome-widget.h @@ -80,6 +80,7 @@ private slots: void editHddSpeedItem(QListWidgetItem *item); void editMountItem(QListWidgetItem *item); void editTempItem(QListWidgetItem *item); + void setFormating(); protected: QList contextualActions(); diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index 13bedd4..720428f 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -318,6 +318,10 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) else if (fontStyle == QString("italic")) uiAppConfig.comboBox_style->setCurrentIndex(1); uiAppConfig.spinBox_weight->setValue(fontWeight); + // format page + uiWidConfig.kcolorcombo->setColor(fontColor); + uiWidConfig.fontComboBox->setCurrentFont(font); + uiWidConfig.spinBox->setValue(fontSize); // dataengine QMap deSettings = readDataEngineConfiguration(); @@ -391,6 +395,16 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) this, SLOT(addNewPkgCommand(QTableWidgetItem *))); connect(uiDEConfig.tableWidget_pkgCommand, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuPkgCommand(QPoint))); + connect(uiWidConfig.pushButton_bold, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_italic, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_underline, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_strike, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_left, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_center, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_right, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_fill, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(uiWidConfig.pushButton_applyFont, SIGNAL(clicked(bool)), this, SLOT(setFormating())); + connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted())); connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted())); @@ -695,3 +709,39 @@ void AwesomeWidget::editTempItem(QListWidgetItem *item) uiAdvancedConfig.listWidget_tempDevice->openPersistentEditor(item); } + + +void AwesomeWidget::setFormating() +{ + if (debug) qDebug() << PDEBUG; + if (debug) qDebug() << PDEBUG << ":" << "Sender" << sender(); + + QString selectedText = uiWidConfig.textEdit_elements->textCursor().selectedText(); + if (sender() == uiWidConfig.pushButton_bold) + uiWidConfig.textEdit_elements->insertPlainText(QString("") + selectedText + QString("")); + else if (sender() == uiWidConfig.pushButton_italic) + uiWidConfig.textEdit_elements->insertPlainText(QString("") + selectedText + QString("")); + else if (sender() == uiWidConfig.pushButton_underline) + uiWidConfig.textEdit_elements->insertPlainText(QString("") + selectedText + QString("")); + else if (sender() == uiWidConfig.pushButton_strike) + uiWidConfig.textEdit_elements->insertPlainText(QString("") + selectedText + QString("")); + else if (sender() == uiWidConfig.pushButton_left) + uiWidConfig.textEdit_elements->insertPlainText(QString("

") + selectedText + QString("

")); + else if (sender() == uiWidConfig.pushButton_center) + uiWidConfig.textEdit_elements->insertPlainText(QString("

") + selectedText + QString("

")); + else if (sender() == uiWidConfig.pushButton_right) + uiWidConfig.textEdit_elements->insertPlainText(QString("

") + selectedText + QString("

")); + else if (sender() == uiWidConfig.pushButton_fill) + uiWidConfig.textEdit_elements->insertPlainText(QString("

") + selectedText + QString("

")); + else if (sender() == uiWidConfig.pushButton_applyFont) { + QString color = uiWidConfig.kcolorcombo->color().name(); + QString font = uiWidConfig.fontComboBox->currentFont().family(); + QString size = QString::number(uiWidConfig.spinBox->value()); + uiWidConfig.textEdit_elements->insertPlainText(QString("") + .arg(color).arg(font).arg(size) + + selectedText + QString("")); + uiWidConfig.kcolorcombo->setColor(uiAppConfig.kcolorcombo->color()); + uiWidConfig.fontComboBox->setCurrentFont(uiAppConfig.fontComboBox->currentFont()); + uiWidConfig.spinBox->setValue(uiAppConfig.spinBox_size->value()); + } +} diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp index d902b41..de95435 100644 --- a/sources/awesome-widget/reinit.cpp +++ b/sources/awesome-widget/reinit.cpp @@ -171,8 +171,7 @@ void AwesomeWidget::updateTooltip() } toolTipScene->addLine(x1, y1, x2, y2, pen); } - if (trueKeys[i] == QString("down")) - down = true; + if (trueKeys[i] == QString("down")) down = true; } toolTip.setImage(QPixmap::grabWidget(toolTipView)); diff --git a/sources/awesome-widget/widget.ui b/sources/awesome-widget/widget.ui index 93a9e2c..b09622c 100644 --- a/sources/awesome-widget/widget.ui +++ b/sources/awesome-widget/widget.ui @@ -45,6 +45,179 @@ + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Ctrl+B + + + + + + + + + + + + Ctrl+I, Return + + + + + + + + + + + + Ctrl+U + + + + + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + Insert + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + @@ -57,6 +230,13 @@ + + + KColorCombo + QComboBox +
kcolorcombo.h
+
+