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 +45 -137
14 changed files with 45 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b51029d70 - Show all commits

4
RecipeDB.pro
View File

@ -79,6 +79,4 @@ DISTFILES += \
.gitignore
RESOURCES += \
res.qrc \
images.qrc \
images.qrc
res.qrc

100
gui/mainwindow.ui
View File

@ -26,7 +26,7 @@
<string>RecipeDB</string>
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<property name="windowOpacity">
@ -111,13 +111,6 @@
<height>80</height>
</size>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>20</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
@ -155,13 +148,6 @@ QPushButton#newButton:pressed{
<height>80</height>
</size>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>20</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="styleSheet">
<string notr="true">QPushButton#openButton {
background-color: rgb(222, 226, 255);
@ -190,13 +176,6 @@ QPushButton#openButton:pressed{
<height>80</height>
</size>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>20</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
@ -234,13 +213,6 @@ QPushButton#editButton:pressed{
<height>80</height>
</size>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>20</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
@ -372,13 +344,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>14</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="text">
<string>By Unknown Author</string>
</property>
@ -440,12 +405,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</property>
<item>
<widget class="QLabel" name="prepTimeLabel">
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Prep Time:</string>
</property>
@ -459,12 +418,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<property name="enabled">
<bool>true</bool>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Cook Time:</string>
</property>
@ -475,12 +428,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</item>
<item>
<widget class="QLabel" name="servingsLabel">
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Servings:</string>
</property>
@ -560,12 +507,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<height>40</height>
</size>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Thin</family>
<pointsize>18</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(194, 196, 233);</string>
</property>
@ -585,13 +526,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(232, 232, 232);</string>
</property>
@ -671,12 +605,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
<height>40</height>
</size>
</property>
<property name="font">
<font>
<family>Noto Sans CJK KR Thin</family>
<pointsize>18</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(218, 219, 234);</string>
</property>
@ -690,12 +618,6 @@ font: &quot;Noto Sans CJK KR&quot;;</string>
</item>
<item>
<widget class="QTextEdit" name="instructionsTextEdit">
<property name="font">
<font>
<family>Noto Sans CJK KR Medium</family>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(244, 244, 244);</string>
</property>
@ -727,7 +649,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;
&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; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans CJK KR Medium'; 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:11pt; 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>
</property>
<property name="textInteractionFlags">
@ -810,7 +732,7 @@ p, li { white-space: pre-wrap; }
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/images/no_image.png</pixmap>
<pixmap resource="../res.qrc">:/images/images/no_image.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
@ -849,13 +771,6 @@ p, li { white-space: pre-wrap; }
</property>
<item>
<widget class="QLabel" name="tagsLabel">
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>16</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="text">
<string>Tags</string>
</property>
@ -866,13 +781,6 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<widget class="QListView" name="tagsListView">
<property name="font">
<font>
<family>Noto Sans CJK KR Light</family>
<pointsize>12</pointsize>
<stylestrategy>PreferAntialias</stylestrategy>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
@ -908,7 +816,7 @@ p, li { white-space: pre-wrap; }
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../res.qrc"/>
</resources>
<connections/>
</ui>

4
gui/newDialogs/newfoodgroupdialog.ui
View File

@ -19,7 +19,7 @@
<string>New Food Group</string>
</property>
<property name="windowIcon">
<iconset resource="../../images.qrc">
<iconset resource="../../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -62,7 +62,7 @@
</layout>
</widget>
<resources>
<include location="../../images.qrc"/>
<include location="../../res.qrc"/>
</resources>
<connections>
<connection>

8
gui/newDialogs/newingredientdialog.ui
View File

