about dialog corrected, application icon added (Windows)

5 files changed, 24 insertions, 4 deletions

diff --git a/src/analyze/gui/aboutdata.cpp b/src/analyze/gui/aboutdata.cpp
index a3fe52c..cfb1bdf 100644
--- a/src/analyze/gui/aboutdata.cpp
+++ b/src/analyze/gui/aboutdata.cpp
@@ -7,11 +7,11 @@
 #endif
 
 #ifdef SAMSUNG_TIZEN_BRANCH
-const QString& AboutData::Organization = "Samsung";
+const QString& AboutData::Organization = "Samsung Electronics";
 
 const QString& AboutData::CopyrightStatement =
         i18n("Copyright 2015, Milian Wolff <mail@milianw.de>. " \
-             "Copyright 2018, Samsung.");
+             "Copyright 2018, Samsung Electronics.");
 
 const QString& AboutData::BugAddress = "TODO"; // TODO!!
 #else
diff --git a/src/analyze/gui/aboutdialog.cpp b/src/analyze/gui/aboutdialog.cpp
index a52689b..1f500fb 100644
--- a/src/analyze/gui/aboutdialog.cpp
+++ b/src/analyze/gui/aboutdialog.cpp
@@ -1,12 +1,30 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 
+#include "aboutdata.h"
+
 AboutDialog::AboutDialog(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::AboutDialog)
 {
     ui->setupUi(this);
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+    setWindowTitle("About " + AboutData::DisplayName);
+
+    ui->label->setText(QString(
+        "<h2>A visualizer for heaptrack data files.</h2>" \
+        "<p>Copyright 2015, Milian Wolff " \
+        "&lt;<a href=mailto:mail@milianw.de>mail@milianw.de</a>&gt;</p>" \
+        "<p>GNU LESSER GENERAL PUBLIC LICENSE v.2.1</p>" \
+        "<p>Original author, maintainer: Milian Wolff</p>" \
+        "<p>Copyright 2018, %1</p>" \
+        "<p>The application is based in part on the work of the Qwt project " \
+        "(<a href=http://qwt.sf.net>qwt.sf.net</a>)</p>" \
+        "<p>Application icon (free for commercial use): Jack Cai " \
+        "(<a href=http://www.doublejdesign.co.uk>www.doublejdesign.co.uk</a>)</p>")
+        .arg(AboutData::Organization)
+    );
 }
 
 AboutDialog::~AboutDialog()
diff --git a/src/analyze/gui/aboutdialog.ui b/src/analyze/gui/aboutdialog.ui
index 1427455..870ce49 100644
--- a/src/analyze/gui/aboutdialog.ui
+++ b/src/analyze/gui/aboutdialog.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>About Heaptrack GUI</string>
+   <string/>
   </property>
   <property name="modal">
    <bool>true</bool>
@@ -26,7 +26,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A visualizer for heaptrack data files.&lt;/p&gt;&lt;p&gt;Copyright 2015, Milian Wolff &amp;lt;mail@milianw.de&amp;gt;&lt;/p&gt;&lt;p&gt;GNU LESSER GENERAL PUBLIC LICENSE v.2.1&lt;/p&gt;&lt;p&gt;Original author, maintainer: Milian Wolff&lt;/p&gt;&lt;p&gt;Copyright 2018, Samsung&lt;/p&gt;&lt;p&gt;The application is based in part on the work of the Qwt project (&lt;a href=&quot;http://qwt.sf.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://qwt.sf.net&lt;/span&gt;&lt;/a&gt;).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;See cpp-file&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/src/analyze/gui/icons/if_diagram_v2-14_37134.ico b/src/analyze/gui/icons/if_diagram_v2-14_37134.ico
new file mode 100644
index 0000000..d06f03e
--- /dev/null
+++ b/src/analyze/gui/icons/if_diagram_v2-14_37134.ico
diff --git a/src/heaptrack_gui.pro b/src/heaptrack_gui.pro
index 783ef9b..c15f064 100644
--- a/src/heaptrack_gui.pro
+++ b/src/heaptrack_gui.pro
@@ -21,6 +21,8 @@ win32 {
     DEFINES += NO_K_LIB NO_K_CHART
     INCLUDEPATH += $$(BOOST_LIB)
     LIBS += -L$$(BOOST_LIB)/stage/lib
+
+    RC_ICONS += analyze/gui/icons/if_diagram_v2-14_37134.ico
 }
 
 unix {