diff options
| -rw-r--r-- | rbutil/rbutilqt/gui/changelog.cpp | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/gui/changelogfrm.ui | 4 | ||||
| -rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/gui/changelog.cpp b/rbutil/rbutilqt/gui/changelog.cpp index d836102..4ef1ae9 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 83763d8..339d671 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 e7c2eaa..5da792f 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"), |