X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Faboutdlg.cpp;h=c0e4d7541c7c191b8cf6dcb4f9cae5594156fa86;hp=9cb5cf5a66e0fd7b568099738213e65a5491130e;hb=480eab8daec4fb56a6886918c6a913cc197330f1;hpb=f9cbf03a36a8612fcae2d24111ceee22656d12b3

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 9cb5cf5a..c0e4d754 100644
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -18,20 +18,27 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QDateTime>
+
 #include "aboutdlg.h"
-#include "global.h"
+#include "icon.h"
+#include "iconloader.h"
+#include "quassel.h"
 
 AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
+  ui.quasselLogo->setPixmap(DesktopIcon("quassel", IconLoader::SizeHuge));
 
-  ui.versionLabel->setText(QString(tr("<b>Version %1</b><br>Protocol version: %2<br>Built: %3 %4")).arg(Global::quasselVersion)
-			   .arg(Global::protocolVersion)
-			   .arg(Global::quasselBuildDate).arg(Global::quasselBuildTime));
+  ui.versionLabel->setText(QString(tr("<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"))
+                           .arg(Quassel::buildInfo().fancyVersionString)
+			   .arg(Quassel::buildInfo().protocolVersion)
+			   .arg(Quassel::buildInfo().buildDate));
   ui.aboutTextBrowser->setHtml(about());
   ui.authorTextBrowser->setHtml(authors());
   ui.contributorTextBrowser->setHtml(contributors());
   ui.thanksToTextBrowser->setHtml(thanksTo());
 
+  setWindowIcon(Icon("quassel"));
 }
 
 QString AboutDlg::about() const {
@@ -75,9 +82,12 @@ QString AboutDlg::contributors() const {
            "<dt><b>Sebastian \"seezer\" Goth</b></dt><dd>Various improvements and features</dd>"
            "<dt><b>John \"nox-Hand\" Hand</b></dt><dd>Gorgeous application and tray icons</dd>"
            "<dt><b>Jonas \"Dante\" Heese</b></dt><dd>Project founder, various improvements</dd>"
+           "<dt><b>Paul \"Haudrauf\" Klumpp</b></dt><dd>Initial design and mainwindow layout</dd>"
            "<dt><b>Regis \"ZRegis\" Perrin</b></dt><dd>French translation</dd>"
-           "<dt><b>Diego \"Flameeyes\" Petten&ograve;</b></dt><dd>Gentoo maintainer</dd>"
-           "<dt><b>Dennis \"devurandom\" Schridde</b></dt><dd>D-Bus notifications</dd>"
+           "<dt><b>Diego \"Flameeyes\" Petten&ograve;</b></dt><dd>Gentoo maintainer, build system improvements</dd>"
+           "<dt><b>Dennis \"DevUrandom\" Schridde</b></dt><dd>D-Bus notifications</dd>"
+           "<dt><b>Jussi \"jussi01\" Schultink</b></dt><dd>Tireless tester, {k|U}buntu nightly packages</dd>"
+           "<dt><b>Tim \"xAFFE\" Schumacher</b></dt><dd>Fixes and feedback</dd>"
            "<dt><b>Harald \"apachelogger\" Sitter</b></dt><dd>{k|U}buntu packager, motivator, promoter</dd>"
            "<dt><b>Daniel \"son\" Steinmetz</b></dt><dd>Early beta tester and bughunter (on Vista&trade;!)</dd>"
            "<dt><b>Adam \"adamt\" Tulinius</b></dt><dd>Early beta tester and bughunter, Danish translation</dd>"