mirrors/theshell
1
0
Fork 0
mirror of https://github.com/vicr123/theshell.git synced 2025-01-22 03:41:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates to error screen

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

37
startsession/errordialog.cpp
View file

@ -48,29 +48,22 @@ ErrorDialog::ErrorDialog(bool started, int errorCount, QString output, QWidget *
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 (errorCount >= 3) {
ui->restartButton->setVisible(false);
ui->titleLabel->setText(tr("Unfortunately, theShell keeps running into errors."));
ui->repeatFrame->setVisible(true);
ui->errorLabel->setVisible(false);
//ui->errorLabel->setText(tr("theShell keeps running into errors."));
} else {
ui->repeatFrame->setVisible(false);
}
ui->titleLabel->setText(tr("Well, this is bad."));
ui->errorLabel->setText(tr("theShell ran into an unrecoverable error."));
ui->restartButton->setText(tr("Restart theShell"));
} 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->errorLabel->setText(tr("theShell wasn't able to start properly."));
ui->restartButton->setText(tr("Try again"));
}
ui->titleLabel->setText(tr("theShell failed to start"));
ui->errorLabel->setText(tr("theShell wasn't able to start properly."));
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");
@ -121,6 +114,6 @@ void ErrorDialog::on_resetTSButton_clicked()
QSettings("theSuite", "theShell").clear();
ui->resetTSButton->setEnabled(false);
ui->resetTSButton->setText("Settings reset successfully");
ui->resetTSButton->setText(tr("Settings reset successfully"));
}
}

10
startsession/errordialog.ui
View file

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

4
statuscenter/OverviewPane/overviewsettings.ui
View file

@ -71,7 +71,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<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 name="wordWrap">
<bool>true</bool>
@ -81,7 +81,7 @@
<item row="0" column="0">
<widget class="QCheckBox" name="weatherCheckBox">
<property name="text">
<string>Show weather for current location (coming soon)</string>
<string>Show weather for current location</string>
</property>
</widget>
</item>

4
statuscenter/OverviewPane/translations/au_AU.ts
View file

@ -95,12 +95,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/cy_GB.ts
View file

@ -95,12 +95,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/da_DK.ts
View file

@ -95,12 +95,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/de_DE.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/en_AU.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/en_GB.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/en_NZ.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/en_US.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/es_ES.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/fr_FR.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/id_ID.ts
View file

@ -95,12 +95,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/it_IT.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/lt_LT.ts
View file

@ -97,12 +97,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/nb_NO.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/nl_NL.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/no_NO.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/pl_PL.ts
View file

@ -97,12 +97,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/pt_BR.ts
View file

@ -96,12 +96,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/ro_RO.ts
View file

@ -97,12 +97,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/ru_RU.ts
View file

@ -97,12 +97,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/sv_SE.ts
View file

@ -97,12 +97,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>

4
statuscenter/OverviewPane/translations/vi_VN.ts
View file

@ -95,12 +95,12 @@
</message>
<message>
<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>
</message>
<message>
<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>
</message>
<message>