P35124786
/
notepad--
mirror of https://gitee.com/cxasm/notepad--.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

!88 Fix build error and the shortcut problem under Ubuntu 

Merge pull request !88 from tangramor/master
This commit is contained in:
爬山虎 2023-09-11 08:01:14 +00:00 committed by Gitee
parent 55fab57c3c 2fcb3763e1
commit f121bcb86b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cceditor/ccnotepad.cpp
View File

@ -5347,7 +5347,7 @@ void hide_file(const QString& szFile)
//isBakWrite 是否写保护swp文件，默认true。只有新文件时不需要，因为新文件不存在覆盖写的问题 //isBakWrite 是否写保护swp文件，默认true。只有新文件时不需要，因为新文件不存在覆盖写的问题
//isStatic 是否静默：不弹出对话框，在外部批量查找替换文件夹时使用，避免弹窗中断。默认false //isStatic 是否静默：不弹出对话框，在外部批量查找替换文件夹时使用，避免弹窗中断。默认false
//isClearSwpFile:是否回收swp交换文件，在外部批量查找替换文件夹时使用，替换后直接删除swp文件。默认false //isClearSwpFile:是否回收swp交换文件，在外部批量查找替换文件夹时使用，替换后直接删除swp文件。默认false
bool CCNotePad::saveFile(QString fileName, ScintillaEditView* pEdit, bool isBakWrite, bool isStatic,bool /*isClearSwpFile*/) bool CCNotePad::saveFile(QString fileName, ScintillaEditView* pEdit, bool isBakWrite, bool isStatic, bool isClearSwpFile)
{ {
QFile srcfile(fileName); QFile srcfile(fileName);

11
src/linux/usr/share/applications/io.gitee.cxasm.notepad--.desktop → src/linux/usr/share/applications/NotePad--.desktop
View File

@ -1,13 +1,12 @@
[Desktop Entry] [Desktop Entry]
Version=1.0 Version=1.0
Name=Notepad-- Name=NotePad--
Name[zh_CN]=Notepad-- Name[zh_CN]=NotePad--
Comment=Notepad-- 是一个国产跨平台、简单的文本编辑器。 Comment=NotePad-- 是一个国产跨平台、简单的文本编辑器。
Type=Application Type=Application
Exec=notepad-- %F Exec=NotePad-- %F
Icon=notepad-- Icon=/usr/share/icons/hicolor/128x128/apps/notepad--.png
Categories=Development;Office; Categories=Development;Office;
Terminal=false Terminal=false
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-patch;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-patch;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl;application/x-php;text/vnd.wap.wml;text/x-python;application/x-ruby;text/sgml;application/xml;model/vrml;image/svg+xml;application/json; MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-patch;text/x-adasrc;text/x-chdr;text/x-csrc;text/css;application/x-desktop;text/x-patch;text/x-fortran;text/html;text/x-java;text/x-tex;text/x-makefile;text/x-objcsrc;text/x-pascal;application/x-perl;application/x-perl;application/x-php;text/vnd.wap.wml;text/x-python;application/x-ruby;text/sgml;application/xml;model/vrml;image/svg+xml;application/json;
# Generated from the DesktopGenerater component of the z-Tools toolkit