diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-04 23:43:34 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2013-11-04 23:43:34 +0100 |
commit | bd874c00e16e1c086c028e2eb08bf9e6668b2671 (patch) | |
tree | ede10760361e5457431cd8d5f61326d965040f09 /rbutil/rbutilqt | |
parent | dd0d52ee0f6750233be61155160eb35e74b908f9 (diff) | |
download | rockbox-bd874c00e16e1c086c028e2eb08bf9e6668b2671.tar.gz rockbox-bd874c00e16e1c086c028e2eb08bf9e6668b2671.zip |
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
Diffstat (limited to 'rbutil/rbutilqt')
-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 d8361023b1..4ef1ae9266 100644 --- a/rbutil/rbutilqt/gui/changelog.cpp +++ b/rbutil/rbutilqt/gui/changelog.cpp | |||
@@ -57,6 +57,8 @@ QString Changelog::parseChangelogFile(QString filename) | |||
57 | QString t = line.remove(QRegExp("^\\*")); | 57 | QString t = line.remove(QRegExp("^\\*")); |
58 | t.replace(QRegExp("FS#(\\d+)"), | 58 | t.replace(QRegExp("FS#(\\d+)"), |
59 | "<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>"); | 59 | "<a href='http://www.rockbox.org/tracker/task/\\1'>FS#\\1</a>"); |
60 | t.replace(QRegExp("G#(\\d+)"), | ||
61 | "<a href='http://gerrit.rockbox.org/r/\\1'>G#\\1</a>"); | ||
60 | text.append(QString("<li>%1</li>").arg(t)); | 62 | text.append(QString("<li>%1</li>").arg(t)); |
61 | line = c.readLine(); | 63 | line = c.readLine(); |
62 | if(line.startsWith("#")) | 64 | 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 @@ | |||
9 | <rect> | 9 | <rect> |
10 | <x>0</x> | 10 | <x>0</x> |
11 | <y>0</y> | 11 | <y>0</y> |
12 | <width>400</width> | 12 | <width>500</width> |
13 | <height>300</height> | 13 | <height>400</height> |
14 | </rect> | 14 | </rect> |
15 | </property> | 15 | </property> |
16 | <property name="windowTitle"> | 16 | <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) | |||
247 | buildInfo.close(); | 247 | buildInfo.close(); |
248 | 248 | ||
249 | ui.statusbar->showMessage(tr("Download build information finished."), 5000); | 249 | ui.statusbar->showMessage(tr("Download build information finished."), 5000); |
250 | if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION | ||
251 | || RbSettings::value(RbSettings::ShowChangelog).toBool()) { | ||
252 | changelog(); | ||
253 | } | ||
250 | updateSettings(); | 254 | updateSettings(); |
251 | m_gotInfo = true; | 255 | m_gotInfo = true; |
252 | 256 | ||
@@ -320,10 +324,6 @@ void RbUtilQt::updateSettings() | |||
320 | HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); | 324 | HttpGet::setGlobalCache(c.isEmpty() ? QDir::tempPath() : c); |
321 | HttpGet::setGlobalProxy(proxy()); | 325 | HttpGet::setGlobalProxy(proxy()); |
322 | 326 | ||
323 | if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION | ||
324 | || RbSettings::value(RbSettings::ShowChangelog).toBool()) { | ||
325 | changelog(); | ||
326 | } | ||
327 | if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) { | 327 | if(RbSettings::value(RbSettings::RbutilVersion) != PUREVERSION) { |
328 | QApplication::processEvents(); | 328 | QApplication::processEvents(); |
329 | QMessageBox::information(this, tr("New installation"), | 329 | QMessageBox::information(this, tr("New installation"), |