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
This commit is contained in:
parent
dd0d52ee0f
commit
bd874c00e1
|
@ -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("#"))
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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"),
|
||||
|
|
Loading…
Reference in New Issue
Block a user