From bd874c00e16e1c086c028e2eb08bf9e6668b2671 Mon Sep 17 00:00:00 2001
From: Dominik Riebeling <Dominik.Riebeling@gmail.com>
Date: Mon, 4 Nov 2013 23:43:34 +0100
Subject: Fix changelog showing up too often.

- Prevent the Changelog showing up when closing the configuration dialog if
  "Show on startup" is enabled.
- Increase dialog size a bit.
- Detect and link Gerrit IDs.

Change-Id: I049be3c38a57b2559f2a78392b785fa51ec99dc1
---
 rbutil/rbutilqt/gui/changelog.cpp   | 2 ++
 rbutil/rbutilqt/gui/changelogfrm.ui | 4 ++--
 rbutil/rbutilqt/rbutilqt.cpp        | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'rbutil/rbutilqt')

diff --git a/rbutil/rbutilqt/gui/changelog.cpp b/rbutil/rbutilqt/gui/changelog.cpp
index d8361023b1..4ef1ae9266 100644
--- a/rbutil/rbutilqt/gui/changelog.cpp
+++ b/rbutil/rbutilqt/gui/changelog.cpp
@@ -57,6 +57,8 @@ QString Changelog::parseChangelogFile(QString filename)
                 QString t = line.remove(QRegExp("^\\*"));
                 t.replace(QRegExp("FS#(\\d+)"),
                           "<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>");
+                t.replace(QRegExp("G#(\\d+)"),
+                          "<a href='http://gerrit.rockbox.org/r/\\1'>G#\\1</a>");
                 text.append(QString("<li>%1</li>").arg(t));
                 line = c.readLine();
                 if(line.startsWith("#"))
diff --git a/rbutil/rbutilqt/gui/changelogfrm.ui b/rbutil/rbutilqt/gui/changelogfrm.ui
index 83763d84d9..339d671caa 100644
--- a/rbutil/rbutilqt/gui/changelogfrm.ui
+++ b/rbutil/rbutilqt/gui/changelogfrm.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>500</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index e7c2eaaf28..5da792ffc1 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -247,6 +247,10 @@ void RbUtilQt::downloadDone(bool error)
     buildInfo.close();
 
     ui.statusbar->showMessage(tr("Download build information finished."), 5000);
+    if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION
+            || RbSettings::value(RbSettings::ShowChangelog).toBool()) {
+        changelog();
+    }
     updateSettings();
     m_gotInfo = true;
 
@@ -320,10 +324,6 @@ void RbUtilQt::updateSettings()
     HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c);
     HttpGet::setGlobalProxy(proxy());
 
-    if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION
-            || RbSettings::value(RbSettings::ShowChangelog).toBool()) {
-        changelog();
-    }
     if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) {
         QApplication::processEvents();
         QMessageBox::information(this, tr("New installation"),
-- 
cgit v1.2.3