From ef2d9354fddf1dfed937514ce4b72446f69e988c Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Mon, 22 Jun 2020 00:05:07 +0200 Subject: [PATCH] set icon for emoji button --- src/mainwindow.cpp | 2 +- src/mainwindow.h | 4 +-- src/mainwindow.ui | 66 +++++++++++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e8fdf4f..9ff349a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2617,7 +2617,7 @@ void MainWindow::on_givemeZaddr_clicked() }); } -void MainWindow::emojiButton_clicked() +void MainWindow::on_emojiButton_clicked() { QDialog emojiDialog(this); diff --git a/src/mainwindow.h b/src/mainwindow.h index 4eccfa3..ac77d8b 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -111,9 +111,7 @@ private slots: void on_givemeZaddr_clicked(); - // void on_pushButton_clicked(); - - void emojiButton_clicked(); + void on_emojiButton_clicked(); private: bool fileExists(QString path); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 77687b1..da36c3f 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 1274 + 1282 779 @@ -428,7 +428,7 @@ 0 0 - 1226 + 1234 509 @@ -1726,6 +1726,33 @@ 6 + + + + + 20 + 0 + + + + + + + + :/emoji/res/emoji/emoji1.png + + + + + 17 + 17 + + + + true + + + @@ -1734,6 +1761,12 @@ 0 + + + 16777215 + 50 + + 100 @@ -1765,33 +1798,6 @@ - - - - - 20 - 0 - - - - - - - - :/emoji/res/emoji/emoji1.png - - - - - 17 - 17 - - - - true - - - @@ -1828,7 +1834,7 @@ 0 0 - 1274 + 1282 22