diff --git a/NEWS.md b/NEWS.md
index ef0469d7..4445569c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -33,6 +33,7 @@ Red Panda C++ Version 2.12
- enhancement: Toggle comment for asm/makefile/lua files.
- enhancement: Delay for tooltips.
- enhancement: "Tool tips delay" option in Options/editor/Tooltips
+ - change: Remove "Compile & Run" menu item. It's replaced by "Run".
Red Panda C++ Version 2.11
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index fbf44d94..0542ee1d 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -677,7 +677,6 @@ void MainWindow::updateCompileActions(const Editor *e)
//|| mCompilerManager->backgroundSyntaxChecking()
|| mCompilerManager->running() || mDebugger->executing()) {
ui->actionCompile->setEnabled(false);
- ui->actionCompile_Run->setEnabled(false);
ui->actionRun->setEnabled(false);
ui->actionRebuild->setEnabled(false);
ui->actionGenerate_Assembly->setEnabled(false);
@@ -719,7 +718,6 @@ void MainWindow::updateCompileActions(const Editor *e)
}
}
ui->actionCompile->setEnabled(canCompile);
- ui->actionCompile_Run->setEnabled(canRun && canCompile);
ui->actionRun->setEnabled(canRun);
ui->actionRebuild->setEnabled(canCompile);
ui->actionGenerate_Assembly->setEnabled(canGenerateAssembly);
@@ -1710,7 +1708,6 @@ void MainWindow::updateActionIcons()
ui->actionCompile->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE));
- ui->actionCompile_Run->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE_RUN));
ui->actionRun->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN));
ui->actionRebuild->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_REBUILD));
ui->actionRun_Parameters->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_OPTIONS));
@@ -1972,7 +1969,7 @@ void MainWindow::runExecutable(
mCompilerManager->stopPausing();
// Check if it exists
if (!fileExists(exeName)) {
- if (ui->actionCompile_Run->isEnabled()) {
+ if (ui->actionCompile->isEnabled()) {
doCompileRun(runType);
return;
} else {
@@ -4777,7 +4774,6 @@ void MainWindow::onEditorContextMenu(const QPoint& pos)
menu.addSeparator();
}
//mouse on editing area
- menu.addAction(ui->actionCompile_Run);
menu.addAction(ui->actionDebug);
if (editor->parser() && editor->parser()->enabled()) {
menu.addSeparator();
@@ -5942,12 +5938,6 @@ void MainWindow::on_tabMessages_tabBarClicked(int index)
}
}
-
-void MainWindow::on_actionCompile_Run_triggered()
-{
- doCompileRun(RunType::Normal);
-}
-
void MainWindow::on_actionRebuild_triggered()
{
mCompileSuccessionTask.reset();
diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h
index 1d113939..3cc07fe9 100644
--- a/RedPandaIDE/mainwindow.h
+++ b/RedPandaIDE/mainwindow.h
@@ -460,8 +460,6 @@ private slots:
void on_tabMessages_tabBarClicked(int index);
- void on_actionCompile_Run_triggered();
-
void on_actionRebuild_triggered();
void on_actionStop_Execution_triggered();
diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui
index f261bc59..7418e50e 100644
--- a/RedPandaIDE/mainwindow.ui
+++ b/RedPandaIDE/mainwindow.ui
@@ -154,7 +154,6 @@
-
@@ -410,7 +409,6 @@
-
@@ -2311,22 +2309,6 @@
Convert to UTF-8
-
-
-
- :/icons/images/newlook24/017-comprun.png
-
-
-
- Compile & Run
-
-
- Compile & Run
-
-
- F11
-
-