comment adjustment

This commit is contained in:
jorenchik
2025-01-06 17:30:34 +02:00
parent 344d2f13b0
commit 38b1ef6a6b
2 changed files with 17 additions and 5 deletions

View File

@@ -1143,6 +1143,8 @@ QMainWindow *initMdemListWindow() {
actionOpen, actionOpen,
&QAction::triggered, &QAction::triggered,
[fileDialog]() { [fileDialog]() {
// Uzstāda failu dialogu.
fileDialog->setDirectory(QDir::homePath()); fileDialog->setDirectory(QDir::homePath());
fileDialog->setFileMode(QFileDialog::FileMode::Directory); fileDialog->setFileMode(QFileDialog::FileMode::Directory);
if ( if (
@@ -1153,11 +1155,14 @@ QMainWindow *initMdemListWindow() {
} }
fileDialog->open(); fileDialog->open();
QObject::disconnect(fileDialog, 0, 0, 0); QObject::disconnect(fileDialog, 0, 0, 0);
// Pārbaida direktoriju.
fileDialog->connect( fileDialog->connect(
fileDialog, fileDialog,
&QFileDialog::fileSelected, &QFileDialog::fileSelected,
[](QString directory) { [](QString directory) {
// Pārbauda, vai ir kas saglabājams.
bool unsavedMdem = false; bool unsavedMdem = false;
for (auto pair: buffers) { for (auto pair: buffers) {
if (pair.second->isModified) { if (pair.second->isModified) {
@@ -1165,6 +1170,8 @@ QMainWindow *initMdemListWindow() {
break; break;
} }
} }
// Izvēlas saglabājot, ja nepieciešams.
if (unsavedMdem) { if (unsavedMdem) {
auto answer = showPrompt( auto answer = showPrompt(
"Atmiņas bāzes maiņa", "Atmiņas bāzes maiņa",
@@ -1257,6 +1264,7 @@ QMainWindow *initMdemListWindow() {
{ // Redaktors. { // Redaktors.
editorWindow = new QMainWindow; editorWindow = new QMainWindow;
// Logs.
editorWindow->setWindowTitle("Jautājumu redaktors"); editorWindow->setWindowTitle("Jautājumu redaktors");
editorWindow->resize(800, 600); editorWindow->resize(800, 600);
QWidget *wEditor = new QWidget; QWidget *wEditor = new QWidget;
@@ -1271,6 +1279,7 @@ QMainWindow *initMdemListWindow() {
editor->setMarginWidth(0, 15); editor->setMarginWidth(0, 15);
editor->zoomIn(2); editor->zoomIn(2);
// Pogas.
QHBoxLayout *buttonLayout = new QHBoxLayout; QHBoxLayout *buttonLayout = new QHBoxLayout;
QWidget *editorButtons = new QWidget; QWidget *editorButtons = new QWidget;
auto btnSaveEditor = new QPushButton; auto btnSaveEditor = new QPushButton;
@@ -1402,7 +1411,7 @@ QMainWindow *initMdemListWindow() {
vlButtons->addWidget(buttonsBottom); vlButtons->addWidget(buttonsBottom);
vlButtons->setAlignment(Qt::AlignTop); vlButtons->setAlignment(Qt::AlignTop);
// Style buttons // Pogu stils.
hlButtonsTop->setContentsMargins(0, 0, 0, 0); hlButtonsTop->setContentsMargins(0, 0, 0, 0);
hlButtonsBottom->setContentsMargins(0, 5, 0, 0); hlButtonsBottom->setContentsMargins(0, 5, 0, 0);
@@ -1413,8 +1422,7 @@ QMainWindow *initMdemListWindow() {
} }
QWidget *leftWidget = new QWidget(); QWidget *leftWidget = new QWidget();
{ // Kreisā puse. { // Kreisā puse (failu saraksts).
QVBoxLayout *leftLayout = new QVBoxLayout(); QVBoxLayout *leftLayout = new QVBoxLayout();
leftWidget->setLayout(leftLayout); leftWidget->setLayout(leftLayout);
@@ -1430,6 +1438,7 @@ QMainWindow *initMdemListWindow() {
mdemList->setStyleSheet( mdemList->setStyleSheet(
"font-size: 15px;" "font-size: 15px;"
); );
auto header = mdemList->header(); auto header = mdemList->header();
header->setSectionResizeMode(QHeaderView::ResizeToContents); header->setSectionResizeMode(QHeaderView::ResizeToContents);
currentMbasePath = settings->value(SETTING_MEMORYBASE).toString(); currentMbasePath = settings->value(SETTING_MEMORYBASE).toString();
@@ -1437,6 +1446,7 @@ QMainWindow *initMdemListWindow() {
pickDirectory(currentMbasePath); pickDirectory(currentMbasePath);
} }
// Faila ielāde.
QObject::connect( QObject::connect(
mdemList, mdemList,
&QTreeView::doubleClicked, &QTreeView::doubleClicked,

View File

@@ -261,11 +261,12 @@ Result<ParseInfo> parseQuestions(const std::vector<Token>& tokens) {
// Jautājumu elementu parsēšana. // Jautājumu elementu parsēšana.
while (isInBounds(i)) { while (isInBounds(i)) {
// Pārbauda, vai nav sastapts cits jautājuma sākums, un noslēdz, ja tas tā ir. // Pārbauda,vai ir elements.
if (isInBounds(i + 3) && tokens[i].tokenType == TokenType::ElementDashStart) { if (isInBounds(i + 3) && tokens[i].tokenType == TokenType::ElementDashStart) {
// Jautājumam var būt un var nebūt pārtraukums - nosaka vai tas būtu.
size_t offset; size_t offset;
// Jautājumam var būt un var nebūt pārtraukums - papildus pieņem nekorektu
// stāvokli -> ir norādīts pārtraukums un secības modifikators.
if (tokens[i + 1].tokenType == TokenType::ElementOrderModifier) { if (tokens[i + 1].tokenType == TokenType::ElementOrderModifier) {
offset = tokens[i + 2].tokenType == TokenType::CooldownStart ? 6 : 3; offset = tokens[i + 2].tokenType == TokenType::CooldownStart ? 6 : 3;
} else { } else {
@@ -275,6 +276,7 @@ Result<ParseInfo> parseQuestions(const std::vector<Token>& tokens) {
break; break;
} }
// Šeit ir zināms, ka elements noteikti nav pārtraukums.
if (offset == 5 && tokens[i + 5].tokenType != TokenType::QuestionEnd) { if (offset == 5 && tokens[i + 5].tokenType != TokenType::QuestionEnd) {
return makeResult( return makeResult(
"Jautājuma elementam nevar būt pārtraukums", "Jautājuma elementam nevar būt pārtraukums",