Merge branch 'development' into issue83

src/daterangeselector.cpp

@@ -1,4 +1,4 @@
-/*696:*/
+/*702:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*698:*/
+/*704:*/
 #line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:698*//*699:*/
+/*:704*//*705:*/
 #line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:699*//*700:*/
+/*:705*//*706:*/
 #line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:700*//*701:*/
+/*:706*//*707:*/
 #line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:701*/
+/*:707*/
 #line 81 "./daterangeselector.w"
 
-/*702:*/
+/*708:*/
 #line 207 "./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;
-/*703:*/
+/*709:*/
 #line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:703*/
+/*:709*/
 #line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:702*//*704:*/
+/*:708*//*710:*/
 #line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:704*//*705:*/
+/*:710*//*711:*/
 #line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:705*//*706:*/
+/*:711*//*712:*/
 #line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:706*//*707:*/
+/*:712*//*713:*/
 #line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:707*//*708:*/
+/*:713*//*714:*/
 #line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:708*//*709:*/
+/*:714*//*715:*/
 #line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
 return quickSelector->currentIndex();
 }
 
-/*:709*//*710:*/
+/*:715*//*716:*/
 #line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:710*//*711:*/
+/*:716*//*717:*/
 #line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -317,7 +317,7 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:711*/
+/*:717*/
 #line 82 "./daterangeselector.w"
 
 
@@ -325,4 +325,4 @@ quickSelector->removeItem(index);
 #include "moc_daterangeselector.cpp"
 #endif
 
-/*:696*/
+/*:702*/

src/daterangeselector.h

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

src/draglabel.cpp

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

src/draglabel.h

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

src/moc_typica.cpp

@@ -2496,7 +2496,7 @@ static const uint qt_meta_data_Application[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       8,   14, // methods
+       9,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -2509,13 +2509,14 @@ static const uint qt_meta_data_Application[] = {
  // slots: signature, parameters, type, tag, flags
       46,   39,   12,   12, 0x0a,
       73,   13,   12,   12, 0x0a,
-     103,   12,   12,   12, 0x0a,
+     116,  103,   12,   12, 0x0a,
+     132,   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,
+     163,   12,  158,   12, 0x02,
+     191,   12,  183,   12, 0x02,
+     225,  211,  158,   12, 0x02,
+     248,   12,  158,   12, 0x02,
 
        0        // eod
 };
@@ -2524,6 +2525,7 @@ static const char qt_meta_stringdata_Application[] = {
     "Application\0\0user\0userChanged(QString)\0"
     "status\0setDatabaseConnected(bool)\0"
     "setCurrentTypicaUser(QString)\0"
+    "notification\0notify(QString)\0"
     "saveDeviceConfiguration()\0bool\0"
     "databaseConnected()\0QString\0"
     "currentTypicaUser()\0user,password\0"
@@ -2539,14 +2541,15 @@ void Application::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
         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();
+        case 3: _t->notify((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 4: _t->saveDeviceConfiguration(); break;
+        case 5: { bool _r = _t->databaseConnected();
             if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
-        case 5: { QString _r = _t->currentTypicaUser();
+        case 6: { 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])));
+        case 7: { 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();
+        case 8: { bool _r = _t->autoLogin();
             if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
         default: ;
         }
@@ -2585,9 +2588,9 @@ int Application::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 8)
+        if (_id < 9)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 8;
+        _id -= 9;
     }
     return _id;
 }
@@ -2598,6 +2601,91 @@ 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_DatabaseNotification[] = {
+
+ // content:
+       6,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       2,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       1,       // signalCount
+
+ // signals: signature, parameters, type, tag, flags
+      35,   22,   21,   21, 0x05,
+
+ // slots: signature, parameters, type, tag, flags
+      51,   22,   21,   21, 0x0a,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_DatabaseNotification[] = {
+    "DatabaseNotification\0\0notification\0"
+    "notify(QString)\0forwardNotification(QString)\0"
+};
+
+void DatabaseNotification::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        DatabaseNotification *_t = static_cast<DatabaseNotification *>(_o);
+        switch (_id) {
+        case 0: _t->notify((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 1: _t->forwardNotification((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        default: ;
+        }
+    }
+}
+
+const QMetaObjectExtraData DatabaseNotification::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject DatabaseNotification::staticMetaObject = {
+    { &QObject::staticMetaObject, qt_meta_stringdata_DatabaseNotification,
+      qt_meta_data_DatabaseNotification, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &DatabaseNotification::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *DatabaseNotification::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *DatabaseNotification::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_DatabaseNotification))
+        return static_cast<void*>(const_cast< DatabaseNotification*>(this));
+    return QObject::qt_metacast(_clname);
+}
+
+int DatabaseNotification::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        if (_id < 2)
+            qt_static_metacall(this, _c, _id, _a);
+        _id -= 2;
+    }
+    return _id;
+}
+
+// SIGNAL 0
+void DatabaseNotification::notify(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:

src/scale.cpp

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

src/scale.h

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