andrew
/
RecipeDB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release 1.0 Ready! #11

Merged
andrewlalis merged 6 commits from development into master 2018-04-01 07:31:09 +00:00
Conversation 0 Commits 6 Files Changed 20 +118 -28
7 changed files with 118 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7653465e9 - Show all commits

82
gui/mainwindow.ui
View File

@ -19,6 +19,11 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<family>Noto Sans</family>
</font>
</property>
<property name="mouseTracking"> <property name="mouseTracking">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -32,7 +37,13 @@
<property name="windowOpacity"> <property name="windowOpacity">
<double>1.000000000000000</double> <double>1.000000000000000</double>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<widget class="QWidget" name="mainWidget"> <widget class="QWidget" name="mainWidget">
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@ -111,6 +122,11 @@
<height>80</height> <height>80</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>20</pointsize>
</font>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -148,6 +164,11 @@ QPushButton#newButton:pressed{
<height>80</height> <height>80</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>20</pointsize>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QPushButton#openButton { <string notr="true">QPushButton#openButton {
background-color: rgb(222, 226, 255); background-color: rgb(222, 226, 255);
@ -176,6 +197,11 @@ QPushButton#openButton:pressed{
<height>80</height> <height>80</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>20</pointsize>
</font>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -213,6 +239,11 @@ QPushButton#editButton:pressed{
<height>80</height> <height>80</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>20</pointsize>
</font>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -317,11 +348,7 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Noto Sans CJK KR Light</family>
<pointsize>30</pointsize> <pointsize>30</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<stylestrategy>PreferAntialias</stylestrategy> <stylestrategy>PreferAntialias</stylestrategy>
</font> </font>
</property> </property>
@ -344,6 +371,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<pointsize>20</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>By Unknown Author</string> <string>By Unknown Author</string>
</property> </property>
@ -405,6 +437,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</property> </property>
<item> <item>
<widget class="QLabel" name="prepTimeLabel"> <widget class="QLabel" name="prepTimeLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>Prep Time:</string> <string>Prep Time:</string>
</property> </property>
@ -418,6 +455,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>Cook Time:</string> <string>Cook Time:</string>
</property> </property>
@ -428,6 +470,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</item> </item>
<item> <item>
<widget class="QLabel" name="servingsLabel"> <widget class="QLabel" name="servingsLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>Servings:</string> <string>Servings:</string>
</property> </property>
@ -507,6 +554,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(194, 196, 233);</string> <string notr="true">background-color: rgb(194, 196, 233);</string>
</property> </property>
@ -526,6 +578,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(232, 232, 232);</string> <string notr="true">background-color: rgb(232, 232, 232);</string>
</property> </property>
@ -605,6 +662,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(218, 219, 234);</string> <string notr="true">background-color: rgb(218, 219, 234);</string>
</property> </property>
@ -618,6 +680,11 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="instructionsTextEdit"> <widget class="QTextEdit" name="instructionsTextEdit">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(244, 244, 244);</string> <string notr="true">background-color: rgb(244, 244, 244);</string>
</property> </property>
@ -649,7 +716,7 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif Bold'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Liberation Serif Bold'; font-size:12pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; color:#00ff40;&quot;&gt;This is some &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:16pt; color:#a33c3e;&quot;&gt;colored text and &lt;/span&gt;&lt;a href=&quot;https://www.google.com&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;link&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; color:#00ff40;&quot;&gt;This is some &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:16pt; color:#a33c3e;&quot;&gt;colored text and &lt;/span&gt;&lt;a href=&quot;https://www.google.com&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;link&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
@ -771,6 +838,11 @@ p, li { white-space: pre-wrap; }
</property> </property>
<item> <item>
<widget class="QLabel" name="tagsLabel"> <widget class="QLabel" name="tagsLabel">
<property name="font">
<font>
<pointsize>14</pointsize>
</font>
</property>
<property name="text"> <property name="text">
<string>Tags</string> <string>Tags</string>
</property> </property>

5
gui/newDialogs/newfoodgroupdialog.ui
View File

