P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
174 Commits 10 Branches 30 Tags 69 MiB
Commit Graph

174 Commits

Author SHA1 Message Date
爬山虎 61abdf0c4c
!65 美化界面 
Merge pull request !65 from cleverxiao/develop
 2023-03-14 14:35:44 +00:00
cleverxiao c3db4ae41d 美化界面 2023-03-14 11:16:34 +08:00
爬山虎 2b3e9b6314
!63 美化界面 
Merge pull request !63 from cleverxiao/develop
 2023-03-10 12:26:36 +00:00
cleverxiao 64c94e549b Merge branch 'develop' of gitee.com:cleverxiao/notepad-- into develop 2023-03-10 17:44:09 +08:00
cleverxiao 404d48b887 美化界面 2023-03-10 17:40:11 +08:00
爬山虎 1d92b5a968
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-03-08 06:35:10 +00:00
爬山虎 6443e8276e
!60 二进制文件选择内容二进制部分和文本部分同步 
Merge pull request !60 from ansicheng/develop-bin-update
 2023-03-04 06:45:17 +00:00
asc 6d8d8b9ab9 二进制文件选择二进制部分和文本部分同步 2023-03-03 23:48:22 +08:00
爬山虎 c1ae9ac45b
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-03-02 01:35:25 +00:00
爬山虎 e0a669e5f5 1.23.2编译错误 2023-03-02 09:21:31 +08:00
爬山虎 05d6ee04b4 1.23.2编译错误 2023-03-02 09:17:07 +08:00
爬山虎 f959e1af1c 1.23.2编译错误 2023-03-02 09:12:28 +08:00
爬山虎 d4754cf643
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-27 01:12:53 +00:00
爬山虎 d387e50d70
重命名 how_bild 为 how_build 2023-02-26 08:50:23 +00:00
爬山虎 8c00739322
!56 开发分支1.23.2代码合入主分支。 
Merge pull request !56 from 爬山虎/develop
 2023-02-26 06:20:34 +00:00
爬山虎 29ff67607f 1.23.2代码合入，整理编译目录 2023-02-26 14:19:08 +08:00
爬山虎 aaf7010cb2 1.23.2 发布，代码整体合入 2023-02-26 14:10:35 +08:00
爬山虎 079483ab87
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-26 05:43:24 +00:00
爬山虎 5e351bd1a2
!55 update src/findresultwin.cpp. 
Merge pull request !55 from XiaoPb/N/A
 2023-02-24 11:29:46 +00:00
XiaoPb 2eae8163e0
update src/findresultwin.cpp. 
Item.model()->index(i, 0, Item)代替Item.child(i, 0)
消除警告，更新用法。
 2023-02-21 13:44:05 +00:00
爬山虎 da61adb9a2
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-19 12:01:58 +00:00
爬山虎 696dd9fd45
update src/qscint/src/qscilexerr.cpp. 
解决Linux下编译错误

Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-15 14:00:53 +00:00
爬山虎 b938e02e77
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-14 02:46:07 +00:00
爬山虎 c338fc5d54
update README.md. 
修改Readme，避免不必要的口水战。

Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-14 02:38:36 +00:00
爬山虎 5d2266e53a
!50 开发分支1.22.2代码合入主分支。 
Merge pull request !50 from 爬山虎/develop
 2023-02-13 13:33:06 +00:00
爬山虎 169101cc2e 更新插件接口说明 2023-02-13 13:27:30 +00:00
爬山虎 ab92d95baf 统一修改编码为utf8-bom 2023-02-13 13:27:30 +00:00
爬山虎 c8c0a8be8b 重新调整插件的功能 2023-02-13 13:27:30 +00:00
joker2770 600bcb50a8 style: remove personalized files. ⬇️ 2023-02-13 13:27:30 +00:00
joker2770 0a6486efc2 fix: use "" instead. 🐛 🚧 2023-02-13 13:27:30 +00:00
爬山虎 91b8a46c80
update README.md. 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-13 05:58:41 +00:00
爬山虎 cb2398b2e5
!47 开发分支1.22.2代码合入主分支。 
Merge pull request !47 from 爬山虎/develop
 2023-02-11 03:21:07 +00:00
爬山虎 24f4f6114e 整体合入v1.22.2的代码 2023-02-11 11:09:17 +08:00
爬山虎 53ed334a5a
update README.md. 
缩短readme长度

Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-08 14:24:19 +00:00
爬山虎 7764effe2a
!37 "关于"窗口 仅显式关闭按钮 
Merge pull request !37 from woclass/about
 2023-02-08 12:34:27 +00:00
woclass 27b3ebf80b
Merge branch 'master' into about 2023-02-08 17:29:21 +08:00
爬山虎 f48ee6b5b3
!40 修复用CMake构建时不指定CMAKE_BUILD_TYPE参数报错问题 
Merge pull request !40 from Joker2770/cmake_fix20230208
 2023-02-08 09:07:21 +00:00
爬山虎 214ad0c114
!39 Enhancements to Navigation Bar and English Translations, Redesign of About Window with GPLv3 License (2) 
Merge pull request !39 from Kamey03/kameys
 2023-02-08 08:40:39 +00:00
joker2770 4afae56048 fix: some adjustments. 2023-02-08 15:49:32 +08:00
Kamey03 23542e7b82 Merge branch 'master' of gitee.com:cxasm/notepad-- into kameys 
Tried to resolve conflicts, don't know chinese well to understand what the editor was saying, this is my best effort, if this turns out to be wrong, I will just remake this on github instead as I'm familiar with github.

Signed-off-by: Kamey03 <viktor@milivojevic.in.rs>
 2023-02-08 06:29:37 +00:00
爬山虎 5953225601
update src/cceditor/ccnotepad.ui.解决冲突 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-08 04:20:17 +00:00
爬山虎 96f3a14311
update src/cceditor/ccnotepad.ui. 手动解决冲突。 
Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-08 04:14:39 +00:00
爬山虎 acab944940
!38 菜单项 "Feedback/bugfix" 窗口：使用可点击的连接 
Merge pull request !38 from woclass/bugfix-link
 2023-02-08 04:01:23 +00:00
woclass 134e2e2492
Update aboutndd.cpp 修复缩进 2023-02-08 11:32:16 +08:00
woclass 75da446564
Update ccnotepad.cpp 使用可点击的连接 2023-02-08 11:29:06 +08:00
woclass 642de93f05
Update aboutndd.cpp 隐藏最大化、最小化按钮 2023-02-08 10:44:07 +08:00
爬山虎 27926687bc
!31 在gitignore新增项，以阻止不必要文件推送到仓库 
Merge pull request !31 from Joker2770/master
 2023-02-07 13:16:13 +00:00
Joker2770 4f0d854393
update .gitignore. 
Signed-off-by: Joker2770 <1214220480@qq.com>
 2023-02-07 13:11:10 +00:00
爬山虎 3568f12a39
!36 回退 'Pull Request !32 : 增加snapcraft应用商店（Linux）入口与标识' 
Merge pull request !36 from 爬山虎/revert-merge-32-master
 2023-02-07 13:08:10 +00:00
爬山虎 eaaf1d1ae9
回退 'Pull Request !32 : 增加snapcraft应用商店（Linux）入口与标识' 2023-02-07 13:06:37 +00:00