42 Commits
Author SHA1 Message Date
李鑫 0ed89e3f4f Merge branch 'master' into 'master'
3.2.0-0k9

See merge request kylin-desktop/ukui-notebook!37
2022-08-19 07:18:45 +00:00
李鑫 907974300c Merge branch 'master' into 'master'
3.2.0-0k7

See merge request kylin-desktop/ukui-notebook!36
2022-08-11 08:41:49 +00:00
李鑫 2966122270 Merge branch 'master' into 'master'
3.2.0-0k5

See merge request kylin-desktop/ukui-notebook!35
2022-07-25 03:06:15 +00:00
李鑫 87e3182ac0 Merge branch 'master' into 'master'
3.2.0-0k1

See merge request kylin-desktop/ukui-notebook!34
2022-06-24 02:35:59 +00:00
李鑫 341b222b92 Merge branch 'master' into 'master'
3.1.2-0k0版本

See merge request kylin-desktop/ukui-notebook!33
2022-06-06 08:13:31 +00:00
李鑫 fa6349b975 Merge branch 'master' into 'master'
3.1.1.2-0k0 版本

See merge request kylin-desktop/ukui-notebook!32
2022-06-02 07:45:54 +00:00
Xin Li a8e6ddd54c Merge branch 'develop' into 'master'
便签名称处理

See merge request kylin-desktop/ukui-notebook!28
2022-03-07 08:54:12 +00:00
Xin Li 0be0ba74fb Merge branch 'master' into 'master'
3.1.1

See merge request kylin-desktop/ukui-notebook!23
2021-12-28 05:46:08 +00:00
Xin Li 99fa92c0cb Merge branch 'master' into 'master'
3.1.0-1-0043

See merge request kylin-desktop/ukui-notebook!21
2021-12-21 07:53:23 +00:00
Xin Li 68414a2cf6 Merge branch 'master' into 'master'
增加用户手册

See merge request kylin-desktop/ukui-notebook!22
2021-12-21 02:22:39 +00:00
Xin Li 457e19d2b3 fix(ui):bug #97268 2021-12-14 20:59:35 +08:00
Xin Li 527d7a218e Merge branch 'dev' into 'master'
修改SP2界面问题

See merge request kylin-desktop/ukui-notebook!18
2021-12-14 12:56:23 +00:00
Xin Li 7f5cce59ee [Merge] 解决冲突 branch 'master' into 'dev'
# Conflicts:
#   src/editPage.cpp
#   src/editPage.h
2021-12-13 06:41:09 +00:00
Xin Li 5700c1422e Use theme pop window instead of frameless windows. 2021-12-13 14:26:48 +08:00
Xin Li 361d37c745 Modify segment fault error... 2021-12-09 13:41:02 +08:00
Xin Li 668241ad65 Fix UI bugs. 2021-12-08 20:50:26 +08:00
Xin Li ab7c742e3a Fix Bug #93662. Modify List UI 2021-12-06 15:26:21 +08:00
Xin Li 806d218217 Modify UI bugs and add new interface 'get all notes' 2021-11-29 09:28:48 +08:00
Xin Li a2a8a6e157 Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-23 16:55:54 +08:00
Xin Li d3bb64b12b Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-23 16:55:21 +08:00
Xin Li 34a7200a2d Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-22 13:55:45 +08:00
Xin Li 97b40a51ee 修改颜色UI并合并launchpad最新代码 2021-11-22 13:55:11 +08:00
Xin Li cce2c7d472 Merge branch 'dev' of http://172.20.191.209/lixin/ukui-notebook into dev 2021-11-22 13:45:01 +08:00
Xin Li dc8a9d8c40 Change hover color, modify font color ui. 2021-11-22 13:42:41 +08:00
Xin Li e6f25952a5 同步Launchpad 2021-11-22 09:42:33 +08:00
Xin Li e9258919bf Fix bug #90510; 2021-11-22 07:22:19 +08:00
Xin Li c6492b7ba9 Modify UI according to designer's advise. 2021-11-18 17:30:19 +08:00
Xin Li 7ded815fb6 修改编码规范;修改点击字体颜色代码 2021-11-15 16:58:21 +08:00
Xin Li 30509aae5c Sync launchpad 0038 2021-11-15 09:51:11 +08:00
Xin Li 56a1dcf8cb 增加藏文桌面文件,同步changelog 2021-11-09 15:34:06 +08:00
Xin Li 978ed2e7e2 Merge branch 'master' of http://172.20.191.209/kylin-desktop/ukui-notebook 2021-11-09 15:31:14 +08:00
Xin Li fb36c6e391 Merge branch 'revert-3136f304' into 'master'
Revert "Merge branch 'dev'"

See merge request lixin/ukui-notebook!2
2021-11-04 07:14:00 +00:00
Xin Li beef67d1e7 Revert "Merge branch 'dev'"
This reverts commit 3136f304cb
2021-11-04 07:13:43 +00:00
Xin Li 3136f304cb Merge branch 'dev' 2021-11-04 15:02:15 +08:00
Xin Li 2fd36b1c1d Merge branch 'master' into 'master'
fix_bug_71062

See merge request lixin/ukui-notebook!1
2021-11-04 06:46:49 +00:00
Xin Li 8b64d8d407 Update translation of right click menu. 2021-10-18 14:27:20 +08:00
Xin Li 8f74f573bf Close edit widget when delete it. 2021-10-18 13:53:25 +08:00
Xin Li f8f2d025c8 Add right menu of NoteView.
Comment UKUI3.1 features.
2021-10-15 17:26:30 +08:00
Xin Li 6367d162e7 Update right menu. 2021-10-13 12:01:24 +08:00
Xin Li 5128afbed3 Add menu of listview 2021-10-13 09:07:50 +08:00
Xin Li 8b0cb04a0b Update translations.Fix Bug #82847 2021-09-26 09:48:55 +08:00
Xin Li 930c214b59 [bug #81092]Load QT's qm file. 2021-09-24 17:10:39 +08:00