@ -22,12 +22,14 @@
<iconset resource="../../res.qrc"> <iconset resource="../../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset> <normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property> </property>
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="font"> <property name="font">
<font> <font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>
@ -43,7 +45,6 @@
<widget class="QLineEdit" name="lineEdit"> <widget class="QLineEdit" name="lineEdit">
<property name="font"> <property name="font">
<font> <font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
</font> </font>
</property> </property>

8
gui/newDialogs/newtagdialog.ui
View File

@ -18,7 +18,7 @@
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset> <normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">font: 25 &quot;Noto Sans CJK KR Light&quot;;</string> <string notr="true"/>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
@ -31,7 +31,8 @@
<widget class="QLabel" name="tagLabel"> <widget class="QLabel" name="tagLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>13</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -48,7 +49,8 @@
<widget class="QLineEdit" name="tagEdit"> <widget class="QLineEdit" name="tagEdit">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

17
gui/newDialogs/newunitdialog.ui
View File

@ -18,7 +18,7 @@
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset> <normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">font: 25 &quot;Noto Sans CJK KR Light&quot;;</string> <string notr="true"/>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
@ -31,7 +31,8 @@
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -51,7 +52,8 @@
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -71,7 +73,8 @@
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -112,7 +115,8 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -142,7 +146,8 @@
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

14
gui/newrecipedialog.ui
View File

@ -27,7 +27,7 @@
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset> <normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">font: 25 &quot;Noto Sans CJK KR&quot;;</string> <string notr="true"/>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
@ -103,7 +103,8 @@
<widget class="QLineEdit" name="recipeNameEdit"> <widget class="QLineEdit" name="recipeNameEdit">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -126,7 +127,8 @@
<widget class="QLineEdit" name="authorNameEdit"> <widget class="QLineEdit" name="authorNameEdit">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -626,7 +628,7 @@ QPushButton#deleteTagButton:pressed{
<widget class="QLabel" name="amountLabel"> <widget class="QLabel" name="amountLabel">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -898,7 +900,7 @@ QPushButton#removeIngredientButton:pressed{
<widget class="QToolButton" name="italicsButton"> <widget class="QToolButton" name="italicsButton">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -918,7 +920,7 @@ QPushButton#removeIngredientButton:pressed{
<widget class="QToolButton" name="boldButton"> <widget class="QToolButton" name="boldButton">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

10
gui/openrecipedialog.ui
View File

@ -18,7 +18,7 @@
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset> <normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">font: 25 &quot;Noto Sans CJK KR Light&quot;;</string> <string notr="true"/>
</property> </property>
<property name="modal"> <property name="modal">
<bool>true</bool> <bool>true</bool>
@ -63,7 +63,7 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="Tags"> <widget class="QWidget" name="Tags">
<attribute name="icon"> <attribute name="icon">
@ -237,7 +237,8 @@
<widget class="QLineEdit" name="nameEdit"> <widget class="QLineEdit" name="nameEdit">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -369,7 +370,8 @@ QPushButton#exitButton:pressed{
<widget class="QTableView" name="recipeTableView"> <widget class="QTableView" name="recipeTableView">
<property name="font"> <property name="font">
<font> <font>
<weight>3</weight> <pointsize>14</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

10
main.cpp
View File

@ -41,9 +41,11 @@ Recipe checkForFirstRun(RecipeDatabase *recipeDB){
} }
void loadAndSetFonts(){ void loadAndSetFonts(){
int id = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Light.ttf"); int id = QFontDatabase::addApplicationFont(":/fonts/fonts/NotoSans-Light.ttf");
if (id == -1){
return;
}
QString family = QFontDatabase::applicationFontFamilies(id).at(0); QString family = QFontDatabase::applicationFontFamilies(id).at(0);
printf("%s\n", family.toStdString().c_str());
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -53,6 +55,10 @@ int main(int argc, char *argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
loadAndSetFonts(); loadAndSetFonts();
QFont notoFont("Noto Sans");
notoFont.setStyleHint(QFont::SansSerif);
notoFont.setWeight(QFont::Thin);
a.setFont(notoFont);
MainWindow w(&recipeDB); MainWindow w(&recipeDB);
w.loadFromRecipe(checkForFirstRun(&recipeDB)); w.loadFromRecipe(checkForFirstRun(&recipeDB));