- change: Remove "Compile & Run" menu item. It's replaced by "Run".
This commit is contained in:
parent
a410226f46
commit
52eb2960ac
1
NEWS.md
1
NEWS.md
|
@ -33,6 +33,7 @@ Red Panda C++ Version 2.12
|
||||||
- enhancement: Toggle comment for asm/makefile/lua files.
|
- enhancement: Toggle comment for asm/makefile/lua files.
|
||||||
- enhancement: Delay for tooltips.
|
- enhancement: Delay for tooltips.
|
||||||
- enhancement: "Tool tips delay" option in Options/editor/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
|
Red Panda C++ Version 2.11
|
||||||
|
|
||||||
|
|
|
@ -677,7 +677,6 @@ void MainWindow::updateCompileActions(const Editor *e)
|
||||||
//|| mCompilerManager->backgroundSyntaxChecking()
|
//|| mCompilerManager->backgroundSyntaxChecking()
|
||||||
|| mCompilerManager->running() || mDebugger->executing()) {
|
|| mCompilerManager->running() || mDebugger->executing()) {
|
||||||
ui->actionCompile->setEnabled(false);
|
ui->actionCompile->setEnabled(false);
|
||||||
ui->actionCompile_Run->setEnabled(false);
|
|
||||||
ui->actionRun->setEnabled(false);
|
ui->actionRun->setEnabled(false);
|
||||||
ui->actionRebuild->setEnabled(false);
|
ui->actionRebuild->setEnabled(false);
|
||||||
ui->actionGenerate_Assembly->setEnabled(false);
|
ui->actionGenerate_Assembly->setEnabled(false);
|
||||||
|
@ -719,7 +718,6 @@ void MainWindow::updateCompileActions(const Editor *e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ui->actionCompile->setEnabled(canCompile);
|
ui->actionCompile->setEnabled(canCompile);
|
||||||
ui->actionCompile_Run->setEnabled(canRun && canCompile);
|
|
||||||
ui->actionRun->setEnabled(canRun);
|
ui->actionRun->setEnabled(canRun);
|
||||||
ui->actionRebuild->setEnabled(canCompile);
|
ui->actionRebuild->setEnabled(canCompile);
|
||||||
ui->actionGenerate_Assembly->setEnabled(canGenerateAssembly);
|
ui->actionGenerate_Assembly->setEnabled(canGenerateAssembly);
|
||||||
|
@ -1710,7 +1708,6 @@ void MainWindow::updateActionIcons()
|
||||||
|
|
||||||
|
|
||||||
ui->actionCompile->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_COMPILE));
|
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->actionRun->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_RUN));
|
||||||
ui->actionRebuild->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_REBUILD));
|
ui->actionRebuild->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_REBUILD));
|
||||||
ui->actionRun_Parameters->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_OPTIONS));
|
ui->actionRun_Parameters->setIcon(pIconsManager->getIcon(IconsManager::ACTION_RUN_OPTIONS));
|
||||||
|
@ -1972,7 +1969,7 @@ void MainWindow::runExecutable(
|
||||||
mCompilerManager->stopPausing();
|
mCompilerManager->stopPausing();
|
||||||
// Check if it exists
|
// Check if it exists
|
||||||
if (!fileExists(exeName)) {
|
if (!fileExists(exeName)) {
|
||||||
if (ui->actionCompile_Run->isEnabled()) {
|
if (ui->actionCompile->isEnabled()) {
|
||||||
doCompileRun(runType);
|
doCompileRun(runType);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
@ -4777,7 +4774,6 @@ void MainWindow::onEditorContextMenu(const QPoint& pos)
|
||||||
menu.addSeparator();
|
menu.addSeparator();
|
||||||
}
|
}
|
||||||
//mouse on editing area
|
//mouse on editing area
|
||||||
menu.addAction(ui->actionCompile_Run);
|
|
||||||
menu.addAction(ui->actionDebug);
|
menu.addAction(ui->actionDebug);
|
||||||
if (editor->parser() && editor->parser()->enabled()) {
|
if (editor->parser() && editor->parser()->enabled()) {
|
||||||
menu.addSeparator();
|
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()
|
void MainWindow::on_actionRebuild_triggered()
|
||||||
{
|
{
|
||||||
mCompileSuccessionTask.reset();
|
mCompileSuccessionTask.reset();
|
||||||
|
|
|
@ -460,8 +460,6 @@ private slots:
|
||||||
|
|
||||||
void on_tabMessages_tabBarClicked(int index);
|
void on_tabMessages_tabBarClicked(int index);
|
||||||
|
|
||||||
void on_actionCompile_Run_triggered();
|
|
||||||
|
|
||||||
void on_actionRebuild_triggered();
|
void on_actionRebuild_triggered();
|
||||||
|
|
||||||
void on_actionStop_Execution_triggered();
|
void on_actionStop_Execution_triggered();
|
||||||
|
|
|
@ -154,7 +154,6 @@
|
||||||
</property>
|
</property>
|
||||||
<addaction name="actionCompile"/>
|
<addaction name="actionCompile"/>
|
||||||
<addaction name="actionRun"/>
|
<addaction name="actionRun"/>
|
||||||
<addaction name="actionCompile_Run"/>
|
|
||||||
<addaction name="actionRebuild"/>
|
<addaction name="actionRebuild"/>
|
||||||
<addaction name="actionGenerate_Assembly"/>
|
<addaction name="actionGenerate_Assembly"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
@ -410,7 +409,6 @@
|
||||||
</attribute>
|
</attribute>
|
||||||
<addaction name="actionCompile"/>
|
<addaction name="actionCompile"/>
|
||||||
<addaction name="actionRun"/>
|
<addaction name="actionRun"/>
|
||||||
<addaction name="actionCompile_Run"/>
|
|
||||||
<addaction name="actionRebuild"/>
|
<addaction name="actionRebuild"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
<addaction name="actionRun_Parameters"/>
|
<addaction name="actionRun_Parameters"/>
|
||||||
|
@ -2311,22 +2309,6 @@
|
||||||
<string>Convert to UTF-8</string>
|
<string>Convert to UTF-8</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
<action name="actionCompile_Run">
|
|
||||||
<property name="icon">
|
|
||||||
<iconset>
|
|
||||||
<normalon>:/icons/images/newlook24/017-comprun.png</normalon>
|
|
||||||
</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Compile & Run</string>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Compile & Run</string>
|
|
||||||
</property>
|
|
||||||
<property name="shortcut">
|
|
||||||
<string>F11</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="actionRebuild">
|
<action name="actionRebuild">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset>
|
||||||
|
|
Loading…
Reference in New Issue