74 lines
3.0 KiB
Diff
74 lines
3.0 KiB
Diff
From 79aedc7ca92b610a806c2a3cf4c29fb5396c360d Mon Sep 17 00:00:00 2001
|
|
From: myshow <296570182@qq.com>
|
|
Date: Tue, 8 Dec 2020 17:52:53 +0800
|
|
Subject: [PATCH 1/2] fix-icon-misplaced
|
|
|
|
---
|
|
ukui-greeter/greeter/greeterwindow.cpp | 11 +++++------
|
|
ukui-greeter/ukui-greeter.pro | 2 +-
|
|
2 files changed, 6 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/ukui-greeter/greeter/greeterwindow.cpp b/ukui-greeter/greeter/greeterwindow.cpp
|
|
index 76e6953..5722bed 100644
|
|
--- a/ukui-greeter/greeter/greeterwindow.cpp
|
|
+++ b/ukui-greeter/greeter/greeterwindow.cpp
|
|
@@ -153,8 +153,8 @@ void GreeterWindow::initUI()
|
|
m_sessionLB->setFixedSize(48, 48);
|
|
m_sessionLB->setCursor(Qt::PointingHandCursor);
|
|
m_sessionLB->installEventFilter(this);
|
|
- m_sessionLB->setToolTip(tr("Set the desktop environment for the selected user to log in. \
|
|
- If the user is logged in, it will take effect after logging in again"));
|
|
+ m_sessionLB->setToolTip(tr("Set the desktop environment for the selected user to log in. \
|
|
+ If the user is logged in, it will take effect after logging in again"));
|
|
m_sessionLB->setIcon(QIcon(IMAGE_DIR + QString("badges/unknown_badge.svg")));
|
|
onSessionChanged(m_greeter->defaultSessionHint());
|
|
connect(m_sessionLB, &QPushButton::clicked, this, &GreeterWindow::showSessionWnd);
|
|
@@ -263,7 +263,7 @@ void GreeterWindow::resizeEvent(QResizeEvent *event)
|
|
QSize size = event->size();
|
|
//重新计算缩放比例
|
|
scale = QString::number(size.width() / 1920.0, 'f', 1).toFloat();
|
|
-
|
|
+
|
|
if(scale > 1)
|
|
scale = 1;
|
|
fontSize = scale > 0.5 ? 10 : 8;
|
|
@@ -413,7 +413,7 @@ void GreeterWindow::setBackground(const QModelIndex &index)
|
|
QString backgroundPath;
|
|
|
|
bool useUserBackground = false;
|
|
-
|
|
+
|
|
//读取/var/lib/lightdm-date/用户名/ukui-greeter.conf,
|
|
//判断是否设置了该用户的登陆界面的背景图片.
|
|
QString userConfigurePath = m_greeter->getEnsureShareDir(index.data(QLightDM::UsersModel::NameRole).toString()) + "/ukui-greeter.conf";
|
|
@@ -700,7 +700,7 @@ void GreeterWindow::showSessionWnd()
|
|
if(!m_sessionWnd){
|
|
m_sessionWnd = new SessionWindow(m_sessionsModel, this);
|
|
|
|
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
|
|
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
|
|
m_sessionWnd->setStyleSheet("QMenu::item{padding: 2px 10px 2px 10px;}");
|
|
#else
|
|
m_sessionWnd->setStyleSheet("QMenu::item{padding: 2px 10px 2px 30px;}");
|
|
@@ -786,4 +786,3 @@ bool GreeterWindow::sessionIsValid(const QString &session)
|
|
}
|
|
return false;
|
|
}
|
|
-
|
|
diff --git a/ukui-greeter/ukui-greeter.pro b/ukui-greeter/ukui-greeter.pro
|
|
index a71b2d8..929ef7b 100644
|
|
--- a/ukui-greeter/ukui-greeter.pro
|
|
+++ b/ukui-greeter/ukui-greeter.pro
|
|
@@ -79,7 +79,7 @@ TRANSLATIONS += translations/zh_CN.ts \
|
|
translations/tr.ts \
|
|
translations/es.ts
|
|
|
|
-system("lrelease translations/*.ts")
|
|
+system("lrelease-qt5 translations/*.ts")
|
|
|
|
qm_file.files = translations/*.qm
|
|
qm_file.path = $${PREFIX}/translations/
|
|
--
|
|
2.29.2.windows.2
|
|
|