From 1d92b5a9687febb86458995829619ae826c56d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=88=AC=E5=B1=B1=E8=99=8E?= Date: Wed, 8 Mar 2023 06:35:10 +0000 Subject: [PATCH 1/2] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 爬山虎 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6027c44..8a89b55 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ 您可以在这个项目提交bug或反馈问题。 -最新版本下载地址：https://gitee.com/cxasm/notepad--/releases/tag/v1.23 +最新版本下载地址：https://gitee.com/cxasm/notepad--/releases/tag/v2.0 NDD已初步推出插件编写功能，希望广大的CPP/QT开发者加入我们，插件功能均可以留上您的大名和捐赠渠道，希望 开发者参与插件功能开发。 From 404d48b887b0fe507f2b8d5ef6f9b5850edde1eb Mon Sep 17 00:00:00 2001 From: cleverxiao Date: Fri, 10 Mar 2023 17:40:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BE=8E=E5=8C=96=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/batchfindreplace.cpp | 1 + src/batchfindreplace.ui | 8 - src/columnedit.ui | 303 +++++------- src/encodeconvert.cpp | 2 + src/encodeconvert.ui | 387 ++++++++-------- src/findwin.ui | 942 +++++++++++++++++--------------------- src/langextset.cpp | 3 +- src/langextset.ui | 69 ++- src/langstyledefine.ui | 126 ++--- src/md5hash.ui | 13 + src/pluginmgr.ui | 18 - src/qtlangset.ui | 52 ++- src/shortcutkeyeditwin.ui | 15 +- src/shortcutkeymgr.cpp | 15 +- src/shortcutkeymgr.ui | 16 +- 15 files changed, 900 insertions(+), 1070 deletions(-) diff --git a/src/batchfindreplace.cpp b/src/batchfindreplace.cpp index e305b9f..80ab82e 100755 --- a/src/batchfindreplace.cpp +++ b/src/batchfindreplace.cpp @@ -14,6 +14,7 @@ BatchFindReplace::BatchFindReplace(QWidget *parent) ui.setupUi(this); m_mainNotepad = dynamic_cast(parent); + ui.findReplaceTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); } BatchFindReplace::~BatchFindReplace() diff --git a/src/batchfindreplace.ui b/src/batchfindreplace.ui index e644c09..d8a286b 100755 --- a/src/batchfindreplace.ui +++ b/src/batchfindreplace.ui @@ -164,14 +164,6 @@ - - - TopToolBarArea - - - false - - diff --git a/src/columnedit.ui b/src/columnedit.ui index 94f0329..b887992 100755 --- a/src/columnedit.ui +++ b/src/columnedit.ui @@ -6,16 +6,10 @@ 0 0 - 337 - 316 + 393 + 325 - - - 350 - 330 - - ColumnEdit @@ -23,59 +17,25 @@ :/Resources/edit/global/ndd.ico:/Resources/edit/global/ndd.ico - - - 3 - - - 3 - - - 3 - - - 3 - + - - - - - Insert Text - - - true - - - - - - 1024 - - - - - - - - - - - - Ok - - - - - - - Close - - - - - - + + + Insert Text + + + true + + + + + + 1024 + + + + + @@ -89,22 +49,16 @@ false - - 9 - - - - 20 - - + + Initial value: - + 1 @@ -117,34 +71,14 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 20 - - + increment: - + @@ -157,34 +91,14 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 20 - - + Repetitions: - + @@ -197,53 +111,20 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 20 - - + prefix string: - + false - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -251,32 +132,19 @@ Format - - - - - - - Decimal - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - + + + + + Decimal + + + true + + + + + @@ -299,23 +167,19 @@ - - - - - - Octal - - - - - - - Binary - - - - + + + + Octal + + + + + + + Binary + + @@ -323,6 +187,63 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Ok + + + + + + + Close + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/src/encodeconvert.cpp b/src/encodeconvert.cpp index c17022e..d08fd67 100755 --- a/src/encodeconvert.cpp +++ b/src/encodeconvert.cpp @@ -144,6 +144,8 @@ void EncodeConvert::slot_selectFile() if (!rootpath.isEmpty()) { + ui.lineEdit->setText(rootpath); + ui.treeWidget->clear(); m_fileAttris.clear(); diff --git a/src/encodeconvert.ui b/src/encodeconvert.ui index 6d09681..7c0e853 100755 --- a/src/encodeconvert.ui +++ b/src/encodeconvert.ui @@ -6,8 +6,8 @@ 0 0 - 969 - 614 + 943 + 586 @@ -17,210 +17,223 @@ :/Resources/img/main.png:/Resources/img/main.png - - - 2 - + - 2 + 3 - 2 + 3 2 - 2 + 3 - - - - filePath - - - - - file size - - - - - file code - - - - - convert code - - - - - convert result - - - + + + + + true + + + + + + + select dir + + + + - + - - - 20 - - - - - convert options - - - - - - - - convert to code - - - - - - - - 200 - 0 - - - - - UTF8 - - - - - UTF8 BOM - - - - - UTF16-LE - - - - - UTF16-BE - - - - - GBK - - - - - - - - - - - - deal file ext - - - - - - - - 150 - 0 - - - - - all support file ext - - - - - - - - user defined - - - defined - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - select dir - - - - - - - start - - - false - - - - - - - close - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + + filePath + + + + + file size + + + + + file code + + + + + convert code + + + + + convert result + + + + + + + convert options + + + + 3 + + + 3 + + + 2 + + + 2 + + + + + + + convert to code + + + + + + + + 200 + 0 + + + + + UTF8 + + + + + UTF8 BOM + + + + + UTF16-LE + + + + + UTF16-BE + + + + + GBK + + + + + + + + + + + + deal file ext + + + + + + + + 150 + 0 + + + + + all support file ext + + + + + + + + user defined + + + defined + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + start + + + false + + + + + + + close + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + diff --git a/src/findwin.ui b/src/findwin.ui index cb65339..fa8ea45 100755 --- a/src/findwin.ui +++ b/src/findwin.ui @@ -6,8 +6,8 @@ 0 0 - 689 - 384 + 701 + 350 @@ -18,18 +18,24 @@ :/Resources/edit/global/ndd.ico:/Resources/edit/global/ndd.ico + + + 700 + 328 + + - 3 + 0 - 3 + 0 - 2 + 0 - 2 + 0 @@ -46,14 +52,26 @@ find - + + + 3 + + + 3 + + + 2 + 2 - + + + 0 + @@ -65,22 +83,13 @@ Find what : + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - 300 - 0 - - - - - 350 - 16777215 - - true @@ -92,7 +101,7 @@ - + Qt::Vertical @@ -105,106 +114,84 @@ - + + + 9 + + + 0 + + + 0 + + + 0 + - - - - - Backward direction - - - - - - - Match whole word only - - - - - - - Match case - - - - - - - Wrap around - - - true - - - - + + + Backward direction + + - - - Qt::Vertical + + + Match whole word only - - - 20 - 20 - - - + - - - Search Mode + + + Match case + + + + + + + Wrap around + + + true - - - - - - - Regular expression - - - - - - - - - Normal - - - true - - - - - - - Extend(\n,\r,\t,\0,\x...) - - - - - - - Qt::Vertical + + + Search Mode - - - 20 - 40 - - - + + + + + Normal + + + true + + + + + + + Extend(\n,\r,\t,\0,\x...) + + + + + + + Regular expression + + + + + @@ -340,16 +327,28 @@ Replace - + + + 3 + + + 3 + + + 2 + 2 - + - + + + 0 + @@ -361,22 +360,13 @@ Find what : + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - 300 - 0 - - - - - 350 - 16777215 - - true @@ -388,7 +378,10 @@ - + + + 0 + @@ -400,6 +393,9 @@ Replace with : + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -410,18 +406,6 @@ 0 - - - 300 - 0 - - - - - 350 - 16777215 - - @@ -429,14 +413,14 @@ - + Qt::Vertical 20 - 40 + 20 @@ -445,6 +429,18 @@ + + 9 + + + 0 + + + 0 + + + 0 + @@ -478,26 +474,13 @@ - - - - Qt::Vertical - - - - 20 - 20 - - - - Search Mode - - + + Normal @@ -507,40 +490,23 @@ - - - - - - Regular expression - - - - - - + Extend(\n,\r,\t,\0,\x...) + + + + Regular expression + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -664,217 +630,134 @@ Dir Find - + + + 3 + + + 3 + + + 2 + 2 - + - - - - - - 0 - 0 - + + + + + 0 - - Dest Dir : - - + + + + + 0 + 0 + + + + Dest Dir : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Select + + + + - - - - - 0 - 0 - + + + + 0 - - - 250 - 0 - - - - - 350 - 16777215 - - - + + + + + 0 + 0 + + + + Find what : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + true + + + 512 + + + + - - - - - 0 - 20 - + + + + 0 - - Select - - - - - - - - 0 - 0 - - - - Find what : - - - - - - - - 250 - 0 - - - - - 350 - 16777215 - - - - true - - - 512 - - - - - - - - - - - false - - - - 0 - 0 - - - - - 300 - 0 - - - - - 350 - 16777215 - - - - *.c:*.cpp:*.h - - - - - - - - 0 - 0 - - - - File Type : - - - - - - - - 0 - 0 - - - - Replace with : - - - - - - - - 0 - 0 - - - - Skip Dir Name : - - - - - - - false - - - - 0 - 0 - - - - - 300 - 0 - - - - - 350 - 16777215 - - - - debug:Debug:.vs:.git:.svn - - - - - - - - 0 - 0 - - - - - 300 - 0 - - - - - 350 - 16777215 - - - + + + + + 0 + 0 + + + + Replace with : + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + @@ -892,8 +775,46 @@ - - + + + 9 + + + 0 + + + 5 + + + + + + 0 + 0 + + + + Skip Dir Name : + + + + + + + false + + + + 0 + 0 + + + + debug:Debug:.vs:.git:.svn + + + + Match whole word only @@ -906,7 +827,36 @@ - + + + + false + + + + 0 + 0 + + + + *.c:*.cpp:*.h + + + + + + + + 0 + 0 + + + + File Type : + + + + Match case @@ -916,60 +866,46 @@ - - - Qt::Vertical - - - - 20 - 20 - - - - - - + - - - - - Search Mode - - - - - - Normal - - - true - - - - - - - - - Regular expression - - - - - - - - - Extend(\n,\r,\t,\0,\x...) - - - - - - - + + + Search Mode + + + + + + Normal + + + true + + + + + + + Extend(\n,\r,\t,\0,\x...) + + + + + + + Regular expression + + + + + + + + + + + + @@ -1150,14 +1086,26 @@ Mark - + + + 3 + + + 3 + + + 2 + 2 - + - + + + 0 + @@ -1169,22 +1117,13 @@ Mark What + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - - - 300 - 0 - - - - - 350 - 16777215 - - true @@ -1195,37 +1134,6 @@ - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - Match whole word only - - - - - - - Match case - - - - - @@ -1239,24 +1147,43 @@ + + + + 9 + + + 0 + + + 0 + + + 0 + + + + + Match whole word only + + + + + + + Match case + + + + + Search Mode - - - - - - - Regular expression - - - - - - + + Normal @@ -1266,29 +1193,23 @@ - + Extend(\n,\r,\t,\0,\x...) + + + + Regular expression + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -1425,16 +1346,11 @@ replaceModeRegularBt destFindDir dirFindWhat - dirReplaceWhat selectDir dirFindAll dirReplaceAll clearBt dirClose - dealFileType - fileType - skipDir - skipDirNames dirFindMatchWholeBox dirFindMatchCaseBox dirFindModeNormalBox diff --git a/src/langextset.cpp b/src/langextset.cpp index a1db834..2ac872e 100755 --- a/src/langextset.cpp +++ b/src/langextset.cpp @@ -18,6 +18,7 @@ LangExtSet::LangExtSet(QWidget *parent) ui.setupUi(this); ui.langTableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); + ui.langTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); initLangName(); connect(ui.langTableWidget, &QTableWidget::itemChanged, this, &LangExtSet::slot_itemChanged); @@ -225,4 +226,4 @@ void LangExtSet::closeEvent(QCloseEvent* e) slot_save(); } } -} \ No newline at end of file +} diff --git a/src/langextset.ui b/src/langextset.ui index 981a33d..e84a4d6 100755 --- a/src/langextset.ui +++ b/src/langextset.ui @@ -6,7 +6,7 @@ 0 0 - 809 + 415 504 @@ -14,42 +14,45 @@ LangExtSet - - - 3 - + 3 - + 3 + + 2 + - 3 + 2 - - - - Language - - - - - File Suffix - - - - - - - - - 16777215 - 100 - - - + + + + + QAbstractItemView::SingleSelection + + + false + + + + Language + + + + + File Suffix + + + + + + + + @@ -97,14 +100,6 @@ - - - TopToolBarArea - - - false - - diff --git a/src/langstyledefine.ui b/src/langstyledefine.ui index 0738f81..45dc68f 100755 --- a/src/langstyledefine.ui +++ b/src/langstyledefine.ui @@ -38,7 +38,7 @@ Setting - + 3 @@ -46,41 +46,41 @@ 3 - 3 + 2 - 3 + 2 - - 3 - - - 6 - - - - + + + Definition Language - + - - - - - - - - Mother Language + + + + 256 + + + js cs (split with space） - + + + + Expand File Name: + + + + @@ -94,32 +94,52 @@ + + + + Mother Language + + + - + + + + Qt::Vertical + + + + 17 + 382 + + + + + - + Delete - + New Create - + Save - + Close @@ -128,40 +148,6 @@ - - - - - - Expand File Name: - - - - - - - 256 - - - js cs (split with space） - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - @@ -197,24 +183,6 @@ - - - - 0 - 0 - 843 - 23 - - - - - - TopToolBarArea - - - false - - diff --git a/src/md5hash.ui b/src/md5hash.ui index a004d64..d34c048 100755 --- a/src/md5hash.ui +++ b/src/md5hash.ui @@ -140,6 +140,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/pluginmgr.ui b/src/pluginmgr.ui index 27dd173..fe611e0 100755 --- a/src/pluginmgr.ui +++ b/src/pluginmgr.ui @@ -99,24 +99,6 @@ - - - - 0 - 0 - 974 - 23 - - - - - - TopToolBarArea - - - false - - diff --git a/src/qtlangset.ui b/src/qtlangset.ui index 855d4fe..19ae047 100755 --- a/src/qtlangset.ui +++ b/src/qtlangset.ui @@ -19,6 +19,18 @@ + + 3 + + + 3 + + + 2 + + + 2 + @@ -264,6 +276,18 @@ Color + + 3 + + + 3 + + + 2 + + + 2 + @@ -480,9 +504,15 @@ 0 + + 3 + 0 + + 2 + @@ -491,7 +521,7 @@ - + @@ -519,7 +549,7 @@ - + @@ -632,24 +662,6 @@ - - - - 0 - 0 - 1029 - 23 - - - - - - TopToolBarArea - - - false - - diff --git a/src/shortcutkeyeditwin.ui b/src/shortcutkeyeditwin.ui index 996e9e6..6657908 100755 --- a/src/shortcutkeyeditwin.ui +++ b/src/shortcutkeyeditwin.ui @@ -7,7 +7,7 @@ 0 0 459 - 137 + 125 @@ -42,6 +42,19 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/shortcutkeymgr.cpp b/src/shortcutkeymgr.cpp index 88e3969..c40d65a 100755 --- a/src/shortcutkeymgr.cpp +++ b/src/shortcutkeymgr.cpp @@ -43,12 +43,15 @@ ShortcutKeyMgr::ShortcutKeyMgr(QWidget *parent) connect(ui.tableWidget, &QTableWidget::itemDoubleClicked, this, &ShortcutKeyMgr::slot_edit); - ui.tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); - ui.tableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); - ui.tableWidget->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents); - ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); - ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); - ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents); +// ui.tableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); +// ui.tableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); +// ui.tableWidget->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents); +// ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents); +// ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); +// ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(2, QHeaderView::ResizeToContents); + + ui.tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + ui.qscintTableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); QString tabQss = "QHeaderView::section{" diff --git a/src/shortcutkeymgr.ui b/src/shortcutkeymgr.ui index cf6ba84..1ffb3b8 100755 --- a/src/shortcutkeymgr.ui +++ b/src/shortcutkeymgr.ui @@ -6,7 +6,7 @@ 0 0 - 766 + 476 508 @@ -57,6 +57,9 @@ QAbstractItemView::NoEditTriggers + + QAbstractItemView::SingleSelection + false @@ -101,6 +104,9 @@ QAbstractItemView::NoEditTriggers + + QAbstractItemView::SingleSelection + Function @@ -171,14 +177,6 @@ - - - TopToolBarArea - - - false - -