len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 13:45:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix changelog showing up too often.

Browse source 
- 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:
Dominik Riebeling 2013-11-04 23:43:34 +01:00
parent dd0d52ee0f
commit bd874c00e1
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rbutil/rbutilqt/gui/changelog.cpp
View file

@ -57,6 +57,8 @@ QString Changelog::parseChangelogFile(QString filename)
QString t = line.remove(QRegExp("^\\*")); QString t = line.remove(QRegExp("^\\*"));
t.replace(QRegExp("FS#(\\d+)"), t.replace(QRegExp("FS#(\\d+)"),
"<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>"); "<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)); text.append(QString("<li>%1</li>").arg(t));
line = c.readLine(); line = c.readLine();
if(line.startsWith("#")) if(line.startsWith("#"))

4
rbutil/rbutilqt/gui/changelogfrm.ui
View file

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>500</width>
<height>300</height> <height>400</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

8
rbutil/rbutilqt/rbutilqt.cpp
View file

@ -247,6 +247,10 @@ void RbUtilQt::downloadDone(bool error)
buildInfo.close(); buildInfo.close();
ui.statusbar->showMessage(tr("Download build information finished."), 5000); ui.statusbar->showMessage(tr("Download build information finished."), 5000);
if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION
|| RbSettings::value(RbSettings::ShowChangelog).toBool()) {
changelog();
}
updateSettings(); updateSettings();
m_gotInfo = true; m_gotInfo = true;
@ -320,10 +324,6 @@ void RbUtilQt::updateSettings()
HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c);
HttpGet::setGlobalProxy(proxy()); HttpGet::setGlobalProxy(proxy());
if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION
|| RbSettings::value(RbSettings::ShowChangelog).toBool()) {
changelog();
}
if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) { if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) {
QApplication::processEvents(); QApplication::processEvents();
QMessageBox::information(this, tr("New installation"), QMessageBox::information(this, tr("New installation"),