From 812a0036787bea3833bdbf2684a706d4a7165cf1 Mon Sep 17 00:00:00 2001 From: bd Date: Mon, 21 Apr 2025 17:09:00 -0400 Subject: Add tab bar --- gui/gui.cc | 2 + gui/gui.ui | 227 +++++++++++++++++++++++++++++++++-------------- gui/resources/styles.qss | 13 ++- 3 files changed, 173 insertions(+), 69 deletions(-) diff --git a/gui/gui.cc b/gui/gui.cc index 294a7d0..30c4a07 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -233,11 +233,13 @@ void GUI::onWorkerWriteBackInfo(const std::vector info) { if (!info.empty()) { ui->write_mnemonic->setText(mnemonicToString((Mnemonic)info[0])); + ui->write_squashed->setText(QString::number(info[1])); ui->write_s1->set_value(info[2]); ui->write_s2->set_value(info[3]); ui->write_s3->set_value(info[4]); } else { ui->write_mnemonic->clear(); + ui->write_squashed->clear(); ui->write_s1->clear(); ui->write_s2->clear(); ui->write_s3->clear(); diff --git a/gui/gui.ui b/gui/gui.ui index dbb3a33..e81bca9 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -24,80 +24,128 @@ - - - - - - true - - - - Registers - - - - - - - + - - - - - - true - - - - DRAM - - - - - - - - 500 - 0 - - - - - + + + + 700 + 0 + + + + 0 + + + + Registers + + + + + + + + + + DRAM + + + + + + + 500 + 0 + + + + + + + + + Level 1 + + + + + + + 500 + 0 + + + + + + + - - - - - - true - - - - Cache - - - - - - - - 500 - 0 - - - - - + + + + + + + + + 120 + 16777215 + + + + + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + + + + s1 + + + + + + + s2 + + + + + + + s3 + + + + + + + alias + + + + + + + dead + + + + + + @@ -113,6 +161,27 @@ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + + + + + + + + + + + + + + + + + + + @@ -145,6 +214,27 @@ Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + + + + + + + + + + + + + + + + + + + @@ -314,6 +404,13 @@ + + + + + + + diff --git a/gui/resources/styles.qss b/gui/resources/styles.qss index dbaa623..ee92867 100644 --- a/gui/resources/styles.qss +++ b/gui/resources/styles.qss @@ -107,14 +107,19 @@ QCheckBox::indicator { QCheckBox::indicator:unchecked { } -/* QCheckBox::indicator:unchecked:pressed { */ -/* image: url(:/images/checkbox_unchecked_pressed.png); */ -/* } */ - QCheckBox::indicator:checked { background: "#00cc00"; } +QTabWidget::tab-bar { + alignment: center; +} + +QTabBar::tab:selected { + color: "#000200"; + background-color: "#00cc00"; +} + QSlider::groove:horizontal { height: 10px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ background: "#00cc00"; -- cgit v1.2.3