@ -14,7 +14,7 @@
<string>New Ingredient</string>
</property>
<property name="windowIcon">
<iconset resource="../../images.qrc">
<iconset resource="../../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<property name="modal">
@ -81,7 +81,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images.qrc">
<iconset resource="../../res.qrc">
<normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
</property>
</widget>
@ -92,7 +92,7 @@
<string/>
</property>
<property name="icon">
<iconset resource="../../images.qrc">
<iconset resource="../../res.qrc">
<normaloff>:/images/images/minus_icon.png</normaloff>:/images/images/minus_icon.png</iconset>
</property>
</widget>
@ -119,7 +119,7 @@
</layout>
</widget>
<resources>
<include location="../../images.qrc"/>
<include location="../../res.qrc"/>
</resources>
<connections>
<connection>

6
gui/newDialogs/newtagdialog.ui
View File

@ -14,7 +14,7 @@
<string>New Tag</string>
</property>
<property name="windowIcon">
<iconset resource="../../images.qrc">
<iconset resource="../../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<property name="styleSheet">
@ -31,7 +31,6 @@
<widget class="QLabel" name="tagLabel">
<property name="font">
<font>
<pointsize>13</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -49,7 +48,6 @@
<widget class="QLineEdit" name="tagEdit">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -73,7 +71,7 @@
</layout>
</widget>
<resources>
<include location="../../images.qrc"/>
<include location="../../res.qrc"/>
</resources>
<connections>
<connection>

9
gui/newDialogs/newunitdialog.ui
View File

@ -14,7 +14,7 @@
<string>New Unit</string>
</property>
<property name="windowIcon">
<iconset resource="../../images.qrc">
<iconset resource="../../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<property name="styleSheet">
@ -31,7 +31,6 @@
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -52,7 +51,6 @@
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -73,7 +71,6 @@
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -115,7 +112,6 @@
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -146,7 +142,6 @@
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -189,7 +184,7 @@
</layout>
</widget>
<resources>
<include location="../../images.qrc"/>
<include location="../../res.qrc"/>
</resources>
<connections>
<connection>

22
gui/newrecipedialog.ui
View File

@ -23,7 +23,7 @@
<string>New Recipe</string>
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<property name="styleSheet">
@ -103,7 +103,6 @@
<widget class="QLineEdit" name="recipeNameEdit">
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -127,7 +126,6 @@
<widget class="QLineEdit" name="authorNameEdit">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -175,7 +173,7 @@
<second>0</second>
<year>1999</year>
<month>12</month>
<day>22</day>
<day>21</day>
</datetime>
</property>
<property name="currentSection">
@ -326,7 +324,7 @@
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
</property>
</widget>
@ -340,7 +338,7 @@
<string notr="true">background-color: rgb(255, 255, 255);</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/minus_icon.png</normaloff>:/images/images/minus_icon.png</iconset>
</property>
</widget>
@ -578,7 +576,7 @@ QPushButton#deleteTagButton:pressed{
<string>Create a new ingredient</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
</property>
</widget>
@ -592,7 +590,7 @@ QPushButton#deleteTagButton:pressed{
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/minus_icon.png</normaloff>:/images/images/minus_icon.png</iconset>
</property>
</widget>
@ -676,7 +674,7 @@ QPushButton#deleteTagButton:pressed{
<string>Create a new unit of measure</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/plus_icon.png</normaloff>:/images/images/plus_icon.png</iconset>
</property>
</widget>
@ -690,7 +688,7 @@ QPushButton#deleteTagButton:pressed{
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/minus_icon.png</normaloff>:/images/images/minus_icon.png</iconset>
</property>
</widget>
@ -864,7 +862,7 @@ QPushButton#removeIngredientButton:pressed{
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/images/no_image.png</pixmap>
<pixmap resource="../res.qrc">:/images/images/no_image.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
@ -990,7 +988,7 @@ QPushButton#removeIngredientButton:pressed{
</customwidget>
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../res.qrc"/>
</resources>
<connections/>
</ui>

14
gui/openrecipedialog.ui
View File

