Minor UI changes

nzeemin · Jan 3, 2024 · 51f0617 · 51f0617
1 parent e4ed1e0
commit 51f0617
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/!astyle.bat → emulator/!astyle.bat b/!astyle.bat → emulator/!astyle.bat
@@ -1,5 +1,5 @@
 @echo off
 set ASTYLEEXE=c:\bin\astyle.exe
-set ASTYLEOPT=-n -Q --options=astyle-cpp-options
+set ASTYLEOPT=-n -Q --options=..\astyle-cpp-options
 %ASTYLEEXE% %ASTYLEOPT% *.h *.cpp --exclude=ui_mainwindow.h
 %ASTYLEEXE% %ASTYLEOPT% Util\*.h Util\*.cpp
diff --git a/emulator/mainwindow.cpp b/emulator/mainwindow.cpp
@@ -52,7 +52,6 @@ MainWindow::MainWindow(QWidget *parent) :
     QObject::connect(ui->actionConfBK11, SIGNAL(triggered()), this, SLOT(configurationBK0011()));
     QObject::connect(ui->actionConfBK11Fdd, SIGNAL(triggered()), this, SLOT(configurationBK0011Fdd()));
     QObject::connect(ui->actionDebugConsoleView, SIGNAL(triggered()), this, SLOT(debugConsoleView()));
-    QObject::connect(ui->actionDebugDebugView, SIGNAL(triggered()), this, SLOT(debugDebugView()));
     QObject::connect(ui->actionDebugDisasmView, SIGNAL(triggered()), this, SLOT(debugDisasmView()));
     QObject::connect(ui->actionDebugMemoryView, SIGNAL(triggered()), this, SLOT(debugMemoryView()));
     QObject::connect(ui->actionDebugTeletypeView, SIGNAL(triggered()), this, SLOT(debugTeletypeView()));
@@ -116,7 +115,7 @@ MainWindow::MainWindow(QWidget *parent) :
     int maxwid = m_screen->maximumWidth() > m_keyboard->maximumWidth() ? m_screen->maximumWidth() : m_keyboard->maximumWidth();
     ui->centralWidget->setMaximumWidth(maxwid);
 
-    m_dockDebug = new QDockWidget(tr("Processor"));
+    m_dockDebug = new QDockWidget(tr("Debug"));
     m_dockDebug->setObjectName("dockDebug");
     m_dockDebug->setWidget(m_debug);
     m_dockDebug->setFeatures(m_dockDebug->features() & ~QDockWidget::DockWidgetClosable);
@@ -286,7 +285,6 @@ void MainWindow::updateMenu()
             g_pBoard->IsFloppyImageAttached(3) ? ":/images/iconFloppy.svg" : ":/images/iconFloppySlot.svg" ));
 
     ui->actionDebugConsoleView->setChecked(m_console->isVisible());
-    ui->actionDebugDebugView->setChecked(m_dockDebug->isVisible());
     ui->actionDebugDisasmView->setChecked(m_dockDisasm->isVisible());
     ui->actionDebugMemoryView->setChecked(m_dockMemory->isVisible());
     ui->actionDebugTeletypeView->setChecked(m_dockTeletype->isVisible());
@@ -649,11 +647,6 @@ void MainWindow::debugConsoleView()
 
     updateMenu();
 }
-void MainWindow::debugDebugView()
-{
-    m_dockDebug->setVisible(!m_dockDebug->isVisible());
-    updateMenu();
-}
 void MainWindow::debugDisasmView()
 {
     m_dockDisasm->setVisible(!m_dockDisasm->isVisible());

diff --git a/emulator/mainwindow.h b/emulator/mainwindow.h
@@ -64,7 +64,6 @@ public slots:
     void configurationBK0011Fdd();
     void emulatorFloppy(int slot);
     void debugConsoleView();
-    void debugDebugView();
     void debugDisasmView();
     void debugMemoryView();
     void debugTeletypeView();

diff --git a/emulator/mainwindow.ui b/emulator/mainwindow.ui
@@ -85,7 +85,6 @@
     </property>
     <addaction name="actionDebugConsoleView"/>
     <addaction name="separator"/>
-    <addaction name="actionDebugDebugView"/>
     <addaction name="actionDebugDisasmView"/>
     <addaction name="actionDebugMemoryView"/>
     <addaction name="actionDebugTeletypeView"/>
@@ -321,14 +320,6 @@
     <string>Load BIN...</string>
    </property>
   </action>
-  <action name="actionDebugDebugView">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Processor View</string>
-   </property>
-  </action>
   <action name="actionDebugDisasmView">
    <property name="checkable">
     <bool>true</bool>

diff --git a/emulator/qconsoleview.cpp b/emulator/qconsoleview.cpp
@@ -38,6 +38,7 @@ QConsoleView::QConsoleView()
     QFont font = Common_GetMonospacedFont();
     m_log->setReadOnly(true);
     m_log->setFont(font);
+    m_prompt->setFont(font);
     m_edit->setFont(font);
 
     QObject::connect(m_edit, SIGNAL(returnPressed()), this, SLOT(execConsoleCommand()));

diff --git a/emulator/qdialogs.cpp b/emulator/qdialogs.cpp
@@ -11,6 +11,10 @@ QInputOctalDialog::QInputOctalDialog(QWidget *parent, const QString & title, qui
 {
     m_result = value;
 
+    QFont font = Common_GetMonospacedFont();
+    m_editOctal.setFont(font);
+    m_editHex.setFont(font);
+
     setWindowTitle(title);
     resize(260, 120);
     m_labelOctal.setText(tr("Octal"));