Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dde-abrecovery/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ int main(int argc, char *argv[])
a.setQuitOnLastWindowClosed(false);

QTranslator translator;
translator.load("/usr/share/deepin-update-ui/translations/dde-rollback_" + getCurrentLocale());
if (!translator.load("/usr/share/deepin-update-ui/translations/dde-rollback_" + getCurrentLocale())) {
qWarning() << "Failed to load translation file for locale" << getCurrentLocale();
}

a.installTranslator(&translator);

DLogManager::registerConsoleAppender();
Expand Down
2 changes: 1 addition & 1 deletion src/dde-update/checksystemwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ ErrorFrame::ErrorFrame(QWidget *parent)

m_buttonSpacer->changeSize(0, 0);
m_titleSpacer->changeSize(0, 0);
m_iconLabel->setPixmap(DHiDPIHelper::loadNxPixmap(":img/failed.svg"));
m_iconLabel->setPixmap(DIcon::loadNxPixmap(":img/failed.svg"));
const QList<UpdateModel::UpdateAction> actions = {{UpdateModel::Reboot, UpdateModel::EnterDesktop}};
m_title->setText(tr("Checked for some errors"));

Expand Down
8 changes: 4 additions & 4 deletions src/dde-update/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ int main(int argc, char *argv[])

// qt默认当最后一个窗口析构后,会自动退出程序,这里设置成false,防止插拔时,没有屏幕,导致进程退出
QApplication::setQuitOnLastWindowClosed(false);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);

DApplication *app = nullptr;
#if (DTK_VERSION < DTK_VERSION_CHECK(5, 4, 0, 0))
Expand All @@ -41,8 +40,6 @@ int main(int argc, char *argv[])

// qt默认当最后一个窗口析构后,会自动退出程序,这里设置成false,防止插拔时,没有屏幕,导致进程退出
QApplication::setQuitOnLastWindowClosed(false);
//解决Qt在Retina屏幕上图片模糊问题
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
app->setOrganizationName("deepin");
app->setApplicationName("dde-update");
app->setApplicationVersion("2015.1.0");
Expand Down Expand Up @@ -84,7 +81,10 @@ int main(int argc, char *argv[])
DGuiApplicationHelper::instance()->setApplicationPalette(pa);

QTranslator translatorLanguage;
translatorLanguage.load("/usr/share/deepin-update-ui/translations/dde-update_" + getCurrentLocale());
if (!translatorLanguage.load("/usr/share/deepin-update-ui/translations/dde-update_" + getCurrentLocale())) {
qWarning() << "Failed to load translation file for locale" << getCurrentLocale();
}

app->installTranslator(&translatorLanguage);

UpdateWorker::instance()->init();
Expand Down