!98 #IABL4C【次要】【gg-维哈柯】【屏保】哈柯文，屏保界面休息时间，时分秒显示顺序错误 #IA5AIS【次要】【屏保】mp4动态屏保的预览界面、屏保界面不会循环播放
Merge pull request !98 from liudunfa/openkylin/nile
This commit is contained in:
杨敏
openkylin-cibot
parent
5fcbd2c5b8
commit
1057264440
|
|
@ -0,0 +1,163 @@
|
|||
From: =?utf-8?b?5p2o5pWP?= <yangmin@kylinos.cn>
|
||||
Date: Thu, 15 Aug 2024 03:01:27 +0000
|
||||
Subject: =?utf-8?b?ITk4ICNJQUJMNEPjgJDmrKHopoHjgJHjgJBnZy3nu7Tlk4jmn6/jgJE=?=
|
||||
=?utf-8?b?44CQ5bGP5L+d44CR5ZOI5p+v5paH77yM5bGP5L+d55WM6Z2i5LyR5oGv5pe26Ze0?=
|
||||
=?utf-8?b?77yM5pe25YiG56eS5pi+56S66aG65bqP6ZSZ6K+vICNJQTVBSVPjgJDmrKHopoE=?=
|
||||
=?utf-8?b?44CR44CQ5bGP5L+d44CRbXA05Yqo5oCB5bGP5L+d55qE6aKE6KeI55WM6Z2i44CB?=
|
||||
=?utf-8?b?5bGP5L+d55WM6Z2i5LiN5Lya5b6q546v5pKt5pS+IE1lcmdlIHB1bGwgcmVxdWVz?=
|
||||
=?utf-8?b?dCAhOTggZnJvbSBsaXVkdW5mYS9vcGVua3lsaW4vbmlsZQ==?=
|
||||
|
||||
---
|
||||
data/ukui-screensaver.desktop | 2 +-
|
||||
src/lock-backend/gsettingshelper.cpp | 5 +++++
|
||||
src/lock-dialog/lockdialogmodel.cpp | 3 ++-
|
||||
src/lock-dialog/lockdialogmodel.h | 11 +++++++++++
|
||||
src/lock-dialog/lockdialogperformer.cpp | 1 +
|
||||
src/screensaver/sleeptime.cpp | 9 ++++++++-
|
||||
src/screensaver/videoplayer.cpp | 2 +-
|
||||
src/widgets/lockwidget.cpp | 1 +
|
||||
8 files changed, 30 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/data/ukui-screensaver.desktop b/data/ukui-screensaver.desktop
|
||||
index 9db6658..c701dac 100644
|
||||
--- a/data/ukui-screensaver.desktop
|
||||
+++ b/data/ukui-screensaver.desktop
|
||||
@@ -10,7 +10,7 @@ Comment[zh_CN]=运行屏幕保护及锁定程序
|
||||
Comment[zh_TW]=啟動螢幕保護程式以及鎖定程式
|
||||
Exec=ukui-screensaver-backend
|
||||
NoDisplay=true
|
||||
-X-UKUI-Autostart-Phase=Application
|
||||
+X-UKUI-Autostart-Phase=Initialization
|
||||
X-UKUI-Autostart-Notify=true
|
||||
X-UKUI-Bugzilla-Bugzilla=UKUI
|
||||
X-UKUI-Bugzilla-Product=ukui-screensaver
|
||||
diff --git a/src/lock-backend/gsettingshelper.cpp b/src/lock-backend/gsettingshelper.cpp
|
||||
index 5f1b9af..fd29271 100644
|
||||
--- a/src/lock-backend/gsettingshelper.cpp
|
||||
+++ b/src/lock-backend/gsettingshelper.cpp
|
||||
@@ -220,6 +220,9 @@ bool GSettingsHelper::initThemeStyle()
|
||||
if (keys.contains(KEY_STYLE_NAME)) {
|
||||
m_styleName = m_gsThemeStyle->get(KEY_STYLE_NAME).toString();
|
||||
}
|
||||
+ if (keys.contains(KEY_SYSTEM_FONT)) {
|
||||
+ m_font = m_gsThemeStyle->get(KEY_SYSTEM_FONT).toString();
|
||||
+ }
|
||||
}
|
||||
}
|
||||
return (bool)(m_gsThemeStyle);
|
||||
@@ -673,6 +676,8 @@ QVariant GSettingsHelper::GetThemeStyleConf(QString strKey)
|
||||
varValue = m_menuTransparency;
|
||||
} else if (strKey == KEY_STYLE_NAME) {
|
||||
varValue = m_styleName;
|
||||
+ } else if (strKey == KEY_SYSTEM_FONT) {
|
||||
+ varValue = m_font;
|
||||
}
|
||||
}
|
||||
return varValue;
|
||||
diff --git a/src/lock-dialog/lockdialogmodel.cpp b/src/lock-dialog/lockdialogmodel.cpp
|
||||
index c7d84d7..3802e38 100644
|
||||
--- a/src/lock-dialog/lockdialogmodel.cpp
|
||||
+++ b/src/lock-dialog/lockdialogmodel.cpp
|
||||
@@ -488,7 +488,8 @@ void LockDialogModel::onThemeStyleConfChanged(const QString &key, QVariant value
|
||||
double defaultFontSize = getDefaultFontSize();
|
||||
Q_EMIT fontSizeChanged(m_curFontSize - defaultFontSize);
|
||||
} else if (key == KEY_SYSTEM_FONT) {
|
||||
- Q_EMIT fontChanged(value.toString());
|
||||
+ m_curFont = value.toString();
|
||||
+ Q_EMIT fontChanged(m_curFont);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/lock-dialog/lockdialogmodel.h b/src/lock-dialog/lockdialogmodel.h
|
||||
index 34d1067..72abc20 100644
|
||||
--- a/src/lock-dialog/lockdialogmodel.h
|
||||
+++ b/src/lock-dialog/lockdialogmodel.h
|
||||
@@ -197,6 +197,11 @@ public:
|
||||
m_curFontSize = fontSize;
|
||||
}
|
||||
|
||||
+ void updateSystemFont(QString font)
|
||||
+ {
|
||||
+ m_curFont = font;
|
||||
+ }
|
||||
+
|
||||
void updateSessionLogoutMusic(bool logoutMusic)
|
||||
{
|
||||
m_logoutMusic = logoutMusic;
|
||||
@@ -333,6 +338,11 @@ public:
|
||||
return m_loggedinUsersCount;
|
||||
}
|
||||
|
||||
+ inline QString getCurFont()
|
||||
+ {
|
||||
+ return m_curFont;
|
||||
+ }
|
||||
+
|
||||
double getCurFontSize();
|
||||
|
||||
static double getPtToPx();
|
||||
@@ -614,6 +624,7 @@ private:
|
||||
int m_lockTimeout = 10;
|
||||
bool m_lockEnabled = true;
|
||||
double m_curFontSize;
|
||||
+ QString m_curFont;
|
||||
bool m_sleepActivationEnabled = false;
|
||||
|
||||
bool m_tabletMode = false;
|
||||
diff --git a/src/lock-dialog/lockdialogperformer.cpp b/src/lock-dialog/lockdialogperformer.cpp
|
||||
index 79ae81e..8a5afeb 100644
|
||||
--- a/src/lock-dialog/lockdialogperformer.cpp
|
||||
+++ b/src/lock-dialog/lockdialogperformer.cpp
|
||||
@@ -226,6 +226,7 @@ void LockDialogPerformer::initData()
|
||||
m_modelLockDialog->updateSleepActivationEnabled(
|
||||
m_bdHelper->getLockScreenConf(KEY_SLEEP_ACTIVATION_ENABLED).toBool());
|
||||
m_modelLockDialog->updateSystemFontSize(m_bdHelper->getThemeStyleConf(KEY_SYSTEM_FONT_SIZE).toDouble());
|
||||
+ m_modelLockDialog->updateSystemFont(m_bdHelper->getThemeStyleConf(KEY_SYSTEM_FONT).toString());
|
||||
m_modelLockDialog->updateTabletMode(m_bdHelper->getCurTabletMode());
|
||||
m_modelLockDialog->updateSessionLogoutMusic(m_bdHelper->getSessionConf(KEY_SESSION_LOGOUT_MUSIC).toBool());
|
||||
m_modelLockDialog->updateSessionPoweroffMusic(m_bdHelper->getSessionConf(KEY_SESSION_POWEROFF_MUSIC).toBool());
|
||||
diff --git a/src/screensaver/sleeptime.cpp b/src/screensaver/sleeptime.cpp
|
||||
index 36460c2..428bc7a 100644
|
||||
--- a/src/screensaver/sleeptime.cpp
|
||||
+++ b/src/screensaver/sleeptime.cpp
|
||||
@@ -37,7 +37,14 @@ SleepTime::~SleepTime() {}
|
||||
void SleepTime::init()
|
||||
{
|
||||
layout = new QHBoxLayout(this);
|
||||
- layout->setDirection(QBoxLayout::RightToLeft);
|
||||
+ QLocale local;
|
||||
+ QString systemLang = local.name();
|
||||
+ if (systemLang == "ug_CN" || systemLang == "ky_KG" || systemLang == "kk_KZ") {
|
||||
+ layout->setDirection(QBoxLayout::LeftToRight);
|
||||
+ } else {
|
||||
+ layout->setDirection(QBoxLayout::RightToLeft);
|
||||
+ }
|
||||
+// layout->setDirection(QBoxLayout::RightToLeft);
|
||||
layout->setSpacing(8);
|
||||
curFontSize = configuration->getFontSize();
|
||||
sysFont = qApp->font();
|
||||
diff --git a/src/screensaver/videoplayer.cpp b/src/screensaver/videoplayer.cpp
|
||||
index 64d8fef..4723195 100644
|
||||
--- a/src/screensaver/videoplayer.cpp
|
||||
+++ b/src/screensaver/videoplayer.cpp
|
||||
@@ -70,7 +70,7 @@ void VideoPlayer::updatePosition(qint64 position)
|
||||
m_player->setMedia(QMediaContent(QUrl::fromLocalFile(m_filePath)));
|
||||
m_player->setPosition(1);
|
||||
m_player->play();
|
||||
- } else if (position && position == video_Duration) { //视频当前播放帧数 = 视频总时长
|
||||
+ } else if (position && (position == video_Duration || position == m_player->duration())) { //视频当前播放帧数 = 视频总时长
|
||||
m_player->setMedia(QMediaContent(QUrl::fromLocalFile(m_filePath)));
|
||||
m_player->setPosition(1);
|
||||
m_player->play();
|
||||
diff --git a/src/widgets/lockwidget.cpp b/src/widgets/lockwidget.cpp
|
||||
index 89413db..673dea1 100644
|
||||
--- a/src/widgets/lockwidget.cpp
|
||||
+++ b/src/widgets/lockwidget.cpp
|
||||
@@ -339,6 +339,7 @@ void LockWidget::initUI()
|
||||
|
||||
authDialog = new AuthDialog(m_modelLockDialog, m_curUserInfo, this);
|
||||
authDialog->installEventFilter(this);
|
||||
+ m_curFont = m_modelLockDialog->getCurFont();
|
||||
m_ptToPx = m_modelLockDialog->getPtToPx();
|
||||
m_curFontSize = m_modelLockDialog->getCurFontSize();
|
||||
QLocale local;
|
||||
|
|
@ -51,3 +51,4 @@
|
|||
0051-95-tab.patch
|
||||
0052-94.patch
|
||||
0053-97-fixbug.patch
|
||||
0054-98-IABL4C-gg-IA5AIS-mp4.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue