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

Merge branch 'master' into about

This commit is contained in:
woclass 2023-02-08 17:29:21 +08:00
parent 134e2e2492 f48ee6b5b3
commit 27b3ebf80b
No known key found for this signature in database
GPG Key ID: 9945259EC0248B62
9 changed files with 171 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aboutndd.cpp Executable file → Normal file
View File

@ -8,6 +8,7 @@ AboutNdd::AboutNdd(QWidget *parent)
ui.label->setOpenExternalLinks(true); ui.label->setOpenExternalLinks(true);
// 隐藏最大化、最小化按钮 // 隐藏最大化、最小化按钮
setWindowFlags(windowFlags() & ~Qt::WindowMinMaxButtonsHint); setWindowFlags(windowFlags() & ~Qt::WindowMinMaxButtonsHint);
connect(ui.aboutPushButton, &QPushButton::clicked, this, &AboutNdd::onButtonOkayClicked);
} }
AboutNdd::~AboutNdd() AboutNdd::~AboutNdd()
@ -17,3 +18,8 @@ void AboutNdd::appendText(QString text)
{ {
ui.nddMsgText->appendPlainText(text); ui.nddMsgText->appendPlainText(text);
} }
void AboutNdd::onButtonOkayClicked()
{
close();
}

3
src/aboutndd.h
View File

@ -13,6 +13,9 @@ public:
void appendText(QString text); void appendText(QString text);
private slots:
void onButtonOkayClicked();
private: private:
Ui::AboutNddClass ui; Ui::AboutNddClass ui;
}; };

79
src/aboutndd.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>114</height> <height>180</height>
</rect> </rect>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
@ -17,7 +17,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>AboutNdd</string> <string>About Notepad--</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="RealCompare.qrc"> <iconset resource="RealCompare.qrc">
@ -33,25 +33,76 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>2</number> <number>2</number>
</property> </property>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout0">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>General Public License</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="nddMsgText">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="plainText">
<string>This software is licensed under the terms of the GNU General Public License version 3 (GPLv3). You are free to redistribute and modify the software in accordance with the license.
This software is distributed with the hope that it will be useful, but without any warranties, including the implied warranties of merchantability or fitness for a particular purpose. Please see the GNU General Public License for more information.
A copy of the GPLv3 license should have been provided along with this software. If you have not received a copy, it can be found at https://www.gnu.org/licenses/.</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://gitee.com/cxasm/notepad--&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;Click to get the latest version of notepad-- or source code&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Home: &lt;a href=&quot;https://gitee.com/cxasm/notepad--&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://gitee.com/cxasm/notepad--&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="3" column="0">
<widget class="QPlainTextEdit" name="nddMsgText"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="readOnly"> <item>
<bool>true</bool> <widget class="QPushButton" name="aboutPushButton">
</property> <property name="minimumSize">
<property name="plainText"> <size>
<string>opensoure web：https://gitee.com/cxasm/notepad--</string> <width>100</width>
</property> <height>28</height>
</widget> </size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>28</height>
</size>
</property>
<property name="text">
<string>Okay</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="2" column="0"> <item row="4" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"/> <spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</widget> </widget>

69
src/cceditor/ccnotepad.cpp
View File

