New Recipe Dialog is almost done.
This commit is contained in:
		
							parent
							
								
									358bc8de5d
								
							
						
					
					
						commit
						49d9004eae
					
				| 
						 | 
				
			
			@ -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></string>
 | 
			
		||||
               </property>
 | 
			
		||||
               <property name="textInteractionFlags">
 | 
			
		||||
                <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
 | 
			
		||||
                <set>Qt::TextSelectableByMouse</set>
 | 
			
		||||
               </property>
 | 
			
		||||
              </widget>
 | 
			
		||||
             </item>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,18 +1,382 @@
 | 
			
		|||
<?xml version='1.0'?>
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<ui version="4.0">
 | 
			
		||||
 <class>NewRecipeDialog</class>
 | 
			
		||||
 <widget class="QDialog" name="NewRecipeDialog">
 | 
			
		||||
  <property name="enabled">
 | 
			
		||||
   <bool>true</bool>
 | 
			
		||||
  </property>
 | 
			
		||||
  <property name="geometry">
 | 
			
		||||
   <rect>
 | 
			
		||||
    <x>0</x>
 | 
			
		||||
    <y>0</y>
 | 
			
		||||
    <width>640</width>
 | 
			
		||||
    <height>480</height>
 | 
			
		||||
    <height>640</height>
 | 
			
		||||
   </rect>
 | 
			
		||||
  </property>
 | 
			
		||||
  <property name="windowTitle">
 | 
			
		||||
   <string>Dialog</string>
 | 
			
		||||
  <property name="sizePolicy">
 | 
			
		||||
   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
 | 
			
		||||
    <horstretch>0</horstretch>
 | 
			
		||||
    <verstretch>0</verstretch>
 | 
			
		||||
   </sizepolicy>
 | 
			
		||||
  </property>
 | 
			
		||||
  <property name="windowTitle">
 | 
			
		||||
   <string>New Recipe</string>
 | 
			
		||||
  </property>
 | 
			
		||||
  <property name="styleSheet">
 | 
			
		||||
   <string notr="true">font: 25 14pt "Noto Sans CJK KR";</string>
 | 
			
		||||
  </property>
 | 
			
		||||
  <layout class="QVBoxLayout" name="verticalLayout">
 | 
			
		||||
   <item alignment="Qt::AlignTop">
 | 
			
		||||
    <widget class="QWidget" name="recipeNamePanel" native="true">
 | 
			
		||||
     <layout class="QVBoxLayout" name="verticalLayout_2">
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QLabel" name="recipeNameLabel">
 | 
			
		||||
        <property name="font">
 | 
			
		||||
         <font>
 | 
			
		||||
          <family>Noto Sans CJK KR</family>
 | 
			
		||||
          <pointsize>14</pointsize>
 | 
			
		||||
          <weight>3</weight>
 | 
			
		||||
          <italic>false</italic>
 | 
			
		||||
          <bold>false</bold>
 | 
			
		||||
         </font>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="text">
 | 
			
		||||
         <string>New Recipe Name</string>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="alignment">
 | 
			
		||||
         <set>Qt::AlignCenter</set>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QLineEdit" name="recipeNameEdit">
 | 
			
		||||
        <property name="alignment">
 | 
			
		||||
         <set>Qt::AlignCenter</set>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="placeholderText">
 | 
			
		||||
         <string>Recipe Name</string>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QWidget" name="basicInfoPanel" native="true">
 | 
			
		||||
        <layout class="QHBoxLayout" name="horizontalLayout">
 | 
			
		||||
         <item alignment="Qt::AlignTop">
 | 
			
		||||
          <widget class="QWidget" name="prepTimePanel" native="true">
 | 
			
		||||
           <layout class="QVBoxLayout" name="verticalLayout_3">
 | 
			
		||||
            <item>
 | 
			
		||||
             <widget class="QLabel" name="label">
 | 
			
		||||
              <property name="text">
 | 
			
		||||
               <string>Prep Time</string>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="alignment">
 | 
			
		||||
               <set>Qt::AlignCenter</set>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
            <item>
 | 
			
		||||
             <widget class="QTimeEdit" name="prepTimeEdit">
 | 
			
		||||
              <property name="dateTime">
 | 
			
		||||
               <datetime>
 | 
			
		||||
                <hour>0</hour>
 | 
			
		||||
                <minute>0</minute>
 | 
			
		||||
                <second>0</second>
 | 
			
		||||
                <year>1999</year>
 | 
			
		||||
                <month>12</month>
 | 
			
		||||
                <day>29</day>
 | 
			
		||||
               </datetime>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="currentSection">
 | 
			
		||||
               <enum>QDateTimeEdit::HourSection</enum>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="displayFormat">
 | 
			
		||||
               <string>hh:mm:ss</string>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="timeSpec">
 | 
			
		||||
               <enum>Qt::UTC</enum>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="time">
 | 
			
		||||
               <time>
 | 
			
		||||
                <hour>0</hour>
 | 
			
		||||
                <minute>0</minute>
 | 
			
		||||
                <second>0</second>
 | 
			
		||||
               </time>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
           </layout>
 | 
			
		||||
          </widget>
 | 
			
		||||
         </item>
 | 
			
		||||
         <item alignment="Qt::AlignTop">
 | 
			
		||||
          <widget class="QWidget" name="cookTimePanel" native="true">
 | 
			
		||||
           <layout class="QVBoxLayout" name="verticalLayout_4">
 | 
			
		||||
            <item>
 | 
			
		||||
             <widget class="QLabel" name="label_2">
 | 
			
		||||
              <property name="text">
 | 
			
		||||
               <string>Cook Time</string>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="alignment">
 | 
			
		||||
               <set>Qt::AlignCenter</set>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
            <item>
 | 
			
		||||
             <widget class="QTimeEdit" name="cookTimeEdit">
 | 
			
		||||
              <property name="currentSection">
 | 
			
		||||
               <enum>QDateTimeEdit::HourSection</enum>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="displayFormat">
 | 
			
		||||
               <string>hh:mm:ss</string>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="timeSpec">
 | 
			
		||||
               <enum>Qt::UTC</enum>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="time">
 | 
			
		||||
               <time>
 | 
			
		||||
                <hour>0</hour>
 | 
			
		||||
                <minute>0</minute>
 | 
			
		||||
                <second>0</second>
 | 
			
		||||
               </time>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
           </layout>
 | 
			
		||||
          </widget>
 | 
			
		||||
         </item>
 | 
			
		||||
         <item alignment="Qt::AlignTop">
 | 
			
		||||
          <widget class="QWidget" name="servingsWidget" native="true">
 | 
			
		||||
           <layout class="QVBoxLayout" name="verticalLayout_5">
 | 
			
		||||
            <item>
 | 
			
		||||
             <widget class="QLabel" name="label_3">
 | 
			
		||||
              <property name="text">
 | 
			
		||||
               <string>Servings</string>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="alignment">
 | 
			
		||||
               <set>Qt::AlignCenter</set>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
            <item>
 | 
			
		||||
             <widget class="QDoubleSpinBox" name="doubleSpinBox">
 | 
			
		||||
              <property name="decimals">
 | 
			
		||||
               <number>1</number>
 | 
			
		||||
              </property>
 | 
			
		||||
              <property name="value">
 | 
			
		||||
               <double>1.000000000000000</double>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
           </layout>
 | 
			
		||||
          </widget>
 | 
			
		||||
         </item>
 | 
			
		||||
        </layout>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item alignment="Qt::AlignTop">
 | 
			
		||||
       <widget class="QWidget" name="ingredientsPanel" native="true">
 | 
			
		||||
        <property name="sizePolicy">
 | 
			
		||||
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
 | 
			
		||||
          <horstretch>0</horstretch>
 | 
			
		||||
          <verstretch>0</verstretch>
 | 
			
		||||
         </sizepolicy>
 | 
			
		||||
        </property>
 | 
			
		||||
        <layout class="QVBoxLayout" name="verticalLayout_6">
 | 
			
		||||
         <property name="sizeConstraint">
 | 
			
		||||
          <enum>QLayout::SetMaximumSize</enum>
 | 
			
		||||
         </property>
 | 
			
		||||
         <item>
 | 
			
		||||
          <widget class="QLabel" name="label_4">
 | 
			
		||||
           <property name="text">
 | 
			
		||||
            <string>Ingredients</string>
 | 
			
		||||
           </property>
 | 
			
		||||
           <property name="alignment">
 | 
			
		||||
            <set>Qt::AlignCenter</set>
 | 
			
		||||
           </property>
 | 
			
		||||
          </widget>
 | 
			
		||||
         </item>
 | 
			
		||||
         <item>
 | 
			
		||||
          <widget class="QWidget" name="ingredientsSubPanel" native="true">
 | 
			
		||||
           <layout class="QHBoxLayout" name="horizontalLayout_2">
 | 
			
		||||
            <item alignment="Qt::AlignLeft">
 | 
			
		||||
             <widget class="QListView" name="listView">
 | 
			
		||||
              <property name="batchSize">
 | 
			
		||||
               <number>100</number>
 | 
			
		||||
              </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
            <item alignment="Qt::AlignTop">
 | 
			
		||||
             <widget class="QWidget" name="addIngredientPanel" native="true">
 | 
			
		||||
              <layout class="QVBoxLayout" name="verticalLayout_7">
 | 
			
		||||
               <property name="spacing">
 | 
			
		||||
                <number>5</number>
 | 
			
		||||
               </property>
 | 
			
		||||
               <property name="leftMargin">
 | 
			
		||||
                <number>0</number>
 | 
			
		||||
               </property>
 | 
			
		||||
               <property name="topMargin">
 | 
			
		||||
                <number>0</number>
 | 
			
		||||
               </property>
 | 
			
		||||
               <property name="rightMargin">
 | 
			
		||||
                <number>0</number>
 | 
			
		||||
               </property>
 | 
			
		||||
               <property name="bottomMargin">
 | 
			
		||||
                <number>0</number>
 | 
			
		||||
               </property>
 | 
			
		||||
               <item>
 | 
			
		||||
                <widget class="QLabel" name="addIngredientLabel">
 | 
			
		||||
                 <property name="text">
 | 
			
		||||
                  <string>Add Ingredient</string>
 | 
			
		||||
                 </property>
 | 
			
		||||
                 <property name="alignment">
 | 
			
		||||
                  <set>Qt::AlignCenter</set>
 | 
			
		||||
                 </property>
 | 
			
		||||
                </widget>
 | 
			
		||||
               </item>
 | 
			
		||||
               <item>
 | 
			
		||||
                <widget class="QWidget" name="ingredientNamePanel" native="true">
 | 
			
		||||
                 <layout class="QHBoxLayout" name="horizontalLayout_4">
 | 
			
		||||
                  <property name="spacing">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="leftMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="topMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="rightMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="bottomMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <item>
 | 
			
		||||
                   <widget class="QComboBox" name="ingredientNameBox">
 | 
			
		||||
                    <property name="sizePolicy">
 | 
			
		||||
                     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
 | 
			
		||||
                      <horstretch>0</horstretch>
 | 
			
		||||
                      <verstretch>0</verstretch>
 | 
			
		||||
                     </sizepolicy>
 | 
			
		||||
                    </property>
 | 
			
		||||
                    <property name="currentText">
 | 
			
		||||
                     <string/>
 | 
			
		||||
                    </property>
 | 
			
		||||
                   </widget>
 | 
			
		||||
                  </item>
 | 
			
		||||
                  <item>
 | 
			
		||||
                   <widget class="QPushButton" name="newIngredientButton">
 | 
			
		||||
                    <property name="text">
 | 
			
		||||
                     <string>New</string>
 | 
			
		||||
                    </property>
 | 
			
		||||
                   </widget>
 | 
			
		||||
                  </item>
 | 
			
		||||
                 </layout>
 | 
			
		||||
                </widget>
 | 
			
		||||
               </item>
 | 
			
		||||
               <item>
 | 
			
		||||
                <widget class="QWidget" name="quantityPanel" native="true">
 | 
			
		||||
                 <property name="minimumSize">
 | 
			
		||||
                  <size>
 | 
			
		||||
                   <width>0</width>
 | 
			
		||||
                   <height>36</height>
 | 
			
		||||
                  </size>
 | 
			
		||||
                 </property>
 | 
			
		||||
                 <layout class="QHBoxLayout" name="horizontalLayout_3">
 | 
			
		||||
                  <property name="spacing">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="leftMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="topMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="rightMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <property name="bottomMargin">
 | 
			
		||||
                   <number>0</number>
 | 
			
		||||
                  </property>
 | 
			
		||||
                  <item>
 | 
			
		||||
                   <widget class="QLabel" name="amountLabel">
 | 
			
		||||
                    <property name="font">
 | 
			
		||||
                     <font>
 | 
			
		||||
                      <family>Noto Sans CJK KR</family>
 | 
			
		||||
                      <pointsize>14</pointsize>
 | 
			
		||||
                      <weight>3</weight>
 | 
			
		||||
                      <italic>false</italic>
 | 
			
		||||
                      <bold>false</bold>
 | 
			
		||||
                     </font>
 | 
			
		||||
                    </property>
 | 
			
		||||
                    <property name="text">
 | 
			
		||||
                     <string>Amount</string>
 | 
			
		||||
                    </property>
 | 
			
		||||
                   </widget>
 | 
			
		||||
                  </item>
 | 
			
		||||
                  <item>
 | 
			
		||||
                   <widget class="QDoubleSpinBox" name="quantitySpinBox">
 | 
			
		||||
                    <property name="sizePolicy">
 | 
			
		||||
                     <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
 | 
			
		||||
                      <horstretch>0</horstretch>
 | 
			
		||||
                      <verstretch>0</verstretch>
 | 
			
		||||
                     </sizepolicy>
 | 
			
		||||
                    </property>
 | 
			
		||||
                    <property name="maximum">
 | 
			
		||||
                     <double>10000.000000000000000</double>
 | 
			
		||||
                    </property>
 | 
			
		||||
                    <property name="value">
 | 
			
		||||
                     <double>1.000000000000000</double>
 | 
			
		||||
                    </property>
 | 
			
		||||
                   </widget>
 | 
			
		||||
                  </item>
 | 
			
		||||
                 </layout>
 | 
			
		||||
                </widget>
 | 
			
		||||
               </item>
 | 
			
		||||
               <item>
 | 
			
		||||
                <widget class="QComboBox" name="unitComboBox"/>
 | 
			
		||||
               </item>
 | 
			
		||||
               <item>
 | 
			
		||||
                <widget class="QLineEdit" name="commentsLineEdit">
 | 
			
		||||
                 <property name="minimumSize">
 | 
			
		||||
                  <size>
 | 
			
		||||
                   <width>0</width>
 | 
			
		||||
                   <height>0</height>
 | 
			
		||||
                  </size>
 | 
			
		||||
                 </property>
 | 
			
		||||
                 <property name="frame">
 | 
			
		||||
                  <bool>false</bool>
 | 
			
		||||
                 </property>
 | 
			
		||||
                 <property name="alignment">
 | 
			
		||||
                  <set>Qt::AlignCenter</set>
 | 
			
		||||
                 </property>
 | 
			
		||||
                 <property name="placeholderText">
 | 
			
		||||
                  <string>Comments</string>
 | 
			
		||||
                 </property>
 | 
			
		||||
                 <property name="clearButtonEnabled">
 | 
			
		||||
                  <bool>false</bool>
 | 
			
		||||
                 </property>
 | 
			
		||||
                </widget>
 | 
			
		||||
               </item>
 | 
			
		||||
               <item>
 | 
			
		||||
                <widget class="QPushButton" name="addIngredientButton">
 | 
			
		||||
                 <property name="text">
 | 
			
		||||
                  <string>Add</string>
 | 
			
		||||
                 </property>
 | 
			
		||||
                </widget>
 | 
			
		||||
               </item>
 | 
			
		||||
              </layout>
 | 
			
		||||
             </widget>
 | 
			
		||||
            </item>
 | 
			
		||||
           </layout>
 | 
			
		||||
          </widget>
 | 
			
		||||
         </item>
 | 
			
		||||
        </layout>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
     </layout>
 | 
			
		||||
    </widget>
 | 
			
		||||
   </item>
 | 
			
		||||
  </layout>
 | 
			
		||||
 </widget>
 | 
			
		||||
 <resources/>
 | 
			
		||||
 <connections/>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										5
									
								
								main.cpp
								
								
								
								
							
							
						
						
									
										5
									
								
								main.cpp
								
								
								
								
							| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
#include "userInterface/mainwindow.h"
 | 
			
		||||
#include "gui/newrecipedialog.h"
 | 
			
		||||
#include <QApplication>
 | 
			
		||||
 | 
			
		||||
#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();
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue