From 49d9004eae5c66f0cb757877b57b6af82f41f71a Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Sun, 4 Mar 2018 10:19:32 +0100 Subject: [PATCH] New Recipe Dialog is almost done. --- gui/mainwindow.ui | 2 +- gui/newrecipedialog.ui | 372 ++++++++++++++++++++++++++++++++++++++++- main.cpp | 5 + 3 files changed, 374 insertions(+), 5 deletions(-) diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui index 267cc6b..e93bbfd 100644 --- a/gui/mainwindow.ui +++ b/gui/mainwindow.ui @@ -497,7 +497,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; color:#00ff40;">This is some </span><span style=" font-family:'MS Shell Dlg 2'; font-size:16pt; color:#a33c3e;">colored text and </span><a href="https://www.google.com"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">link</span></a></p></body></html> - Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + Qt::TextSelectableByMouse diff --git a/gui/newrecipedialog.ui b/gui/newrecipedialog.ui index 5248942..0482bfe 100644 --- a/gui/newrecipedialog.ui +++ b/gui/newrecipedialog.ui @@ -1,18 +1,382 @@ - + NewRecipeDialog + + true + 0 0 640 - 480 + 640 - - Dialog + + + 0 + 0 + + + New Recipe + + + font: 25 14pt "Noto Sans CJK KR"; + + + + + + + + + + Noto Sans CJK KR + 14 + 3 + false + false + + + + New Recipe Name + + + Qt::AlignCenter + + + + + + + Qt::AlignCenter + + + Recipe Name + + + + + + + + + + + + + Prep Time + + + Qt::AlignCenter + + + + + + + + 0 + 0 + 0 + 1999 + 12 + 29 + + + + QDateTimeEdit::HourSection + + + hh:mm:ss + + + Qt::UTC + + + + + + + + + + + + + + + + Cook Time + + + Qt::AlignCenter + + + + + + + QDateTimeEdit::HourSection + + + hh:mm:ss + + + Qt::UTC + + + + + + + + + + + + + + + + Servings + + + Qt::AlignCenter + + + + + + + 1 + + + 1.000000000000000 + + + + + + + + + + + + + + 0 + 0 + + + + + QLayout::SetMaximumSize + + + + + Ingredients + + + Qt::AlignCenter + + + + + + + + + + 100 + + + + + + + + 5 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Add Ingredient + + + Qt::AlignCenter + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + + + + + + New + + + + + + + + + + + 0 + 36 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + Noto Sans CJK KR + 14 + 3 + false + false + + + + Amount + + + + + + + + 0 + 0 + + + + 10000.000000000000000 + + + 1.000000000000000 + + + + + + + + + + + + + + 0 + 0 + + + + false + + + Qt::AlignCenter + + + Comments + + + false + + + + + + + Add + + + + + + + + + + + + + + + + diff --git a/main.cpp b/main.cpp index 1cadc3c..38b8ee6 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,5 @@ #include "userInterface/mainwindow.h" +#include "gui/newrecipedialog.h" #include #include "model/database/database.h" @@ -29,5 +30,9 @@ int main(int argc, char *argv[]) w.loadFromRecipe(reloadRec); + NewRecipeDialog d; + d.show(); + d.exec(); + return a.exec(); }