Re #7321. Split out revision info in about dialog.

mantidproject · Aug 15, 2013 · 16d7468 · 16d7468
1 parent a8667fa
commit 16d7468
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidAbout.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidAbout.cpp
@@ -25,11 +25,18 @@ MantidAbout::MantidAbout(QWidget *parent) : MantidQt::API::MantidDialog(parent)
   releasedate->setText(releaseDate);
 
   QString version(Mantid::Kernel::MantidVersion::version());
-  // Add on the SHA-1 to the version number here (but not in the more visible places)
-  version.append("-").append(Mantid::Kernel::MantidVersion::revision());
   QLabel* releaseversion = m_uiForm.release_versionvalue;
   releaseversion->setText(version);
 
+  QString release(Mantid::Kernel::MantidVersion::revision());
+  release.insert(0, "<p>");
+  release.append(" (<a href=\"http://github.com/mantidproject/mantid/commit/");
+  release.append(Mantid::Kernel::MantidVersion::revisionFull());
+  release.append("\">on github</a>)</p>");
+  QLabel* releaselabel = m_uiForm.revision_value;
+  releaselabel->setText(release);
+  releaselabel->setOpenExternalLinks(true);
+
   QLabel* builtusing_labelvalue = m_uiForm.builtusing_labelvalue;
   QString builtusing = "QtiPlot " + QString::number(maj_version) + "." + QString::number(min_version)
       + "." + QString::number(patch_version) + extra_version + "  ";

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidAbout.ui b/Code/Mantid/MantidPlot/src/Mantid/MantidAbout.ui
@@ -90,20 +90,34 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="4" column="0">
          <widget class="QLabel" name="mantidlabel">
           <property name="text">
            <string>Homepage</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="4" column="1">
          <widget class="QLabel" name="mantidurl">
           <property name="text">
            <string>TextLabel</string>
           </property>
          </widget>
         </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="revision_label">
+          <property name="text">
+           <string>Revision:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="revision_value">
+          <property name="text">
+           <string>TextLabel</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>
@@ -436,8 +450,6 @@
  </widget>
  <resources>
   <include location="../../../Images/images.qrc"/>
-  <include location="../../../Images/images.qrc"/>
-  <include location="../../../Images/images.qrc"/>
  </resources>
  <connections>
   <connection>