From b5523aaedae8e6a42f463b5623536cf2152c9f3f Mon Sep 17 00:00:00 2001 From: "royqh1979@gmail.com" Date: Fri, 15 Oct 2021 10:23:46 +0800 Subject: [PATCH] - enhancement: click the encoding info in the statusbar will show encoding menu --- NEWS.md | 1 + RedPandaIDE/RedPandaIDE.pro | 2 + RedPandaIDE/RedPandaIDE_zh_CN.qm | Bin 94780 -> 94900 bytes RedPandaIDE/RedPandaIDE_zh_CN.ts | 176 ++++++++++++------------ RedPandaIDE/mainwindow.cpp | 24 +++- RedPandaIDE/mainwindow.h | 4 +- RedPandaIDE/mainwindow.ui | 10 +- RedPandaIDE/resources/codesnippets.json | 14 ++ RedPandaIDE/widgets/labelwithmenu.cpp | 18 +++ RedPandaIDE/widgets/labelwithmenu.h | 17 +++ 10 files changed, 168 insertions(+), 98 deletions(-) create mode 100644 RedPandaIDE/widgets/labelwithmenu.cpp create mode 100644 RedPandaIDE/widgets/labelwithmenu.h diff --git a/NEWS.md b/NEWS.md index b2524987..d91c8f2a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,7 @@ Version 0.6.7 - adjust: the max value of the debug console's vertical scrollbar. - fix: shfit+click not correctly set selection's end - fix: ctrl+home/end not correctly set cursor to start/end of the editor + - enhancement: click the encoding info in the statusbar will show encoding menu Version 0.6.6 - fix: crash when create new file diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro index 3ecceff8..8a7f39f4 100644 --- a/RedPandaIDE/RedPandaIDE.pro +++ b/RedPandaIDE/RedPandaIDE.pro @@ -115,6 +115,7 @@ SOURCES += \ widgets/functiontooltipwidget.cpp \ widgets/headercompletionpopup.cpp \ widgets/issuestable.cpp \ + widgets/labelwithmenu.cpp \ widgets/macroinfomodel.cpp \ widgets/newprojectdialog.cpp \ widgets/qconsole.cpp \ @@ -226,6 +227,7 @@ HEADERS += \ widgets/functiontooltipwidget.h \ widgets/headercompletionpopup.h \ widgets/issuestable.h \ + widgets/labelwithmenu.h \ widgets/macroinfomodel.h \ widgets/newprojectdialog.h \ widgets/qconsole.h \ diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.qm b/RedPandaIDE/RedPandaIDE_zh_CN.qm index d1bae071fc3ac111d7c1f2276e4ba20e0be454e2..c156fffc7e42d7784e27c88e2ae068740ad765cf 100644 GIT binary patch delta 6178 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 delta 6071 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 BacktraceModel - + Function 函数 - + Filename 文件名 - + Line 行 @@ -100,17 +100,17 @@ BreakpointModel - + Filename 文件名 - + Line 行 - + Condition 条件 @@ -836,68 +836,68 @@ Are you really want to continue? Debugger - + No compiler set 无编译器设置 - + No compiler set is configured. 没有配置编译器设置。 - + Can't start debugging. 无法启动调试器 - + Debugger path error 调试路径错误 - + Debugger's path "%1" contains non-ascii characters. 调试路径"%1"中包含非ASCII字符（如，中文字符） - + This prevents it from executing. 这会导致调试器无法启动。 - + Debugger not exists 找不到调试器 - + Can''t find debugger in : "%1" 找不到调试器程序"%1" - - + + Execute to evaluate 执行以求值 - + Not found in current context 不在当前语境中 - + Compile 编译 - + Source file is more recent than executable. 源文件比程序文件新。 - + Recompile? 重新编译？ @@ -2686,7 +2686,7 @@ Are you really want to continue? - + Issues 编译器 @@ -2889,8 +2889,8 @@ Are you really want to continue? - - + + Compile 编译 @@ -3334,7 +3334,7 @@ Are you really want to continue? - + Clear all breakpoints 删除所有断点 @@ -3435,7 +3435,7 @@ Are you really want to continue? - + Rename Symbol 重命名符号 @@ -3456,13 +3456,13 @@ Are you really want to continue? - + Export As RTF 导出为RTF - + Export As HTML 导出为HTML @@ -3474,10 +3474,10 @@ Are you really want to continue? Ctrl+M - + Ctrl+M - + File Encoding 文件编码 @@ -3522,8 +3522,9 @@ Are you really want to continue? - Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 - 行:%1 列:%2 已选择:%3 总行数:%4 总长度:%5 + Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5 + Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5 + 行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5 @@ -3690,6 +3691,11 @@ Are you really want to continue? Export 导出 + + + Insert Snippet + 插入代码段 + Show debug logs in the debug console @@ -3782,141 +3788,141 @@ Are you really want to continue? 跳转到定义处 - + Character sets 字符集 - + %1 files autosaved 已自动保存%1个文件 - + Save project 保存项目 - + The project '%1' has modifications. 项目'%1'有改动。 - + Do you want to save it? 需要保存吗？ - + Do you really want to clear all breakpoints in this file? 您真的要清除该文件的所有断点吗？ - + New project 新建项目 - + Close %1 and start new project? 关闭'%1'以打开新项目? - + Folder not exist 文件夹不存在 - + Folder '%1' doesn't exist. Create it now? 文件夹'%1'不存在。是否创建？ - + Can't create folder 无法创建文件夹 - + Failed to create folder '%1'. 创建文件夹'%1'失败。 - + Save new project as - + Red panda Dev-C++ project file (*.dev) 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 - + Can't assign project template 无法使用模板创建项目 - + Add to project 添加到项目 - + Rename Error 重命名出错 - + Symbol '%1' is defined in system header. 符号'%1'在系统头文件中定义，无法修改。 - + New Name 新名称 - + Replace Error 替换出错 - + Can't open file '%1' for replace! 无法打开文件'%1'进行替换！ - + Contents has changed since last search! 内容和上次查找时不一致。 - + Rich Text Format Files (*.rtf) RTF格式文件 (*.rtf) - + HTML Files (*.html) HTML文件 (*.html) - - - - - - - + + + + + + + Error 错误 @@ -3926,75 +3932,75 @@ Are you really want to continue? 项目历史 - + File '%1' was changed. 磁盘文件'%1'已被修改。 - + Reload its content from disk? 是否重新读取它的内容？ - + File '%1' was removed. 磁盘文件'%1'已被删除。 - + Keep it open? 是否保持它在小熊猫C++中打开的编辑窗口？ - + Open 打开 - + Compile Failed 编译失败 - + Run Failed 运行失败 - - + + Confirm Convertion 确认转换 - - + + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? 当前编辑器中的文件将会使用%1编码保存。<br />这项操作无法被撤回。<br />你确定要继续吗？ - + New Watch Expression 新监视表达式 - + Enter Watch Expression (it is recommended to use 'this->' for class members): 输入监视表达式 - + Parsing file %1 of %2: "%3" （%1/%2）正在解析文件"%3" - - + + Done parsing %1 files in %2 seconds 完成%1个文件的解析,用时%2秒 - + (%1 files per second) (每秒%1个文件） @@ -5400,17 +5406,17 @@ Are you really want to continue? RegisterModel - + Register 寄存器 - + Value(Hex) 值(HEX) - + Value(Dec) 值(DEC) @@ -6238,12 +6244,12 @@ Are you really want to continue? WatchModel - + Expression 表达式 - + Value 值 diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index c72e4b15..bb0e2abf 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -57,7 +57,7 @@ MainWindow::MainWindow(QWidget *parent) ui->setupUi(this); // status bar mFileInfoStatus=new QLabel(); - mFileEncodingStatus = new QLabel(); + mFileEncodingStatus = new LabelWithMenu(); mFileModeStatus = new QLabel(); mFileInfoStatus->setStyleSheet("margin-left:10px; margin-right:10px"); mFileEncodingStatus->setStyleSheet("margin-left:10px; margin-right:10px"); @@ -119,7 +119,7 @@ MainWindow::MainWindow(QWidget *parent) rebuildOpenedFileHisotryMenu(); mMenuInsertCodeSnippet = new QMenu(); - mMenuInsertCodeSnippet->setTitle("Insert Snippet"); + mMenuInsertCodeSnippet->setTitle(tr("Insert Snippet")); ui->menuCode->insertMenu(ui->actionReformat_Code,mMenuInsertCodeSnippet); ui->menuCode->insertSeparator(ui->actionReformat_Code); connect(mMenuInsertCodeSnippet,&QMenu::aboutToShow, @@ -686,11 +686,11 @@ void MainWindow::updateStatusbarForLineCol() if (e!=nullptr) { int col = e->charToColumn(e->caretY(),e->caretX()); QString msg = tr("Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5") - .arg(e->caretY(),4) - .arg(col,3) - .arg(e->selText().length(),6) - .arg(e->lines()->count(),4) - .arg(e->lines()->getTextLength(),6); + .arg(e->caretY()) + .arg(col) + .arg(e->selText().length()) + .arg(e->lines()->count()) + .arg(e->lines()->getTextLength()); mFileInfoStatus->setText(msg); } else { mFileInfoStatus->setText(""); @@ -1930,6 +1930,11 @@ void MainWindow::buildContextMenus() toolButton->setDefaultAction(mClassBrowser_Show_Inherited); hlayout->addWidget(toolButton); hlayout->addStretch(); + + //menu for statusbar + mFileEncodingStatus->setContextMenuPolicy(Qt::CustomContextMenu); + connect(mFileEncodingStatus,&QWidget::customContextMenuRequested, + this, &MainWindow::onFileEncodingContextMenu); } void MainWindow::buildEncodingMenu() @@ -2185,6 +2190,11 @@ void MainWindow::onDebugConsoleContextMenu(const QPoint &pos) menu.exec(ui->debugConsole->mapToGlobal(pos)); } +void MainWindow::onFileEncodingContextMenu(const QPoint &pos) +{ + mMenuEncoding->exec(mFileEncodingStatus->mapToGlobal(pos)); +} + void MainWindow::onShowInsertCodeSnippetMenu() { mMenuInsertCodeSnippet->clear(); diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index 28338060..872b7c6a 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -15,6 +15,7 @@ #include "codesnippetsmanager.h" #include "todoparser.h" #include "toolsmanager.h" +#include "widgets/labelwithmenu.h" QT_BEGIN_NAMESPACE @@ -199,6 +200,7 @@ private slots: void onProjectViewContextMenu(const QPoint& pos); void onClassBrowserContextMenu(const QPoint& pos); void onDebugConsoleContextMenu(const QPoint& pos); + void onFileEncodingContextMenu(const QPoint& pos); void onShowInsertCodeSnippetMenu(); @@ -405,7 +407,7 @@ private: Ui::MainWindow *ui; EditorList *mEditorList; QLabel *mFileInfoStatus; - QLabel *mFileEncodingStatus; + LabelWithMenu *mFileEncodingStatus; QLabel *mFileModeStatus; QMenu *mMenuEncoding; QMenu *mMenuExport; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index e6161fe4..6cfc87ac 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -283,7 +283,7 @@ QTabWidget::South - 1 + 2 @@ -388,16 +388,16 @@ - 2 + 0 - 2 + 0 - 2 + 0 - 2 + 0 diff --git a/RedPandaIDE/resources/codesnippets.json b/RedPandaIDE/resources/codesnippets.json index 81d2ce8f..af572a91 100644 --- a/RedPandaIDE/resources/codesnippets.json +++ b/RedPandaIDE/resources/codesnippets.json @@ -61,5 +61,19 @@ "description": "", "prefix": "function()", "section": -1 + }, + { + "caption": "Comment Header", + "code": "/**\r\n * @file %REPL_BEGIN%%REPL_END% \r\n * @brief: %INSERT%\r\n * @version: %INSERT% \r\n * @copyright: %INSERT%\r\n * @author: %INSERT%\r\n * @date: \r\n * \r\n **/", + "description": "", + "prefix": "", + "section": 0 + }, + { + "caption": "Date/Time", + "code": "", + "description": "", + "prefix": "", + "section": 0 } ] diff --git a/RedPandaIDE/widgets/labelwithmenu.cpp b/RedPandaIDE/widgets/labelwithmenu.cpp new file mode 100644 index 00000000..79ace327 --- /dev/null +++ b/RedPandaIDE/widgets/labelwithmenu.cpp @@ -0,0 +1,18 @@ +#include "labelwithmenu.h" + +#include +#include +#include + +LabelWithMenu::LabelWithMenu(QWidget* parent):QLabel(parent) +{ + +} + +void LabelWithMenu::mousePressEvent(QMouseEvent *event) +{ + QContextMenuEvent *e = new QContextMenuEvent(QContextMenuEvent::Reason::Mouse, + event->pos()); + QApplication::instance()->postEvent(this,e); + event->accept(); +} diff --git a/RedPandaIDE/widgets/labelwithmenu.h b/RedPandaIDE/widgets/labelwithmenu.h new file mode 100644 index 00000000..0d1d4e86 --- /dev/null +++ b/RedPandaIDE/widgets/labelwithmenu.h @@ -0,0 +1,17 @@ +#ifndef LABELWITHMENU_H +#define LABELWITHMENU_H + +#include + +class LabelWithMenu : public QLabel +{ + Q_OBJECT +public: + explicit LabelWithMenu(QWidget* parent = nullptr); + + // QWidget interface +protected: + void mousePressEvent(QMouseEvent *event) override; +}; + +#endif // LABELWITHMENU_H