diff -Nru a/animations.cpp b/animations.cpp
--- a/animations.cpp 2012-02-08 23:48:59.000000000 +0100
+++ b/animations.cpp 2015-04-29 15:40:32.000000000 +0200
@@ -77,22 +77,28 @@
paperStates[quotes]->assignProperty(paperItem, "pos", QPointF(PAPER_X_OFFSET, Y_OFFSET + QUOTE_PAPER_Y_OFFSET));
- paperStates[quotes]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(65));
+ paperStates[quotes]->assignProperty(paperRotation, "andle", QVariant::fromValue(65));
+ //paperStates[quotes]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(65));
paperStates[invoices]->assignProperty(paperItem, "pos", QPointF(PAPER_X_OFFSET, Y_OFFSET + INVOICE_Y_OFFSET + QUOTE_PAPER_Y_OFFSET));
- paperStates[invoices]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(75));
+ //paperStates[invoices]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(75));
+ paperStates[invoices]->assignProperty(paperRotation, "angle", QVariant::fromValue(75));
paperStates[receipts]->assignProperty(paperItem, "pos", QPointF(PAPER_X_OFFSET, Y_OFFSET + RECEIPTS_Y_OFFSET + QUOTE_PAPER_Y_OFFSET));
- paperStates[receipts]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(68));
+ //paperStates[receipts]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(68));
+ paperStates[receipts]->assignProperty(paperRotation, "angle", QVariant::fromValue(68));
paperStates[expenses]->assignProperty(paperItem, "pos", QPointF(PAPER_X_OFFSET, Y_OFFSET + EXPENSES_Y_OFFSET + QUOTE_PAPER_Y_OFFSET));
- paperStates[expenses]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(68));
+ //paperStates[expenses]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(68));
+ paperStates[expenses]->assignProperty(paperRotation, "angle", QVariant::fromValue(68));
paperStates[reports]->assignProperty(paperItem, "pos", QPointF(PAPER_X_OFFSET, Y_OFFSET + REPORTS_Y_OFFSET + QUOTE_PAPER_Y_OFFSET));
- paperStates[reports]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(68));
+ //paperStates[reports]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(68));
+ paperStates[reports]->assignProperty(paperRotation, "angle", QVariant::fromValue(68));
paperStates[5]->assignProperty(paperItem, "pos", QPointF(PAPER_X_OFFSET, Y_OFFSET + 300));
- paperStates[5]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(0));
+ //paperStates[5]->assignProperty(paperRotation, "angle", qVariantValue<qreal>(0));
+ paperStates[5]->assignProperty(paperRotation, "angle", QVariant::fromValue(0));
paperStates[5]->addTransition(this, SIGNAL(quotePaperPos()), paperStates[quotes]);
paperTrans[quotes] = paperStates[5]->addTransition(this, SIGNAL(paperToQuote()), paperStates[quotes]);
@@ -566,8 +572,8 @@
defaultMenuMachine->setInitialState(defaultMenuStates[OPEN]);
- defaultMenuStates[OPEN]->assignProperty(defaultMenuItem, "pos", QPointF(15, -10));
- defaultMenuStates[CLOSED]->assignProperty(defaultMenuItem, "pos", QPointF(15, -200));
+ defaultMenuStates[OPEN]->assignProperty(defaultMenuItem, "pos", QPointF(35, 25));
+ defaultMenuStates[CLOSED]->assignProperty(defaultMenuItem, "pos", QPointF(35, -200));
defaultMenuTrans = new QAbstractTransition*[2];
defaultMenuTrans[OPEN] = defaultMenuStates[CLOSED]->addTransition(this, SIGNAL(openDefaultMenu()),defaultMenuStates[OPEN]);
diff -Nru a/BusinessLogic/dbasectrl.cpp b/BusinessLogic/dbasectrl.cpp
--- a/BusinessLogic/dbasectrl.cpp 2012-02-08 23:48:56.000000000 +0100
+++ b/BusinessLogic/dbasectrl.cpp 2015-04-29 15:40:32.000000000 +0200
@@ -758,10 +758,6 @@
qWarning("Could not create PersonAtCompany table");
- //****************************************
- //*** CANT HAVE 2 AUTOINCREMENT FIELDS ***
- //*** REMOVED AUTOINCREMENT FROM qNum ***
- //****************************************
query.prepare("CREATE TABLE IF NOT EXISTS Quote "
"(id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL, "
"qNum INTEGER, "
@@ -778,10 +774,6 @@
qWarning("Could not create Quote table");
- //****************************************
- //*** CANT HAVE 2 AUTOINCREMENT FIELDS ***
- //*** REMOVED AUTOINCREMENT FROM iNum ***
- //****************************************
query.prepare("CREATE TABLE IF NOT EXISTS Invoice "
"(id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL, "
"iNum INTEGER, "
@@ -800,10 +792,6 @@
qWarning("Could not create Invoice table");
- //****************************************
- //*** CANT HAVE 2 AUTOINCREMENT FIELDS ***
- //*** REMOVED AUTOINCREMENT FROM rNum ***
- //****************************************
query.prepare("CREATE TABLE IF NOT EXISTS Receipt "
"(id INTEGER PRIMARY KEY AUTOINCREMENT UNIQUE NOT NULL, "
"rDate TEXT NOT NULL, "
diff -Nru a/imgobject.h b/imgobject.h
--- a/imgobject.h 2012-02-08 23:48:59.000000000 +0100
+++ b/imgobject.h 2015-04-29 15:40:32.000000000 +0200
@@ -21,7 +21,8 @@
#ifndef IMGOBJECT_H
#define IMGOBJECT_H
-#include <QtGui>
+//#include <QtGui>
+#include <QtWidgets>
class ImgObject : public QGraphicsObject
{
diff -Nru a/main.cpp b/main.cpp
--- a/main.cpp 2012-02-08 23:48:59.000000000 +0100
+++ b/main.cpp 2015-04-29 15:40:32.000000000 +0200
@@ -18,7 +18,7 @@
*******************************************************************************/
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include "mainwindow.h"
int main(int argc, char *argv[])
diff -Nru a/mainwindow.cpp b/mainwindow.cpp
--- a/mainwindow.cpp 2012-02-09 22:20:04.000000000 +0100
+++ b/mainwindow.cpp 2015-04-29 15:40:32.000000000 +0200
@@ -170,7 +170,7 @@
QMainWindow::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
- ui->retranslateUi(this);
+ //ui->retranslateUi(this);
break;
default:
break;
@@ -240,13 +240,15 @@
"TradieTrakka",
"<h3>About TradieTrakka</h3><br />"
- "TradieTrakka 0.5"
+ "TradieTrakka 0.5"
"<p>TradieTrakka is an application for tradesmen to quickly and<br />"
"easily manage their business administration.<br />"
"TradieTrakka can look after Contacts, Quotes, Invoices and<br />"
"Expenses.</p>"
"<p><h4>Developers</h4>"
- " Steven Tucker and Craig Hume"
+ " Steven Tucker and Craig Hume</p>"
+ "<p><h4>Artwork</h4>"
+ " Darcelle Hinze</p>"
"<p>TradieTrakka is licensed under the GNU General Public License<br />"
"version 3.0 <a href=\"http://www.gnu.org/licenses/gpl-3.0.html\">GNU General Public License</a></p>"
diff -Nru a/mainwindow.ui b/mainwindow.ui
--- a/mainwindow.ui 2012-02-09 22:20:04.000000000 +0100
+++ b/mainwindow.ui 2015-04-29 15:40:32.000000000 +0200
@@ -56,6 +56,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
+ <property name="toolTip">
+ <string>Save</string>
+ </property>
<property name="text">
<string/>
</property>
@@ -80,6 +83,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
+ <property name="toolTip">
+ <string>Print</string>
+ </property>
<property name="text">
<string/>
</property>
@@ -104,6 +110,9 @@
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
+ <property name="toolTip">
+ <string>Close</string>
+ </property>
<property name="text">
<string>...</string>
</property>
@@ -234,7 +243,7 @@
<x>0</x>
<y>0</y>
<width>772</width>
- <height>23</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
diff -Nru a/README.md b/README.md
--- a/README.md 1970-01-01 01:00:00.000000000 +0100
+++ b/README.md 2015-04-29 15:40:32.000000000 +0200
@@ -0,0 +1,2 @@
+#Tradietrakka
+TradieTrakka is a very simple, easy to use program aimed at Tradesmen running a small business. It makes life easy by making it trivial to Quote, Invoice and Generate BAS (Australian GST reporting)
diff -Nru a/TradieTrakka.pro b/TradieTrakka.pro
--- a/TradieTrakka.pro 2012-02-08 23:48:59.000000000 +0100
+++ b/TradieTrakka.pro 2015-04-29 15:40:32.000000000 +0200
@@ -27,7 +27,9 @@
FORMS += mainwindow.ui
RESOURCES += Resources/TradieTrakka.qrc
-QT += sql
+QT += sql \
+ widgets \
+ printsupport
OTHER_FILES += Resources/tradietrakka.desktop
diff -Nru a/Widgets/homewidget.cpp b/Widgets/homewidget.cpp
--- a/Widgets/homewidget.cpp 2012-02-08 23:48:56.000000000 +0100
+++ b/Widgets/homewidget.cpp 2015-04-29 15:40:32.000000000 +0200
@@ -31,11 +31,11 @@
this->dbase = dbase;
ui->setupUi(this);
- QPalette palette;
- pixmap = QPixmap(":/BackGround");
+ //QPalette palette;
+ //pixmap = QPixmap(":/BackGround");
- palette.setBrush(this->backgroundRole(), QBrush(pixmap));
- this->setPalette(palette);
+ //palette.setBrush(this->backgroundRole(), QBrush(pixmap));
+ //this->setPalette(palette);
setAutoFillBackground(true);
}
diff -Nru a/Widgets/invoicewidget.cpp b/Widgets/invoicewidget.cpp
--- a/Widgets/invoicewidget.cpp 2012-02-08 23:48:56.000000000 +0100
+++ b/Widgets/invoicewidget.cpp 2015-04-29 15:40:32.000000000 +0200
@@ -92,7 +92,7 @@
labourOnInvoiceModel->index(i, DBaseCtrl::LoI_VTotal),
Qt::DisplayRole).toDouble();
-
+ // Need to change this to handle other taxes including VAT, multiple taxes as well.
int gst = (sum / 11.0) * 100;
double transGST = gst / 100.00;
ui->gstAmount->setText(QString::number(transGST, 'f', 2));
distrib
>
Mageia
>
9
>
armv7hl
>
media
>
core-release-src
>
by-pkgid
>
b3ce26e1eec64f253969e9fb942f3832
>
files
>
2