@ -7317,14 +7317,19 @@ void CCNotePad::slot_hexGotoFile(qint64 addr)
void CCNotePad::slot_about() void CCNotePad::slot_about()
{ {
QMessageBox msgBox(this); QMessageBox msgBox(this);
QString msg = tr(R"(
<a href="https://github.com/cxasm/notepad--">Github repo: cxasm/notepad--</a>
<br/>
<a href="https://gitee.com/cxasm/notepad--">China Gitee: cxasm/notepad--</a>
)");
#if defined (Q_OS_MAC) #if defined (Q_OS_MAC)
msgBox.setText(tr("bugfix: https://github.com/cxasm/notepad-- \nchina: https://gitee.com/cxasm/notepad--")); msgBox.setText(msg);
msgBox.setDetailedText(QString("Notepad-- %1").arg(VersionStr)); msgBox.setDetailedText(QString("Notepad-- %1").arg(VersionStr));
#else #else
msgBox.setWindowTitle(QString("Notepad-- %1").arg(VersionStr)); msgBox.setWindowTitle(QString("Notepad-- %1").arg(VersionStr));
msgBox.setText(tr("bugfix: https://github.com/cxasm/notepad-- \nchina: https://gitee.com/cxasm/notepad--")); msgBox.setText(msg);
#endif #endif
msgBox.setTextInteractionFlags(Qt::TextSelectableByMouse);
msgBox.exec(); msgBox.exec();
} }
@ -7333,18 +7338,18 @@ void CCNotePad::slot_aboutNdd()
{ {
AboutNdd* pWin = new AboutNdd(); AboutNdd* pWin = new AboutNdd();
pWin->setAttribute(Qt::WA_DeleteOnClose); pWin->setAttribute(Qt::WA_DeleteOnClose);
QString title = tr("Ndd Version %1").arg(VersionStr); QString title = tr("Notepad-- Version %1").arg(VersionStr);
pWin->setWindowTitle(title); pWin->setWindowTitle(title);
pWin->appendText(title); pWin->appendText(title);
int status = NddSetting::getKeyValueFromNumSets(SOFT_STATUS); // int status = NddSetting::getKeyValueFromNumSets(SOFT_STATUS);
if (1 == status) // if (1 == status)
{ // {
pWin->appendText(tr("Registered Version")); // pWin->appendText(tr("Registered Version"));
} // }
else // else
{ // {
pWin->appendText(tr("Free Trial")); // pWin->appendText(tr("Free Trial"));
} // }
pWin->show(); pWin->show();
registerEscKeyShort(pWin); registerEscKeyShort(pWin);
#ifdef uos #ifdef uos
@ -7352,6 +7357,7 @@ void CCNotePad::slot_aboutNdd()
#endif #endif
} }
void CCNotePad::addWatchFilePath(QString filePath) void CCNotePad::addWatchFilePath(QString filePath)
{ {
getRegularFilePath(filePath); getRegularFilePath(filePath);
@ -7646,25 +7652,25 @@ void CCNotePad::slot_donate()
#endif #endif
} }
void CCNotePad::slot_registerCmd(int cmd, int code) // void CCNotePad::slot_registerCmd(int cmd, int code)
{ // {
if (cmd == 1) // if (cmd == 1)
{ // {
//服务器返回注册码的消息。 //0 试用 1 正版 2 正版过期 3 错误key // //服务器返回注册码的消息。 //0 试用 1 正版 2 正版过期 3 错误key
int status = NddSetting::getKeyValueFromNumSets(SOFT_STATUS); // int status = NddSetting::getKeyValueFromNumSets(SOFT_STATUS);
if (status != code) // if (status != code)
{ // {
NddSetting::updataKeyValueFromNumSets(SOFT_STATUS, code); // NddSetting::updataKeyValueFromNumSets(SOFT_STATUS, code);
} // }
//
emit signRegisterReplay(code); // emit signRegisterReplay(code);
} // }
} //}
//获取注册码 //获取注册码
void CCNotePad::slot_register() //void CCNotePad::slot_register()
{ //{
} //}
//当前正在使用的所有语言的tags //当前正在使用的所有语言的tags
void CCNotePad::getCurUseLexerTags(QVector<QString>& tags) void CCNotePad::getCurUseLexerTags(QVector<QString>& tags)
@ -8921,4 +8927,3 @@ void CCNotePad::slot_shortcutManager()
#endif #endif
pWin->show(); pWin->show();
} }

4
src/cceditor/ccnotepad.h
View File

@ -178,7 +178,7 @@ public slots:
void slot_batch_rename(); void slot_batch_rename();
void slot_options(); void slot_options();
void slot_donate(); void slot_donate();
void slot_registerCmd(int cmd, int code); // void slot_registerCmd(int cmd, int code);
void slot_viewStyleChange(QString tag, int styleId, QColor & fgColor, QColor & bkColor, QFont & font, bool fontChange); void slot_viewStyleChange(QString tag, int styleId, QColor & fgColor, QColor & bkColor, QFont & font, bool fontChange);
void slot_viewLexerChange(QString tag); void slot_viewLexerChange(QString tag);
void slot_findInDir(); void slot_findInDir();
@ -278,7 +278,7 @@ private slots:
void slot_toDarkStyle(); void slot_toDarkStyle();
void slot_toLavenderBlush(); void slot_toLavenderBlush();
void slot_toMistyRose();*/ void slot_toMistyRose();*/
void slot_register(); //void slot_register();
void slot_slectionChanged(); void slot_slectionChanged();
void slot_preHexPage(); void slot_preHexPage();

