107 Commits

Author SHA1 Message Date
ll-eleven 518fca53a7 休眠睡眠也等待界面消失后在执行 2022-04-19 16:55:14 +08:00
tanjing 1c6a46d807 修复bug115375 盘古机器tools界面在某些时候不响应按键 2022-04-15 11:02:12 +08:00
tanjing a1e447738e Merge branch 'master' of http://gitlab2.kylin.com/kylin-desktop/ukui-session-manager into tanjing_develop_new 2022-03-30 16:29:05 +08:00
tanjing 8125a11422 修复bug110655 提示居中 2022-03-30 10:25:59 +08:00
tanjing 269f83b3da 修复bug109430 命令行直接重启关机,阻止的情况下不显示确认按钮 2022-03-29 14:17:42 +08:00
tanjing 8e349e22a2 tool界面起来之前判断当前是否处于锁屏状态及ukui3.1系统监视按钮patch 2022-03-22 17:05:55 +08:00
ll-eleven 6f80625d18 同步Develop代码到master分支 2022-03-22 15:48:08 +08:00
tanjing 0e063e22bf tools界面判断当前是否锁屏 2022-03-22 14:27:25 +08:00
tanjing 82a976a23e 明确阻止操作弹窗中具体操作内容 2022-02-16 17:35:40 +08:00
tanjing 1d21593276 修改bug106545 弹窗中sleep单词错误 2022-02-16 15:46:31 +08:00
tanjing 0fb5ae5e7f 同步dev 2022-01-18 13:44:43 +08:00
tanjing e91547d1fd 同步dev 2022-01-18 11:45:08 +08:00
tanjing 848e72e049 添加配置文件 修改鼠标键盘选中逻辑等 2022-01-17 17:14:31 +08:00
ll-eleven a869f5e178 更新播放音乐定时时间 2022-01-07 20:33:27 +08:00
ll-eleven 1846efd668 更新翻译文件,直接安转流程优化 2021-12-28 18:01:03 +08:00
ll-eleven 31486ab074 等待应用退出倒计时缩减到2s,命令关机执行的是重启问题修复 2021-12-02 11:26:31 +08:00
zhouxiaofeng 4657f7b78a 去掉session-tools废弃的--window命令以及相关文件 2021-11-23 11:23:56 +08:00
zhouxiaofeng 638f176424 代码格式调整 2021-11-23 09:02:11 +08:00
ll-eleven e69dedd90a XSMP Protocol support 2021-11-18 17:37:59 +08:00
liu liang 74b2560fe5 Merge branch 'Develop' into 'xsmpserver'
# Conflicts:
#   debian/changelog
#   tools/main.cpp
#   tools/mainwindow.cpp
#   tools/mainwindow.h
#   tools/powerprovider.cpp
#   ukui-session/idlewatcher.cpp
#   ukui-session/idlewatcher.h
#   ukui-session/main.cpp
#   ukui-session/modulemanager.cpp
#   ukui-session/modulemanager.h
#   ukui-session/sessionapplication.cpp
#   ukui-session/sessionapplication.h
#   ukui-session/sessiondbusadaptor.h
#   ukui-session/usminhibit.cpp
#   ukui-session/usminhibit.h
2021-11-16 07:20:50 +00:00
ll-eleven a8f0ab690e merge branch hw9x0 2021-11-15 15:16:40 +08:00
handsome-feng 9911566c09 Fix conflict 2021-09-30 17:19:42 +08:00
zhouxiaofeng 499e7f996d 合并主分支的提交 2021-09-23 17:13:19 +08:00
zhouxiaofeng 5d2ca005c9 code format 2021-09-23 16:15:07 +08:00
zhouxiaofeng b3d56dd068 code format 2021-09-23 15:43:53 +08:00