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

192 Commits

Author SHA1 Message Date
爬山虎 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
爬山虎 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
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 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