66
src/cceditor/ccnotepad.ui
View File

@ -79,7 +79,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1458</width> <width>1458</width>
<height>23</height> <height>27</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@ -87,7 +87,7 @@
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="title"> <property name="title">
<string>&amp;File</string> <string>File (&amp;F)</string>
</property> </property>
<addaction name="actionNewFile"/> <addaction name="actionNewFile"/>
<addaction name="actionOpenFile"/> <addaction name="actionOpenFile"/>
@ -103,7 +103,7 @@
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="title"> <property name="title">
<string>&amp;Edit</string> <string>Edit (&amp;E)</string>
</property> </property>
<widget class="QMenu" name="menuformat_conversion"> <widget class="QMenu" name="menuformat_conversion">
<property name="title"> <property name="title">
@ -180,11 +180,11 @@
</widget> </widget>
<widget class="QMenu" name="menuSearch"> <widget class="QMenu" name="menuSearch">
<property name="title"> <property name="title">
<string>&amp;Search</string> <string>Search (&amp;S)</string>
</property> </property>
<widget class="QMenu" name="menuBook_Mark"> <widget class="QMenu" name="menuBook_Mark">
<property name="title"> <property name="title">
<string>Book Mark</string> <string>Bookmark</string>
</property> </property>
</widget> </widget>
<widget class="QMenu" name="menuMark_Color"> <widget class="QMenu" name="menuMark_Color">
@ -204,7 +204,7 @@
</widget> </widget>
<widget class="QMenu" name="menuView"> <widget class="QMenu" name="menuView">
<property name="title"> <property name="title">
<string>&amp;View</string> <string>View (&amp;V)</string>
</property> </property>
<widget class="QMenu" name="menudisplay_symbols"> <widget class="QMenu" name="menudisplay_symbols">
<property name="title"> <property name="title">
@ -232,7 +232,7 @@
</widget> </widget>
<widget class="QMenu" name="menuCode"> <widget class="QMenu" name="menuCode">
<property name="title"> <property name="title">
<string>E&amp;ncoding</string> <string>Encoding (&amp;N)</string>
</property> </property>
<widget class="QMenu" name="menuASNI"> <widget class="QMenu" name="menuASNI">
<property name="title"> <property name="title">
@ -263,7 +263,7 @@
</widget> </widget>
<widget class="QMenu" name="menuLanguage"> <widget class="QMenu" name="menuLanguage">
<property name="title"> <property name="title">
<string>&amp;Language</string> <string>Language (&amp;L)</string>
</property> </property>
<widget class="QMenu" name="menuP"> <widget class="QMenu" name="menuP">
<property name="title"> <property name="title">
@ -466,7 +466,7 @@
</widget> </widget>
<widget class="QMenu" name="menuSet"> <widget class="QMenu" name="menuSet">
<property name="title"> <property name="title">
<string>Se&amp;t</string> <string>Set (&amp;T)</string>
</property> </property>
<widget class="QMenu" name="menuLanguage_2"> <widget class="QMenu" name="menuLanguage_2">
<property name="title"> <property name="title">
@ -495,7 +495,7 @@
</widget> </widget>
<widget class="QMenu" name="menuTools"> <widget class="QMenu" name="menuTools">
<property name="title"> <property name="title">
<string>T&amp;ools</string> <string>Tools (&amp;O)</string>
</property> </property>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
@ -1575,11 +1575,11 @@
<string>Chinese</string> <string>Chinese</string>
</property> </property>
</action> </action>
<action name="actionRegister">
<property name="text">
<string>Register</string>
</property>
</action>
<action name="actionLanguage_Format"> <action name="actionLanguage_Format">
<property name="text"> <property name="text">
<string>Theme Style</string> <string>Theme Style</string>
@ -1904,7 +1904,7 @@
</action> </action>
<action name="actioninfo"> <action name="actioninfo">
<property name="text"> <property name="text">
<string>AboutNdd</string> <string>About Notepad--</string>
</property> </property>
</action> </action>
<action name="action1"> <action name="action1">
@ -2696,22 +2696,22 @@
</hints> </hints>
</connection> </connection>
<connection> <connection>
<sender>actionRegister</sender>
<signal>triggered()</signal>
<receiver>CCNotePad</receiver>
<slot>slot_register()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>601</x>
<y>394</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionLanguage_Format</sender> <sender>actionLanguage_Format</sender>
<signal>triggered()</signal> <signal>triggered()</signal>
<receiver>CCNotePad</receiver> <receiver>CCNotePad</receiver>
@ -3497,7 +3497,7 @@
<slot>slot_toMistyRose()</slot> <slot>slot_toMistyRose()</slot>
<slot>slot_changeEnglish()</slot> <slot>slot_changeEnglish()</slot>
<slot>slot_changeChinese()</slot> <slot>slot_changeChinese()</slot>
<slot>slot_register()</slot>
<slot>slot_langFormat()</slot> <slot>slot_langFormat()</slot>
<slot>slot_reOpenTextMode()</slot> <slot>slot_reOpenTextMode()</slot>
<slot>slot_reOpenHexMode()</slot> <slot>slot_reOpenHexMode()</slot>

