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

63 Commits

Author SHA1 Message Date
zinface 7c9c38042e Bugs: 处理一些在 Visual Studio 中引发无法构建的问题 
1. Bug: 在 Visual Studio 中引发无法构建的问题，此处被重复定义(在 cmake 中已对其定义)
// #define NO_PLUGIN 1

2. Bug: 在 Visual Studio 中引发无法构建的问题，此处为无法找到 qmyedit_x 库
//#pragma comment(lib, "qmyedit_qt5d.lib")
#else
//#pragma comment(lib, "qmyedit_qt5.lib")

3. 虽然 QSci 被用于静态构建，但 cmake 中未设置导出宏 QSCINTILLA_MAKE_DLL
 2023-02-20 20:03:28 +08:00
zinface 7cf57ceb36 bug: 在 Visual Studio 中引发无法构建的问题，此处被锁定构建为动态库 2023-02-19 16:59:44 +08:00
zinface 5037d17503 Merge branch 'convert-next-cmake' into develop 2023-02-19 04:03:34 +08:00
爬山虎 696dd9fd45
update src/qscint/src/qscilexerr.cpp. 
解决Linux下编译错误

Signed-off-by: 爬山虎 <aaasjm@126.com>
 2023-02-15 14:00:53 +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
zinface bfade94164 pluginGl: 调整 if defined 检查的结构 2023-02-12 23:07:39 +08:00
爬山虎 24f4f6114e 整体合入v1.22.2的代码 2023-02-11 11:09:17 +08:00
zinface 2b9774a171 pluginGl: 增加 NOTEPAD_PLUGIN_[METADATA|IMPLEMENT] 宏 
依赖 NOTEPAD_PLUGIN_MANAGER 提供
 2023-02-10 09:46:34 +08: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
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
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
zinface 2026803d8a pluginGl: 添加 NOTEPAD_PLUGIN_MANAGER 控制宏提供插件模板 2023-02-08 03:10:59 +08: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
taotieren 061aaf6067 !33 更新 README 中 Arch Linux 说明 
* update README
 2023-02-07 12:31:51 +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
zinface 73bb01ce79 cmake-version: 将版本降到 3.22 以适用于 cmake 构建 2023-02-07 10:28:25 +08:00
coconil 8c2478f6fa add cmake support 2023-02-07 10:28:25 +08:00
Viktor M 28d6f52cce Added Better English Translation on Some Elements, Made About Widget look more pleasing, Changed Navigation Panel a Bit 2023-02-06 21:51:58 +01:00
Kamey03 f0e49d5220
Fixed some grammar errors in the code. 
I have fixed some grammar errors in the code that I encountered while using the program regularly. If I come across more, I will make further modifications.

PREVIEW: https://i.328888.xyz/2023/02/06/rwrEb.png

Signed-off-by: Kamey03 <viktor@milivojevic.in.rs>
 2023-02-06 05:57:24 +00:00
zinface cce6486518 linux/desktop: 在文件中 Categories 部分添加 Office 办公分类 2023-02-05 17:43:39 +08:00
zinface 031c14c83f linux/desktop: 在文件尾部增加 空行 2023-02-05 17:15:12 +08:00
zinface 0d1ee9121d linux/desktop: 添加与文本编辑相关的 MimeType 2023-02-05 17:08:09 +08:00
zinface 1195a69b3c linux/desktop: 重新布局文件内容结构 2023-02-05 17:05:42 +08:00
爬山虎 78e6e39ca6
!12 增加cmake支持 
Merge pull request !12 from coconi/cmake_support
 2023-02-04 15:13:46 +00:00
coconil a17092cbbc Merge branch 'master' into cmake_support 2023-02-03 21:01:30 +08:00
coconil 5c92b8aca9 decrease required cmake version 2023-02-03 21:00:18 +08:00
woclass 3f3710a5c3
修改 "换行符转换" 菜单名称 
Signed-off-by: woclass <git@wo-class.cn>
 2023-02-03 11:25:37 +00:00
爬山虎 b9b208385e
!17 解决linux构建失败问题 
Merge pull request !17 from coconi/fix_linux_build_fail
 2023-02-03 02:53:42 +00:00
爬山虎 7231a7365d 解决linux编译错误 2023-02-03 10:22:18 +08:00
coconil fcfb3a75a6 fix build fail on linux 2023-02-02 23:25:25 +08:00
爬山虎 6f36d96cdd Merge branch 'master' of https://gitee.com/cxasm/notepad-- 2023-02-02 22:50:41 +08:00
爬山虎 8d636dbf70 提交1.22.0的代码 2023-02-02 22:49:54 +08:00
coconil a949502b09 Merge branch 'master' into cmake_support 2023-02-02 21:42:22 +08:00
爬山虎 363eac6a06
!4 修复 vs2019 编译缺少 memory 头文件问题 
Merge pull request !4 from huangning290/master
 2023-02-02 13:21:48 +00:00
coconil 663df77bb3 add cpack for create linux package 2023-02-01 18:08:29 +08:00
streamlet_hy b4a0838450
Add loongarch64 compile support 
Signed-off-by: streamlet_hy <huangyang@loongson.cn>
 2023-02-01 01:37:15 +00:00
爬山虎 2c8c1d9d0f
!13 修复编译错误 
Merge pull request !13 from taotieren/fix-build-errors
 2023-01-31 15:03:57 +00:00
taotieren 50a6101c8b
Fix build errors 2023-01-31 22:43:46 +08:00
coconil 0940320b60 add cmake support 2023-01-31 22:17:32 +08:00
taotieren a921edd804
Add AUR:notepad---git 2023-01-31 21:59:37 +08:00
huangning2 7229823c29 修复 vs2019 编译无法识别 std::unique_ptr 2023-01-29 15:36:59 +08:00