Merge branch 'bookmarks' of ssh://drop.maemo.org/git/mdictionary into bookmarks

Conflicts:
	trunk/src/base/gui/AboutWidget.cpp

diff --git a/trunk/src/base/gui/AboutWidget.cpp b/trunk/src/base/gui/AboutWidget.cpp
index 3da5fe9..cb6e385 100644 (file)
--- a/trunk/src/base/gui/AboutWidget.cpp
+++ b/trunk/src/base/gui/AboutWidget.cpp
@@ -4,9 +4,9 @@ AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent)
 {
     QString infoNote, licenseNote, comarchNote;
     infoNote = "<center><h2><u>mDictionary</u></h2></center>";
-    infoNote += "<br><a href=\"http://mdictionary.garage.maemo.org/\"/>";
-    infoNote += "<center>Meamo/Meego Mulitlingual Dictionary</center>";
-    comarchNote = "<center>Copyright 2006-2010, Comarch S.A. </center>";
+    comarchNote = "<center>Meamo/Meego Mulitlingual Dictionary</center>";
+    comarchNote += "<center>Copyright 2006-2010, Comarch S.A. <br />";
+    comarchNote += "<a href=\"http://mdictionary.garage.maemo.org\">http://mdictionary.garage.maemo.org</a></center>";
     licenseNote = "<br /><p><font size=\"small\">This program is free software: you can redistribute it and/or modify\n"
                   "it under the terms of the GNU General Public License as published by\n"
                   "the Free Software Foundation, either version 3 of the License, or\n"
@@ -29,6 +29,7 @@ AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent)
     mainLayout->addWidget(imageLabel, 0, Qt::AlignCenter);
     mainLayout->addWidget(mainLabel);
     mainLayout->addWidget(licenseLabel);
+    comarchLabel->setOpenExternalLinks(true);
 
     QImage img(":/icons/mdictionary.png");
     imageLabel->setPixmap(QPixmap::fromImage(img));