10
src/closeDlg.ui
View File

@ -60,7 +60,7 @@
<item> <item>
<widget class="QCheckBox" name="leftBox"> <widget class="QCheckBox" name="leftBox">
<property name="text"> <property name="text">
<string>save left document ?</string> <string>Save Left Document?</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@ -70,7 +70,7 @@
<item> <item>
<widget class="QCheckBox" name="rightBox"> <widget class="QCheckBox" name="rightBox">
<property name="text"> <property name="text">
<string>save right document ?</string> <string>Save Right Document?</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@ -140,7 +140,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>save selected</string> <string>Save Selected</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -159,7 +159,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>discard</string> <string>Discard</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -178,7 +178,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>cancel</string> <string>Cancel</string>
</property> </property>
</widget> </widget>
</item> </item>

34
src/findwin.ui
View File

@ -40,7 +40,7 @@
</size> </size>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_find"> <widget class="QWidget" name="tab_find">
<attribute name="title"> <attribute name="title">
@ -1462,8 +1462,8 @@
<slot>close()</slot> <slot>close()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>572</x> <x>674</x>
<y>251</y> <y>288</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>169</x> <x>169</x>
@ -1510,8 +1510,8 @@
<slot>slot_replaceFindNext()</slot> <slot>slot_replaceFindNext()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>94</x> <x>448</x>
<y>60</y> <y>69</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>588</x> <x>588</x>
@ -1526,8 +1526,8 @@
<slot>close()</slot> <slot>close()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>94</x> <x>448</x>
<y>45</y> <y>213</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>588</x> <x>588</x>
@ -1542,8 +1542,8 @@
<slot>slot_replace()</slot> <slot>slot_replace()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>94</x> <x>448</x>
<y>64</y> <y>103</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>588</x> <x>588</x>
@ -1558,8 +1558,8 @@
<slot>slot_replaceAll()</slot> <slot>slot_replaceAll()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>94</x> <x>448</x>
<y>67</y> <y>137</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>588</x> <x>588</x>
@ -1574,8 +1574,8 @@
<slot>slot_replaceAllInOpenDoc()</slot> <slot>slot_replaceAllInOpenDoc()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>94</x> <x>448</x>
<y>76</y> <y>180</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>588</x> <x>588</x>
@ -1638,8 +1638,8 @@
<slot>close()</slot> <slot>close()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>572</x> <x>674</x>
<y>142</y> <y>171</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>564</x> <x>564</x>
@ -1718,8 +1718,8 @@
<slot>slot_findPrev()</slot> <slot>slot_findPrev()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>484</x> <x>674</x>
<y>73</y> <y>103</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>294</x> <x>294</x>

2
src/qscint/CMakeLists.txt
View File

@ -37,7 +37,7 @@ ${PROJECT_SOURCE_DIR}/scintilla/include)
target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport) target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent Qt5::Network Qt5::PrintSupport)
if(${CMAKE_BUILD_TYPE} STREQUAL "Release") if(($ENV{CMAKE_BUILD_TYPE}) STREQUAL "Release")
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5") set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5")
else() else()
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5d") set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "qmyedit_qt5d")