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

164 Commits

Author SHA1 Message Date
爬山虎 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
爬山虎 e84ea3b3f7
!32 增加snapcraft应用商店（Linux）入口与标识 
Merge pull request !32 from Joker2770/snapcraft-badges
 2023-02-07 13:02:50 +00:00
Joker2770 8c93f5a7e6 Merge branch 'master' of gitee.com:cxasm/notepad-- into master 
Signed-off-by: Joker2770 <1214220480@qq.com>
 2023-02-07 13:01:29 +00:00
XiaoPb 01a40bf7c3 !21 Cmake兼容Win和Linux下编译 
* 文件编码同步
* !1 部分注释合并
* 修正注释显示异常
* 1. 修改win.mk中Qt_MSVC/MINGW_PREFIX_PATH变量后可以直接进行编译打包
* 优化打包流程
* 支持Win下连同插件一起打包
* Merge branch 'master' of gitee.com:XiaoPb/notepad--
* 优化插件打包脚本
* update linux.mk
* update define "NDD_EXPORT" of Linux
* 1. 去除SPARK依赖
* 1. 优化CMake
* 1. rc文件适配MinGw编译器
* 去除不必要的打印
* 修复linux.mk不兼容CMakeLists.txt问题
* 更正linux.mk的调用
* python版本需要3以上
* 支持到Win下使用Cmake编译
* update CMakeLists.txt
* 修改部分即将废除的api用法
* cmake-version: 将版本降到 3.22 以适用于 cmake 构建
* repo: 对 desktop 文件添加 %F 参数，以保证可正确传入参数
* desktop: 为 desktop 添加文本文件的相关 MimeType
* repo: 引入 Spark 构建，支持构建 Appimage
* repo: 引入 Spark 构建，支持构建 deb
* add cmake support
 2023-02-07 12:49:17 +00:00
Joker2770 137adca49c
!1 update .gitignore. 
Merge pull request !1 from 爬山虎/N/A
 2023-02-07 12:43:47 +00:00
爬山虎 d04007a88a
update .gitignore. 
qm 暂时还是提交一下，这个是翻译后的语言包文件。

Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-07 12:38:40 +00:00
taotieren 061aaf6067 !33 更新 README 中 Arch Linux 说明 
* update README
 2023-02-07 12:31:51 +00:00
爬山虎 542c6be763
!34 针对英文语言版本下的菜单文本适配 
Merge pull request !34 from qucy.yang/master
 2023-02-07 12:28:49 +00:00
steve.yang b2bb8cf57f Adapt menu layout under English version. 
In general, the menu text in English language would be File
instead of File(F). Tested under Debian 11
 2023-02-07 04:36:32 -05:00
joker2770 d989faf991 docs: some adjustments then add missing for README_EN.md. 🔖 
Signed-off-by: joker2770 <1214220480@qq.com>
 2023-02-07 15:35:29 +08:00
joker2770 57b5cc5b8d docs: add badges of Snapcraft-Store for user of Linux. 🎉 
Signed-off-by: joker2770 <1214220480@qq.com>
 2023-02-07 15:29:48 +08:00