updated about dialog

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2634 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 42 insertions, 26 deletions

diff --git a/src/qmmpui/aboutdialog.cpp b/src/qmmpui/aboutdialog.cpp
index 14856772f..ca12e4308 100644
--- a/src/qmmpui/aboutdialog.cpp
+++ b/src/qmmpui/aboutdialog.cpp
@@ -40,11 +40,11 @@ AboutDialog::AboutDialog(QWidget* parent, Qt::WFlags fl)
 {
     setupUi(this);
     setAttribute(Qt::WA_QuitOnClose, false);
-    licenseTextEdit->setPlainText(getStringFromResource(":COPYING"));
-    aboutTextEdit->setHtml(loadAbout());
-    authorsTextEdit->setPlainText(getStringFromResource(":authors"));
-    thanksToTextEdit->setPlainText(getStringFromResource(":thanks"));
-    translatorsTextEdit->setPlainText(getStringFromResource(":translators"));
+    licenseTextBrowser->setPlainText(getStringFromResource(":COPYING"));
+    aboutTextBrowser->setHtml(loadAbout());
+    authorsTextBrowser->setPlainText(getStringFromResource(":authors"));
+    thanksToTextBrowser->setPlainText(getStringFromResource(":thanks"));
+    translatorsTextBrowser->setPlainText(getStringFromResource(":translators"));
 }
 
 AboutDialog::~AboutDialog()
@@ -63,8 +63,18 @@ QString AboutDialog::loadAbout()
     text.append("<META content=\"text/html; charset=UTF-8\">");
     text.append("</head>");
     text.append("<h3>"+tr("Qt-based Multimedia Player (Qmmp)")+"</h3>");
-    text.append("<h4>"+tr("Version: %1").arg(Qmmp::strVersion()) + "</h4>");
-    text.append("<p>"+getStringFromResource(tr(":txt/description_en.txt"))+"</p>");
+
+    text.append("<p>"+getStringFromResource(tr(":description"))+"</p>");
+
+    text.append("<p><b>"+tr("Version: %1").arg(Qmmp::strVersion()) + "</b><br>");
+    text.append(tr("Using Qt %1 (compiled with Qt %2)" ).arg(qVersion()).arg(QT_VERSION_STR) + "</p>");
+
+    text.append("<p>");
+    text.append(tr("(c) %1-%2 Qmmp Development Team").arg(2006).arg(2012)+"<br>");
+    text.append("<a href=\"http://qmmp.ylsoftware.com/\">http://qmmp.ylsoftware.com/</a><br>");
+    text.append("<a href=\"http://code.google.com/p/qmmp//\">http://code.google.com/p/qmmp/</a>");
+    text.append("</p>");
+
     text.append("<h5>"+tr("Input plugins:")+"</h5>");
     text.append("<ul type=\"square\">");
     foreach(DecoderFactory *fact, *Decoder::factories())
diff --git a/src/qmmpui/forms/aboutdialog.ui b/src/qmmpui/forms/aboutdialog.ui
index a46d59227..db7c2b217 100644
--- a/src/qmmpui/forms/aboutdialog.ui
+++ b/src/qmmpui/forms/aboutdialog.ui
@@ -7,17 +7,26 @@
     <x>0</x>
     <y>0</y>
     <width>523</width>
-    <height>511</height>
+    <height>532</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>About Qmmp</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
     <number>9</number>
    </property>
-   <item row="0" column="0">
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
+   <item>
     <widget class="QLabel" name="pixmapLabel">
      <property name="text">
       <string/>
@@ -30,7 +39,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
@@ -41,8 +50,8 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="0" column="0">
-        <widget class="QTextEdit" name="aboutTextEdit">
-         <property name="readOnly">
+        <widget class="QTextBrowser" name="aboutTextBrowser">
+         <property name="openExternalLinks">
           <bool>true</bool>
          </property>
         </widget>
@@ -55,8 +64,8 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
        <item row="0" column="0">
-        <widget class="QTextEdit" name="authorsTextEdit">
-         <property name="readOnly">
+        <widget class="QTextBrowser" name="authorsTextBrowser">
+         <property name="openExternalLinks">
           <bool>true</bool>
          </property>
         </widget>
@@ -69,8 +78,8 @@
       </attribute>
       <layout class="QVBoxLayout">
        <item>
-        <widget class="QTextEdit" name="translatorsTextEdit">
-         <property name="readOnly">
+        <widget class="QTextBrowser" name="translatorsTextBrowser">
+         <property name="openExternalLinks">
           <bool>true</bool>
          </property>
         </widget>
@@ -83,8 +92,8 @@
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
-        <widget class="QTextEdit" name="thanksToTextEdit">
-         <property name="readOnly">
+        <widget class="QTextBrowser" name="thanksToTextBrowser">
+         <property name="openExternalLinks">
           <bool>true</bool>
          </property>
         </widget>
@@ -97,11 +106,8 @@
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
-        <widget class="QTextEdit" name="licenseTextEdit">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="overwriteMode">
+        <widget class="QTextBrowser" name="licenseTextBrowser">
+         <property name="openExternalLinks">
           <bool>true</bool>
          </property>
         </widget>
@@ -110,7 +116,7 @@
      </widget>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>