Update generated files

src/abouttypica.cpp

@@ -17,7 +17,7 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 6801 "./typica.w"
+#line 6808 "./typica.w"
 
 /*:288*/
 #line 36 "./abouttypica.w"

src/daterangeselector.cpp

@@ -1,4 +1,4 @@
-/*694:*/
+/*695:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*696:*/
+/*697:*/
 #line 117 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:696*//*697:*/
+/*:697*//*698:*/
 #line 165 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:697*//*698:*/
+/*:698*//*699:*/
 #line 174 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:698*//*699:*/
+/*:699*//*700:*/
 #line 191 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:699*/
+/*:700*/
 #line 81 "./daterangeselector.w"
 
-/*700:*/
+/*701:*/
 #line 209 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
@@ -108,7 +108,7 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*701:*/
+/*702:*/
 #line 238 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:701*/
+/*:702*/
 #line 219 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:700*//*702:*/
+/*:701*//*703:*/
 #line 321 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:702*//*703:*/
+/*:703*//*704:*/
 #line 338 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:703*//*704:*/
+/*:704*//*705:*/
 #line 349 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:704*//*705:*/
+/*:705*//*706:*/
 #line 364 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:705*//*706:*/
+/*:706*//*707:*/
 #line 406 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:706*//*707:*/
+/*:707*//*708:*/
 #line 414 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
 return quickSelector->currentIndex();
 }
 
-/*:707*//*708:*/
+/*:708*//*709:*/
 #line 434 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:708*//*709:*/
+/*:709*//*710:*/
 #line 444 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -317,7 +317,7 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:709*/
+/*:710*/
 #line 82 "./daterangeselector.w"
 
 
@@ -327,4 +327,4 @@ quickSelector->removeItem(index);
 #endif
 #endif
 
-/*:694*/
+/*:695*/

src/daterangeselector.h

@@ -1,4 +1,4 @@
-/*693:*/
+/*694:*/
 #line 30 "./daterangeselector.w"
 
 
@@ -9,7 +9,7 @@
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-/*695:*/
+/*696:*/
 #line 93 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
@@ -31,7 +31,7 @@ QCalendarWidget*endDateSelector;
 QPushButton*applyButton;
 };
 
-/*:695*/
+/*:696*/
 #line 39 "./daterangeselector.w"
 
 
@@ -62,4 +62,4 @@ int lastIndex;
 
 #endif
 
-/*:693*/
+/*:694*/

src/draglabel.cpp

@@ -1,4 +1,4 @@
-/*1053:*/
+/*1054:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
 }
 }
 
-/*:1053*/
+/*:1054*/

src/draglabel.h

@@ -1,4 +1,4 @@
-/*1052:*/
+/*1053:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
 
 #endif
 
-/*:1052*/
+/*:1053*/

src/helpmenu.cpp

@@ -42,7 +42,7 @@ LicenseWindow*window= new LicenseWindow;
 window->show();
 }
 
-#line 4858 "./typica.w"
+#line 4865 "./typica.w"
 
 #line 1 "./licensewindow.w"
 /*:210*/

src/licensewindow.cpp

@@ -11,7 +11,7 @@
 #include <QVariant> 
 #include <QUrl> 
 
-#line 4860 "./typica.w"
+#line 4867 "./typica.w"
 
 /*:216*/
 #line 37 "./licensewindow.w"

src/moc_typica.cpp

@@ -2496,21 +2496,38 @@ static const uint qt_meta_data_Application[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       8,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
        0,       // flags
-       0,       // signalCount
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      18,   13,   12,   12, 0x05,
 
  // slots: signature, parameters, type, tag, flags
-      13,   12,   12,   12, 0x0a,
+      46,   39,   12,   12, 0x0a,
+      73,   13,   12,   12, 0x0a,
+     103,   12,   12,   12, 0x0a,
+
+ // methods: signature, parameters, type, tag, flags
+     134,   12,  129,   12, 0x02,
+     162,   12,  154,   12, 0x02,
+     196,  182,  129,   12, 0x02,
+     219,   12,  129,   12, 0x02,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_Application[] = {
-    "Application\0\0saveDeviceConfiguration()\0"
+    "Application\0\0user\0userChanged(QString)\0"
+    "status\0setDatabaseConnected(bool)\0"
+    "setCurrentTypicaUser(QString)\0"
+    "saveDeviceConfiguration()\0bool\0"
+    "databaseConnected()\0QString\0"
+    "currentTypicaUser()\0user,password\0"
+    "login(QString,QString)\0autoLogin()\0"
 };
 
 void Application::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -2519,11 +2536,21 @@ void Application::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         Q_ASSERT(staticMetaObject.cast(_o));
         Application *_t = static_cast<Application *>(_o);
         switch (_id) {
-        case 0: _t->saveDeviceConfiguration(); break;
+        case 0: _t->userChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 1: _t->setDatabaseConnected((*reinterpret_cast< bool(*)>(_a[1]))); break;
+        case 2: _t->setCurrentTypicaUser((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 3: _t->saveDeviceConfiguration(); break;
+        case 4: { bool _r = _t->databaseConnected();
+            if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
+        case 5: { QString _r = _t->currentTypicaUser();
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
+        case 6: { bool _r = _t->login((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QString(*)>(_a[2])));
+            if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
+        case 7: { bool _r = _t->autoLogin();
+            if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
         default: ;
         }
     }
-    Q_UNUSED(_a);
 }
 
 const QMetaObjectExtraData Application::staticMetaObjectExtraData = {
@@ -2558,12 +2585,19 @@ int Application::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 8)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 8;
     }
     return _id;
 }
+
+// SIGNAL 0
+void Application::userChanged(const QString & _t1)
+{
+    void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)) };
+    QMetaObject::activate(this, &staticMetaObject, 0, _a);
+}
 static const uint qt_meta_data_SaltModel[] = {
 
  // content:
@@ -8904,4 +8938,233 @@ void Annotator::annotation(QString _t1, int _t2, int _t3)
     void *_a[] = { 0, const_cast<void*>(reinterpret_cast<const void*>(&_t1)), const_cast<void*>(reinterpret_cast<const void*>(&_t2)), const_cast<void*>(reinterpret_cast<const void*>(&_t3)) };
     QMetaObject::activate(this, &staticMetaObject, 0, _a);
 }
