diff --git a/mainwindow.cpp b/mainwindow.cpp
index c08434c..f5d94f2 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -765,11 +765,6 @@ void MainWindow::on_actionFont_triggered()
}
-void MainWindow::on_actionFont_color_triggered()
-{
- this->setColor();
-}
-
void MainWindow::on_actionFont_2_triggered()
{
@@ -919,3 +914,12 @@ void MainWindow::on_actionNewFile_triggered()
{
this->newPath();
}
+
+
+void MainWindow::on_actionFont_color_triggered()
+{
+ this->setColor();
+}
+
+
+
diff --git a/mainwindow.h b/mainwindow.h
index 62737dc..8090e39 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -83,8 +83,6 @@ private slots:
void on_actionFont_triggered();
- void on_actionFont_color_triggered();
-
void on_actionFont_2_triggered();
void on_actionBold_2_triggered();
@@ -122,6 +120,9 @@ private slots:
void on_actionNewFile_triggered();
+ void on_actionFont_color_triggered();
+
+
private:
Ui::MainWindow *ui;
QString currentFile;
diff --git a/mainwindow.ui b/mainwindow.ui
index ddabe8c..53b0b79 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -726,6 +726,113 @@
Ctrl+Y
+
+
+
+ :/data/images/data/images/font-color.png:/data/images/data/images/font-color.png
+
+
+ Color
+
+
+
+
+
+ :/data/images/data/images/bold.png:/data/images/data/images/bold.png
+
+
+ Bold
+
+
+
+
+
+ :/data/images/data/images/italic.png:/data/images/data/images/italic.png
+
+
+ Italic
+
+
+
+
+
+ :/data/images/data/images/underline.png:/data/images/data/images/underline.png
+
+
+ Underline
+
+
+
+
+
+ :/data/images/data/images/overline.png:/data/images/data/images/overline.png
+
+
+ Overline
+
+
+
+
+
+ :/data/images/data/images/font-size.png:/data/images/data/images/font-size.png
+
+
+ Size
+
+
+
+
+
+ :/data/images/data/images/font.png:/data/images/data/images/font.png
+
+
+ Font
+
+
+
+
+ Font color
+
+
+
+
+ Font
+
+
+
+
+ Font size
+
+
+
+
+ Bold
+
+
+ Ctrl+B
+
+
+
+
+ Italic
+
+
+ Ctrl+I
+
+
+
+
+ Underline
+
+
+ Ctrl+U
+
+
+
+
+ Overline
+
+