From e3a51eef6dba8590e0faea98ad1976138c0e96b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 1 Apr 2020 17:11:32 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@925
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/application/aboutwindow.cpp | 6 ++++++
 qad/application/aboutwindow.h   | 1 +
 qad/application/aboutwindow.ui  | 3 ---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qad/application/aboutwindow.cpp b/qad/application/aboutwindow.cpp
index 0f972e2..19619c7 100644
--- a/qad/application/aboutwindow.cpp
+++ b/qad/application/aboutwindow.cpp
@@ -43,6 +43,7 @@ AboutWindow::AboutWindow(QWidget * parent): QDialog(parent), ui(new Ui::AboutWin
 	foreach (SSPair p, builds) {
 		lay->addRow(p.first, new QLabel(p.second));
 	}
+	ui->imageView->setPixmap(QPixmap::fromImage(logo_im));
 	ui->labelComment->setText(comment);
 	ui->labelComment->setHidden(comment.isEmpty());
 	//ui->labelArch->setText(QSysInfo::currentCpuArchitecture());
@@ -81,6 +82,11 @@ void AboutWindow::setLogo(QImage im) {
 }
 
 
+void AboutWindow::setLogo(QString path) {
+	logo = QImage(path);
+}
+
+
 void AboutWindow::addVersion(QString name, QString version) {
 	if (!name.endsWith(":")) name.append(":");
 	foreach (const SSPair & p, versions) {
diff --git a/qad/application/aboutwindow.h b/qad/application/aboutwindow.h
index d447566..8c89df2 100644
--- a/qad/application/aboutwindow.h
+++ b/qad/application/aboutwindow.h
@@ -24,6 +24,7 @@ class QAD_EXPORT AboutWindow: public QDialog
 public:
 
 	static void setLogo(QImage im);
+	static void setLogo(QString path);
 	static void addVersion(QString name, QString version);
 	static void addBuildInfo(QString name, QString value);
 	static void setComment(QString text);
diff --git a/qad/application/aboutwindow.ui b/qad/application/aboutwindow.ui
index e0b0c42..cd926fd 100644
--- a/qad/application/aboutwindow.ui
+++ b/qad/application/aboutwindow.ui
@@ -28,9 +28,6 @@
        </color>
       </brush>
      </property>
-     <property name="pixmap">
-      <pixmap>:/icons/splash.png</pixmap>
-     </property>
     </widget>
    </item>
    <item>