diff --git a/source/trsedocuments/formraseditor.cpp b/source/trsedocuments/formraseditor.cpp index b0c9b683e..4df62d90c 100644 --- a/source/trsedocuments/formraseditor.cpp +++ b/source/trsedocuments/formraseditor.cpp @@ -252,6 +252,7 @@ void FormRasEditor::InitDocument(WorkerThread *t, QSharedPointer ini, ui->txtEditor->m_autoComplete = m_iniFile->getdouble("editor_autocomplete_nobug")==1; ui->txtEditor->m_autoIndent = m_iniFile->getdouble("editor_autocomplete")==1; + ui->btnAsm->setVisible(m_currentSourceFile.toLower().endsWith(".ras")); } @@ -312,7 +313,7 @@ void FormRasEditor::Build(bool isShadow) if (!(QApplication::keyboardModifiers() & Qt::ShiftModifier)) if (!isShadow) if (m_projectIniFile->getString("main_ras_file")!="none") { - if (m_projectIniFile->getString("main_ras_file")!=m_currentFileShort) { + if (m_projectIniFile->getString("main_ras_file")!=m_currentFileShort) { emit requestBuildMain(m_run); return; } @@ -1396,3 +1397,10 @@ void FormRasEditor::on_btnViewHelp_clicked() Help(ui->widgetHelp->m_currentWord); } + +void FormRasEditor::on_btnAsm_clicked() +{ + LookupAssemblerUnderCursor(); + +} + diff --git a/source/trsedocuments/formraseditor.h b/source/trsedocuments/formraseditor.h index 369c2cdc7..655b2367f 100644 --- a/source/trsedocuments/formraseditor.h +++ b/source/trsedocuments/formraseditor.h @@ -95,7 +95,7 @@ class FormRasEditor : public TRSEDocument BuilderThread m_builderThread; QElapsedTimer m_timer; int m_lastBuild= 0; - QVector3D m_curCol = QVector3D(180,160,50);; + QVector3D m_curCol = QVector3D(180,160,50); QVector3D m_startCol = QVector3D(64,32,0); QVector3D m_endCol = QVector3D(255,200,100); @@ -112,7 +112,6 @@ class FormRasEditor : public TRSEDocument void FocusOnOutput(); - void LoadRasFile(QString fileName); void ExecutePrg(QString fileName); void InitDocument(WorkerThread *t, QSharedPointer ini, QSharedPointer iniProject) override; void setupEditor(); @@ -209,6 +208,7 @@ private slots: void on_chkDisplayAddresses_stateChanged(int arg1); void on_chkDisplayCycles_stateChanged(int arg1); void on_btnViewHelp_clicked(); + void on_btnAsm_clicked(); }; #endif // FORMRASEDITOR_H diff --git a/source/trsedocuments/formraseditor.ui b/source/trsedocuments/formraseditor.ui index f4f0e3f49..02d1eaaff 100644 --- a/source/trsedocuments/formraseditor.ui +++ b/source/trsedocuments/formraseditor.ui @@ -37,6 +37,13 @@ + + + + View Asm (f3) + + +