@ -14,7 +14,7 @@
<string>Open Recipe</string>
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/icon.png</normaloff>:/images/images/icon.png</iconset>
</property>
<property name="styleSheet">
@ -67,7 +67,7 @@
</property>
<widget class="QWidget" name="Tags">
<attribute name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/tag.png</normaloff>:/images/images/tag.png</iconset>
</attribute>
<attribute name="title">
@ -121,7 +121,7 @@
</widget>
<widget class="QWidget" name="ingredientsTab">
<attribute name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/ingredients.png</normaloff>:/images/images/ingredients.png</iconset>
</attribute>
<attribute name="title">
@ -175,7 +175,7 @@
</widget>
<widget class="QWidget" name="foodGroups">
<attribute name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/foodPyramid.png</normaloff>:/images/images/foodPyramid.png</iconset>
</attribute>
<attribute name="title">
@ -237,7 +237,6 @@
<widget class="QLineEdit" name="nameEdit">
<property name="font">
<font>
<pointsize>12</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -315,7 +314,7 @@ QPushButton#deleteRecipeButton:pressed{
<string/>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<iconset resource="../res.qrc">
<normaloff>:/images/images/trash.png</normaloff>:/images/images/trash.png</iconset>
</property>
</widget>
@ -370,7 +369,6 @@ QPushButton#exitButton:pressed{
<widget class="QTableView" name="recipeTableView">
<property name="font">
<font>
<pointsize>14</pointsize>
<weight>3</weight>
<italic>false</italic>
<bold>false</bold>
@ -411,7 +409,7 @@ QPushButton#exitButton:pressed{
</layout>
</widget>
<resources>
<include location="../images.qrc"/>
<include location="../res.qrc"/>
</resources>
<connections/>
</ui>

7
main.cpp
View File

@ -41,7 +41,9 @@ Recipe checkForFirstRun(RecipeDatabase *recipeDB){
}
void loadAndSetFonts(){
QFontDatabase::
int id = QFontDatabase::addApplicationFont(":/fonts/NotoSans-Light.ttf");
QString family = QFontDatabase::applicationFontFamilies(id).at(0);
printf("%s\n", family.toStdString().c_str());
}
int main(int argc, char *argv[])
@ -49,6 +51,9 @@ int main(int argc, char *argv[])
RecipeDatabase recipeDB(QString(FileUtils::appDataPath+"recipes.db").toStdString());
QApplication a(argc, argv);
loadAndSetFonts();
MainWindow w(&recipeDB);
w.loadFromRecipe(checkForFirstRun(&recipeDB));
w.show();

1
model/recipe/ingredients/ingredientlistmodel.cpp
View File

@ -5,6 +5,7 @@ IngredientListModel::IngredientListModel(){
}
int IngredientListModel::rowCount(const QModelIndex &parent) const{
Q_UNUSED(parent);
return this->ingredients.size();
}

1
model/recipe/ingredients/recipeingredientlistmodel.cpp
View File

@ -5,6 +5,7 @@ RecipeIngredientListModel::RecipeIngredientListModel(){
}
int RecipeIngredientListModel::rowCount(const QModelIndex &parent) const{
Q_UNUSED(parent);
return this->ingredients.size();
}

1
model/recipe/tags/taglistmodel.cpp
View File

@ -5,6 +5,7 @@ TagListModel::TagListModel(){
}
int TagListModel::rowCount(const QModelIndex &parent) const{
Q_UNUSED(parent);
return this->tags.size();
}

4
res.qrc
View File

@ -10,4 +10,8 @@
<file>images/foodPyramid.png</file>
<file>images/ingredients.png</file>
</qresource>
<qresource prefix="/fonts">
<file>fonts/NotoSans-Light.ttf</file>
<file>fonts/NotoSans-LightItalic.ttf</file>
</qresource>
</RCC>

1
utils/aspectratiopixmaplabel.cpp
View File

@ -31,6 +31,7 @@ QPixmap AspectRatioPixmapLabel::scaledPixmap() const
void AspectRatioPixmapLabel::resizeEvent(QResizeEvent * e)
{
Q_UNUSED(e);
if(!pix.isNull())
QLabel::setPixmap(scaledPixmap());
}