Commit Graph

120 Commits

Author SHA1 Message Date
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
爬山虎 3a01b65839
update README.md.
Signed-off-by: 爬山虎 <aaasjm@126.com>
2023-02-07 07:12:31 +00:00
joker2770 88ba9e913b feats: add gitignore for temporary files of Qt, build results, and so on.
Signed-off-by: joker2770 <1214220480@qq.com>
2023-02-07 14:51:53 +08:00
爬山虎 664c8184e7
!25 Add openSUSE Tumbleweed installation instructions to README.md.
Merge pull request !25 from Kamey03/N/A
2023-02-07 01:44:34 +00:00
爬山虎 f22574122b
!26 Fixed some grammar errors in the code.
Merge pull request !26 from Kamey03/N/A
2023-02-07 01:41:34 +00:00
爬山虎 c26f9ba3f8
!27 add README_EN.md.
Merge pull request !27 from Kamey03/N/A
2023-02-07 01:35:14 +00:00
爬山虎 c1b1ab3f87
!28 Update README.md to Add Multi-Language Support
Merge pull request !28 from Kamey03/N/A
2023-02-07 01:25:07 +00:00
Kamey03 ccfa002379
Update README.md to Add Multi-Language Support
Add Multi-Language Support.

Signed-off-by: Kamey03 <viktor@milivojevic.in.rs>
2023-02-06 17:55:56 +00:00
Kamey03 66cbadfe0d
add README_EN.md.
Add English language readme to this software For the convenience of foreign users.

Signed-off-by: Kamey03 <viktor@milivojevic.in.rs>
2023-02-06 17:53:55 +00: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
Kamey03 1f8a5a3629
I've added the instructions for installing the compile environment and Qt tools and libraries on openSUSE Tumbleweed, along with how to configure and compile the code, and package it using OBS. The instructions have been added to the README.md file.
This commit will make it easier for users who are using openSUSE Tumbleweed to get started with the project.

Signed-off-by: Kamey03 <viktor@milivojevic.in.rs>
2023-02-06 03:46:17 +00:00
爬山虎 3153bab4e2
!20 linux/desktop: 重新布局文件内容并增加文本编辑相关的 MimeType
Merge pull request !20 from zinface/linux-desktop-refactor
2023-02-06 02:13:15 +00:00
爬山虎 492f952ce1
!19 update README.md.
Merge pull request !19 from Joker2770/N/A
2023-02-06 02:00:41 +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
Joker2770 999501eef4
update README.md.
适当整理下项目文档:
1、整理归类,添加标题,便于文档目录生成;
2、修改下MarkDown格式,使得信息更醒目;

Signed-off-by: Joker2770 <1214220480@qq.com>
2023-02-05 02:39:07 +00:00
爬山虎 78e6e39ca6
!12 增加cmake支持
Merge pull request !12 from coconi/cmake_support
2023-02-04 15:13:46 +00:00
爬山虎 0de6fe9f41
!15 添加第三方依赖版权说明
Merge pull request !15 from woclass/N/A
2023-02-03 14:40:48 +00:00
爬山虎 c4cf588141
!18 修改 "换行符转换" 菜单名称
Merge pull request !18 from woclass/N/A
2023-02-03 14:38:14 +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
爬山虎 b0889ae1eb
update README.md.
Signed-off-by: 爬山虎 <aaasjm@126.com>
2023-02-03 01:10:40 +00:00
爬山虎 ee2513206e
update README.md.
有什么违规信息,没理解。

Signed-off-by: 爬山虎 <aaasjm@126.com>
2023-02-03 01:09:54 +00: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 94aeeb9ba6 update to version 1.22 2023-02-02 21:49:20 +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 e19fb8d262 try use system package first,add archlinux doc 2023-02-02 18:05:54 +08:00
爬山虎 dd655a241d
!14 添加在龙芯loongarch64机器上编译notepad--的条件
Merge pull request !14 from streamlet_hy/master
2023-02-02 01:36:34 +00:00
woclass e77ebe4af6
添加第三方依赖版权说明
Signed-off-by: woclass <git@wo-class.cn>
2023-02-01 11:52:04 +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
爬山虎 4c8661d74a
!11 新增 AUR 包
Merge pull request !11 from taotieren/Add_AUR
2023-01-31 15:02:29 +00:00
coconil c41bc43525 add cmake build doc 2023-01-31 22:49:55 +08: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