+static const uint qt_meta_data_LoginDialog[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       1,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+      13,   12,   12,   12, 0x0a,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_LoginDialog[] = {
+    "LoginDialog\0\0attemptLogin()\0"
+};
+
+void LoginDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        LoginDialog *_t = static_cast<LoginDialog *>(_o);
+        switch (_id) {
+        case 0: _t->attemptLogin(); break;
+        default: ;
+        }
+    }
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData LoginDialog::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject LoginDialog::staticMetaObject = {
+    { &QDialog::staticMetaObject, qt_meta_stringdata_LoginDialog,
+      qt_meta_data_LoginDialog, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &LoginDialog::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *LoginDialog::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *LoginDialog::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_LoginDialog))
+        return static_cast<void*>(const_cast< LoginDialog*>(this));
+    return QDialog::qt_metacast(_clname);
+}
+
+int LoginDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QDialog::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 1)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 1;
+    }
+    return _id;
+}
+static const uint qt_meta_data_UserLabel[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       1,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+      16,   11,   10,   10, 0x0a,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_UserLabel[] = {
+    "UserLabel\0\0user\0updateLabel(QString)\0"
+};
+
+void UserLabel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        UserLabel *_t = static_cast<UserLabel *>(_o);
+        switch (_id) {
+        case 0: _t->updateLabel((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData UserLabel::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject UserLabel::staticMetaObject = {
+    { &QLabel::staticMetaObject, qt_meta_stringdata_UserLabel,
+      qt_meta_data_UserLabel, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &UserLabel::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *UserLabel::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *UserLabel::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_UserLabel))
+        return static_cast<void*>(const_cast< UserLabel*>(this));
+    return QLabel::qt_metacast(_clname);
+}
+
+int UserLabel::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QLabel::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 1)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 1;
+    }
+    return _id;
+}
+static const uint qt_meta_data_NewTypicaUser[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       4,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+      15,   14,   14,   14, 0x0a,
+      32,   14,   14,   14, 0x0a,
+      49,   14,   14,   14, 0x0a,
+      60,   14,   14,   14, 0x0a,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_NewTypicaUser[] = {
+    "NewTypicaUser\0\0createAndReset()\0"
+    "createAndClose()\0validate()\0"
+    "cancelValidate()\0"
+};
+
+void NewTypicaUser::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        NewTypicaUser *_t = static_cast<NewTypicaUser *>(_o);
+        switch (_id) {
+        case 0: _t->createAndReset(); break;
+        case 1: _t->createAndClose(); break;
+        case 2: _t->validate(); break;
+        case 3: _t->cancelValidate(); break;
+        default: ;
+        }
+    }
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData NewTypicaUser::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject NewTypicaUser::staticMetaObject = {
+    { &QDialog::staticMetaObject, qt_meta_stringdata_NewTypicaUser,
+      qt_meta_data_NewTypicaUser, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &NewTypicaUser::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *NewTypicaUser::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *NewTypicaUser::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_NewTypicaUser))
+        return static_cast<void*>(const_cast< NewTypicaUser*>(this));
+    return QDialog::qt_metacast(_clname);
+}
+
+int NewTypicaUser::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QDialog::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 4)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 4;
+    }
+    return _id;
+}
 QT_END_MOC_NAMESPACE

src/scale.cpp

@@ -1,4 +1,4 @@
-/*1059:*/
+/*1060:*/
 #line 135 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:1059*//*1060:*/
+/*:1060*//*1061:*/
 #line 153 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*1061:*/
+/*1062:*/
 #line 193 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:1061*/
+/*:1062*/
 #line 165 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:1060*//*1062:*/
+/*:1061*//*1063:*/
 #line 224 "./scales.w"
 
 void SerialScale::tare()
@@ -96,4 +96,4 @@ commandTerminator= "\x0A";
 }
 }
 
-/*:1062*/
+/*:1063*/

src/scale.h

@@ -1,4 +1,4 @@
-/*1058:*/
+/*1059:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -29,4 +29,4 @@ QByteArray commandTerminator;
 
 #endif
 
-/*:1058*/
+/*:1059*/