Permalink
Browse files

Meta: Added KTH to the about dialog and readme

  • Loading branch information...
petersteneteg committed Jul 25, 2018
1 parent 30bc567 commit 981c6409531e862434a921da025517a575d33acb
Showing with 11 additions and 4 deletions.
  1. +2 −1 README.md
  2. BIN resources/images/kth.png
  3. +1 −0 resources/inviwo.qrc
  4. +8 −3 src/qt/editor/inviwoaboutwindow.cpp
View
@@ -38,8 +38,9 @@ Below follow some general information about the framework:
- [Changelog](/CHANGELOG.md)
#### Sponsors
This work was supported by Linköping University, Ulm University, and through grants from the Swedish e-Science Research Centre (SeRC).
This work was supported by Linköping University, KTH Royal Institute of Technology, Ulm University, and through grants from the Swedish e-Science Research Centre (SeRC).
<a href='http://www.liu.se'><img src="/resources/images/liu-black.png" width="200"></a>
<a href='http://www.kth.se'><img src="/resources/images/kth.png" width="200"></a>
<a href='http://e-science.se'><img src="/resources/images/serc.png" width="200"></a>
<a href='http://www.uni-ulm.de/en/'><img src="/resources/images/uulm.png" width="200"></a>
View
Binary file not shown.
View
@@ -70,6 +70,7 @@
<file>images/liu-black.png</file>
<file>images/serc.png</file>
<file>images/uulm.png</file>
<file>images/kth.png</file>
<file>stylesheets/images/addlistitem.png</file>
<file>stylesheets/images/addlistitem_disabled.png</file>
<file>stylesheets/images/arrow_darker_down.png</file>
@@ -157,7 +157,7 @@ InviwoAboutWindow::InviwoAboutWindow(InviwoMainWindow* mainwindow)
h.append("br");
h.append("span",
"Robin Skånberg, Jochen Jankowai, Tino Weinkauf, "
"Wiebke Koepp, Anke Friederici, Dominik Engel, "
"Wiebke Köpp, Anke Friederici, Dominik Engel, "
"Alexander Johansson, Andreas Valter, Johan Norén, Emanuel Winblad, "
"Hans-Christian Helltegen, Viktor Axelsson");
}
@@ -166,13 +166,18 @@ InviwoAboutWindow::InviwoAboutWindow(InviwoMainWindow* mainwindow)
h.append("h3", "Sponsors:");
h.append("br");
h.append("span",
"This work was supported by Linköping University, Ulm University, and through "
"grants from the Swedish e-Science Research Centre (SeRC).");
"This work was supported by Linköping University, KTH Royal Institute of "
"Technology, Ulm University, and through grants from the Swedish e-Science "
"Research Centre (SeRC).");
h.append("br");
auto p = h.append("p");
auto liu = p.append("a", "", {{"href", "http://www.liu.se"}});
liu.append("img", "", makeImg(":/images/liu-white-crop.png", 50));
auto kth = p.append("a", "", {{"href", "http://www.kth.se"}});
kth.append("img", "", makeImg(":/images/kth.png", 50));
auto serc = p.append("a", "", {{"href", "http://www.e-science.se"}});
serc.append("img", "", makeImg(":/images/serc.png", 50));

0 comments on commit 981c640

Please sign in to comment.