From 59558ba86613e7ed0fdd2b72ac1e3d4ec397d785 Mon Sep 17 00:00:00 2001 From: jorenchik Date: Mon, 30 Sep 2024 20:20:17 +0300 Subject: [PATCH] label style and current file shown --- src/cpp/qtapp/main.cpp | 49 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/src/cpp/qtapp/main.cpp b/src/cpp/qtapp/main.cpp index 6262b3b..9e18d84 100644 --- a/src/cpp/qtapp/main.cpp +++ b/src/cpp/qtapp/main.cpp @@ -3,13 +3,16 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include +#include #include #include @@ -32,11 +35,13 @@ #include #include #include +#include #include "api.h" #include "parser.h" #include "trainWindow.h" -#include "stringUtils.h" + +#define TEXT_LG = 20 struct Page { int start; @@ -330,6 +335,8 @@ void SwitchPage(int pageIdx) { CreateMdems(pageSlice); } +std::regex lastPathElementExp = std::regex("(.+\\/)*(.+)"); + void loadMdem() { auto file = std::ifstream(currentPath); std::string content; @@ -347,6 +354,11 @@ void loadMdem() { makePages(); SwitchPage(0); setQuestions(questions); + std::smatch matches; + auto filename = std::regex_search(currentPath, matches, lastPathElementExp); + deckListLabel->setText( + QString::fromStdString(std::format("mdem: {}", matches[2].str())) + ); } else { std::cout << "Compilation error." << std::endl; for (auto mdem: mdems) { @@ -370,13 +382,22 @@ int main(int argc, char *argv[]) { // LeftSide QWidget *leftWidget = new QWidget(); QVBoxLayout *leftLayout = new QVBoxLayout(); - QLabel *mdemLabel = new QLabel("Mdems"); + QWidget *leftTop = new QWidget(); + QVBoxLayout *vLeftTop = new QVBoxLayout(); + QLabel *mdemLabel = new QLabel("mdems"); QFileSystemModel *model = new QFileSystemModel(); QTreeView *mdemList = new QTreeView(); + mdemLabel->setStyleSheet( + "font-size: 17px;" + "font-weight: 400;" + ); mdemSpacer = new QSpacerItem(50, 50, QSizePolicy::Minimum, QSizePolicy::Expanding); leftWidget->setLayout(leftLayout); - leftLayout->addWidget(mdemLabel); + leftLayout->addWidget(leftTop); + leftTop->setLayout(vLeftTop); + leftTop->setMinimumSize(0, 40); + vLeftTop->addWidget(mdemLabel); model->setRootPath(workingPath); // Hide all columns except the first one mdemList->setModel(model); @@ -403,9 +424,18 @@ int main(int argc, char *argv[]) { // DeckList - QLabel *deckLabel = new QLabel("Decks"); - QListView *deckList = new QListView(); - leftLayout->addWidget(deckLabel); + QLabel *deckLabel = new QLabel("decks"); + QWidget *deckLabelBox = new QWidget(); + QVBoxLayout *vDeckLabelBox = new QVBoxLayout(); + QListView *deckList = new QListView(); + deckLabel->setStyleSheet( + "font-size: 17px;" + "font-weight: 400;" + ); + deckLabelBox->setLayout(vDeckLabelBox); + vDeckLabelBox->addWidget(deckLabel); + deckLabelBox->setMinimumSize(0, 40); + leftLayout->addWidget(deckLabelBox); leftLayout->addWidget(deckList); // RightSide @@ -415,7 +445,12 @@ int main(int argc, char *argv[]) { QWidget *top = new QWidget(); QHBoxLayout *hTop = new QHBoxLayout(); - deckListLabel = new QLabel("Mdem: todo.mdem"); + deckListLabel = new QLabel(); + deckListLabel->setStyleSheet( + "font-size: 17px;" + "font-weight: 400;" + ); + top->setMinimumSize(0, 40); top->setLayout(hTop); rightLayout->addWidget(top);