Updates to error screen

This commit is contained in:
Victor Tran 2019-06-20 01:47:18 +10:00
parent d6929113d8
commit 2d6258681c
No known key found for this signature in database
GPG key ID: FBA10B22D602BAC1
25 changed files with 66 additions and 73 deletions

View file

@ -48,29 +48,22 @@ ErrorDialog::ErrorDialog(bool started, int errorCount, QString output, QWidget *
ui->backtrace->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)); ui->backtrace->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
} }
ui->errorIcon->setPixmap(QIcon(":/icons/error.svg").pixmap(128 * theLibsGlobal::instance()->getDPIScaling(), 128 * theLibsGlobal::instance()->getDPIScaling())); ui->errorIcon->setPixmap(QIcon(":/icons/error.svg").pixmap(SC_DPI(128), SC_DPI(128)));
if (started) { if (started) {
if (errorCount >= 3) { ui->titleLabel->setText(tr("Well, this is bad."));
ui->restartButton->setVisible(false); ui->errorLabel->setText(tr("theShell ran into an unrecoverable error."));
ui->titleLabel->setText(tr("Unfortunately, theShell keeps running into errors.")); ui->restartButton->setText(tr("Restart theShell"));
ui->repeatFrame->setVisible(true);
ui->errorLabel->setVisible(false);
//ui->errorLabel->setText(tr("theShell keeps running into errors."));
} else { } else {
ui->repeatFrame->setVisible(false);
}
} else {
if (errorCount >= 3) {
ui->restartButton->setVisible(false);
ui->titleLabel->setText(tr("theShell can't start"));
ui->repeatFrame->setVisible(true);
ui->errorLabel->setVisible(false);
} else {
ui->repeatFrame->setVisible(false);
ui->titleLabel->setText(tr("theShell failed to start")); ui->titleLabel->setText(tr("theShell failed to start"));
ui->errorLabel->setText(tr("theShell wasn't able to start properly.")); ui->errorLabel->setText(tr("theShell wasn't able to start properly."));
ui->restartButton->setText(tr("Try again")); ui->restartButton->setText(tr("Try again"));
} }
if (errorCount >= 3) {
ui->repeatFrame->setVisible(true);
ui->errorLabel->setVisible(false);
} else {
ui->repeatFrame->setVisible(false);
} }
ui->logoutButton->setProperty("type", "destructive"); ui->logoutButton->setProperty("type", "destructive");
@ -121,6 +114,6 @@ void ErrorDialog::on_resetTSButton_clicked()
QSettings("theSuite", "theShell").clear(); QSettings("theSuite", "theShell").clear();
ui->resetTSButton->setEnabled(false); ui->resetTSButton->setEnabled(false);
ui->resetTSButton->setText("Settings reset successfully"); ui->resetTSButton->setText(tr("Settings reset successfully"));
} }
} }

View file

@ -76,7 +76,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Well, this is bad.</string> <string notr="true">Well, this is bad.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -86,7 +86,7 @@
<item> <item>
<widget class="QLabel" name="errorLabel"> <widget class="QLabel" name="errorLabel">
<property name="text"> <property name="text">
<string>theShell ran into an unrecoverable error.</string> <string notr="true">theShell ran into an unrecoverable error.</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -159,7 +159,7 @@
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>- Try resetting theShell. This will reset theShell back to its default state.</string> <string>· Try resetting theShell. This will reset theShell back to its default state.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -182,14 +182,14 @@
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>- Try reinstalling or rebuilding theShell.</string> <string>· Try reinstalling or rebuilding theShell.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>- Try reinstalling any dependencies of theShell.</string> <string>· Try reinstalling any dependencies of theShell.</string>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -71,7 +71,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</string> <string>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -81,7 +81,7 @@
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="weatherCheckBox"> <widget class="QCheckBox" name="weatherCheckBox">
<property name="text"> <property name="text">
<string>Show weather for current location (coming soon)</string> <string>Show weather for current location</string>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -95,12 +95,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -95,12 +95,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -95,12 +95,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -95,12 +95,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -97,12 +97,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -97,12 +97,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -96,12 +96,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -97,12 +97,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -97,12 +97,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -97,12 +97,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>

View file

@ -95,12 +95,12 @@
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="74"/> <location filename="../overviewsettings.ui" line="74"/>
<source>Weather information is sourced from Yahoo. Your location will be sent to Yahoo if you enable this option for the purposes of querying weather data.</source> <source>Weather information is sourced from MET Norway. Your location will be sent to MET Norway if you enable this option for the purposes of querying weather data.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../overviewsettings.ui" line="84"/> <location filename="../overviewsettings.ui" line="84"/>
<source>Show weather for current location (coming soon)</source> <source>Show weather for current location</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>