FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #75.

Browse Source
This commit is contained in:
Martin Rotter 2014-10-05 17:33:46 +02:00
parent fbb4d0cd3d
commit d67d0b53c6
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/text/CHANGELOG
View File

@ -3,7 +3,7 @@
Fixed: Fixed:
<ul> <ul>
<li>Fixed #76.</li> <li>Fixed #76, #75.</li>
</ul> </ul>
Added: Added:

20
src/gui/formsettings.cpp
View File

@ -248,14 +248,18 @@ void FormSettings::promptForRestart() {
if (!m_changedDataTexts.isEmpty()) { if (!m_changedDataTexts.isEmpty()) {
QStringList changed_settings_description = m_changedDataTexts.replaceInStrings(QRegExp("^"), QString::fromUtf8(" • ")); QStringList changed_settings_description = m_changedDataTexts.replaceInStrings(QRegExp("^"), QString::fromUtf8(" • "));
MessageBox::show(this, QMessageBox::StandardButton clicked_button = MessageBox::show(this,
QMessageBox::Question, QMessageBox::Question,
tr("Critical settings were changed"), tr("Critical settings were changed"),
tr("Some critical settings were changed and will be applied after the application gets restarted. " tr("Some critical settings were changed and will be applied after the application gets restarted. "
"\n\nYou have to restart manually."), "\n\nYou have to restart manually."),
QString(), tr("Do you want to restart now?"),
tr("List of changes:\n%1.").arg(changed_settings_description .join(",\n")), tr("List of changes:\n%1.").arg(changed_settings_description .join(",\n")),
QMessageBox::Ok, QMessageBox::Ok); QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
if (clicked_button == QMessageBox::Yes) {
qApp->restart();
}
} }
} }

1
src/miscellaneous/application.cpp
View File

@ -186,4 +186,3 @@ void Application::restart() {
m_shouldRestart = true; m_shouldRestart = true;
quit(); quit();
} }