From 63975d2e12f3470d0745ee494503caa68b7bc9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Fri, 20 Apr 2018 20:36:38 +0200 Subject: [PATCH] Made money tab better spaced. Also made the `accTransferText` a QPlainTextEdit instead of a QLineEdit. --- admin/mainwindow.cpp | 4 +- admin/mainwindow.ui | 154 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 140 insertions(+), 18 deletions(-) diff --git a/admin/mainwindow.cpp b/admin/mainwindow.cpp index 64ba4ae..4259a2b 100644 --- a/admin/mainwindow.cpp +++ b/admin/mainwindow.cpp @@ -882,7 +882,7 @@ void MainWindow::on_accTransferSubmit_clicked() qlonglong amount = ui->accTransferAmonut->value() * 100; qlonglong from = ui->accTransferFrom->currentData().toLongLong(); qlonglong to = ui->accTransferTo->currentData().toLongLong(); - QString text = ui->accTransferText->text(); + QString text = ui->accTransferText->toPlainText(); if (amount == 0 || from == to) return; @@ -901,7 +901,7 @@ void MainWindow::on_accTransferSubmit_clicked() ui->accTransferAmonut->setValue(0); ui->accTransferFrom->setCurrentIndex(0); ui->accTransferTo->setCurrentIndex(0); - ui->accTransferText->setText(""); + ui->accTransferText->setPlainText(""); // TODO update money values diff --git a/admin/mainwindow.ui b/admin/mainwindow.ui index 28d187e..88ed7bf 100644 --- a/admin/mainwindow.ui +++ b/admin/mainwindow.ui @@ -697,21 +697,30 @@ Qt::Horizontal - - false - - - 4 - false - + + + QLayout::SetNoConstraint + + + + 0 + 0 + + + + + 50 + 0 + + kr @@ -720,47 +729,127 @@ - - - - Notering (anledning, person, ...) + + + + + 0 + 0 + - - - + + + 0 + 0 + + Från + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + 0 + 0 + + Kronor + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + - + + + + 0 + 0 + + + + + + 0 + 0 + + Till + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + 0 + 0 + + Submit + + + + + 0 + 0 + + + + + 200 + 0 + + + + + 16777215 + 50 + + + + + 100 + 0 + + + + true + + + + + + 1 + + + Notering (anledning, person, ...) + + + @@ -772,6 +861,12 @@ + + + 0 + 0 + + QAbstractItemView::NoEditTriggers @@ -785,6 +880,12 @@ + + + 0 + 0 + + Uppdatera @@ -794,6 +895,12 @@ + + + 0 + 0 + + Kontonamn @@ -801,6 +908,12 @@ + + + 0 + 0 + + Lägg till konto @@ -810,8 +923,11 @@ - + + + QLayout::SetNoConstraint + @@ -830,6 +946,12 @@ false + + true + + + 2 + -- GitLab