Update generated files

src/abouttypica.cpp

@@ -1,9 +1,9 @@
-/*265:*/
+/*275:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*266:*/
+/*276:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 6404 "./typica.w"
+#line 6591 "./typica.w"
 
-/*:266*/
+/*:276*/
 #line 36 "./abouttypica.w"
 
 
-/*:265*/
+/*:275*/

src/abouttypica.h

@@ -1,4 +1,4 @@
-/*264:*/
+/*274:*/
 #line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
@@ -17,4 +17,4 @@ AboutTypica();
 
 #endif
 
-/*:264*/
+/*:274*/

src/daterangeselector.cpp

@@ -1,4 +1,4 @@
-/*656:*/
+/*666:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*658:*/
+/*668:*/
 #line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:658*//*659:*/
+/*:668*//*669:*/
 #line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:659*//*660:*/
+/*:669*//*670:*/
 #line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:660*//*661:*/
+/*:670*//*671:*/
 #line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:661*/
+/*:671*/
 #line 81 "./daterangeselector.w"
 
-/*662:*/
+/*672:*/
 #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;
-/*663:*/
+/*673:*/
 #line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:663*/
+/*:673*/
 #line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:662*//*664:*/
+/*:672*//*674:*/
 #line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:664*//*665:*/
+/*:674*//*675:*/
 #line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:665*//*666:*/
+/*:675*//*676:*/
 #line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:666*//*667:*/
+/*:676*//*677:*/
 #line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:667*//*668:*/
+/*:677*//*678:*/
 #line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:668*//*669:*/
+/*:678*//*679:*/
 #line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
 return quickSelector->currentIndex();
 }
 
-/*:669*//*670:*/
+/*:679*//*680:*/
 #line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:670*//*671:*/
+/*:680*//*681:*/
 #line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -317,12 +317,12 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:671*/
+/*:681*/
 #line 82 "./daterangeselector.w"
 
 
-#if 0
+#ifdef __unix__
 #include "moc_daterangeselector.cpp"
 #endif
 
-/*:656*/
+/*:666*/

src/daterangeselector.h

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

src/draglabel.cpp

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

src/draglabel.h

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

src/helpmenu.cpp

@@ -1,11 +1,11 @@
-/*194:*/
+/*204:*/
 #line 36 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 #include "licensewindow.h"
 
-/*195:*/
+/*205:*/
 #line 46 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
@@ -24,7 +24,7 @@ connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
 #endif
 }
 
-/*:195*//*196:*/
+/*:205*//*206:*/
 #line 66 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
@@ -33,7 +33,7 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-/*:196*//*197:*/
+/*:206*//*207:*/
 #line 76 "./helpmenu.w"
 
 void HelpMenu::displayLicenseWindow()
@@ -42,11 +42,11 @@ LicenseWindow*window= new LicenseWindow;
 window->show();
 }
 
-#line 4615 "./typica.w"
+#line 4771 "./typica.w"
 
 #line 1 "./licensewindow.w"
-/*:197*/
+/*:207*/
 #line 41 "./helpmenu.w"
 
 
-/*:194*/
+/*:204*/

src/helpmenu.h

@@ -1,4 +1,4 @@
-/*193:*/
+/*203:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
@@ -18,4 +18,4 @@ void displayLicenseWindow();
 
 #endif
 
-/*:193*/
+/*:203*/

src/licensewindow.cpp

@@ -0,0 +1,69 @@
+/*209:*/
+#line 36 "./licensewindow.w"
+
+/*213:*/
+#line 97 "./licensewindow.w"
+
+#include "licensewindow.h"
+
+#include <QSplitter> 
+#include <QListWidget> 
+#include <QVariant> 
+#include <QUrl> 
+
+#line 4773 "./typica.w"
+
+/*:213*/
+#line 37 "./licensewindow.w"
+
+/*210:*/
+#line 43 "./licensewindow.w"
+
+LicenseWindow::LicenseWindow()
+:QMainWindow(NULL),view(new QWebView)
+{
+QSplitter*split= new QSplitter;
+QListWidget*projects= new QListWidget;
+
+/*212:*/
+#line 79 "./licensewindow.w"
+
+QListWidgetItem*item= new QListWidgetItem("Typica",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/typica.html")));
+projects->setCurrentItem(item);
+setWebView(item,NULL);
+item= new QListWidgetItem("d3.js",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/d3.html")));
+item= new QListWidgetItem("Entypo",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/entypo.html")));
+item= new QListWidgetItem("Tango Desktop Project",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/tango.html")));
+item= new QListWidgetItem("QextSerialPort",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextserialport.html")));
+item= new QListWidgetItem("Qt",projects);
+item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
+
+/*:212*/
+#line 50 "./licensewindow.w"
+
+connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+this,SLOT(setWebView(QListWidgetItem*,QListWidgetItem*)));
+
+split->addWidget(projects);
+split->addWidget(view);
+setCentralWidget(split);
+}
+
+/*:210*//*211:*/
+#line 64 "./licensewindow.w"
+
+void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
+{
+view->load(current->data(Qt::UserRole).toUrl());
+}
+
+/*:211*/
+#line 38 "./licensewindow.w"
+
+
+/*:209*/

src/licensewindow.h

@@ -0,0 +1,24 @@
+/*208:*/
+#line 13 "./licensewindow.w"
+
+#include <QMainWindow> 
+#include <QListWidgetItem> 
+#include <QWebView> 
+
+#ifndef TypicaLicenseHeader
+#define TypicaLicenseHeader
+
+class LicenseWindow:public QMainWindow
+{
+Q_OBJECT
+public:
+LicenseWindow();
+private slots:
+void setWebView(QListWidgetItem*current,QListWidgetItem*);
+private:
+QWebView*view;
+};
+
+#endif
+
+/*:208*/

src/moc_helpmenu.cpp

@@ -22,7 +22,7 @@ static const uint qt_meta_data_HelpMenu[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       2,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -31,12 +31,14 @@ static const uint qt_meta_data_HelpMenu[] = {
 
  // slots: signature, parameters, type, tag, flags
       10,    9,    9,    9, 0x0a,
+      31,    9,    9,    9, 0x0a,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_HelpMenu[] = {
     "HelpMenu\0\0displayAboutTypica()\0"
+    "displayLicenseWindow()\0"
 };
 
 void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -46,6 +48,7 @@ void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo
         HelpMenu *_t = static_cast<HelpMenu *>(_o);
         switch (_id) {
         case 0: _t->displayAboutTypica(); break;
+        case 1: _t->displayLicenseWindow(); break;
         default: ;
         }
     }
@@ -84,9 +87,9 @@ int HelpMenu::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 2)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 2;
     }
     return _id;
 }

src/moc_typica.cpp

@@ -3759,25 +3759,31 @@ static const uint qt_meta_data_RoasterConfWidget[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       1,   14, // methods
+       4,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
-       1,   19, // constructors
+       1,   34, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: signature, parameters, type, tag, flags
       22,   19,   18,   18, 0x08,
+      49,   43,   18,   18, 0x08,
+      74,   43,   18,   18, 0x08,
+      98,   43,   18,   18, 0x08,
 
  // constructors: signature, parameters, type, tag, flags
-      55,   43,   18,   18, 0x0e,
+     138,  126,   18,   18, 0x0e,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_RoasterConfWidget[] = {
     "RoasterConfWidget\0\0id\0updateRoasterId(int)\0"
-    "model,index\0RoasterConfWidget(DeviceTreeModel*,QModelIndex)\0"
+    "value\0updateCapacityCheck(int)\0"
+    "updateCapacity(QString)\0"
+    "updateCapacityUnit(QString)\0model,index\0"
+    "RoasterConfWidget(DeviceTreeModel*,QModelIndex)\0"
 };
 
 void RoasterConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -3792,6 +3798,9 @@ void RoasterConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, in
         RoasterConfWidget *_t = static_cast<RoasterConfWidget *>(_o);
         switch (_id) {
         case 0: _t->updateRoasterId((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 1: _t->updateCapacityCheck((*reinterpret_cast< int(*)>(_a[1]))); break;
+        case 2: _t->updateCapacity((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 3: _t->updateCapacityUnit((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         default: ;
         }
     }
@@ -3829,9 +3838,9 @@ int RoasterConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 1)
+        if (_id < 4)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 1;
+        _id -= 4;
     }
     return _id;
 }

src/scale.cpp

@@ -1,4 +1,4 @@
-/*998:*/
+/*1008:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:998*//*999:*/
+/*:1008*//*1009:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*1000:*/
+/*1010:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:1000*/
+/*:1010*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:999*//*1001:*/
+/*:1009*//*1011:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
 write("!KP\x0D");
 }
 
-/*:1001*/
+/*:1011*/

src/scale.h

@@ -1,4 +1,4 @@
-/*997:*/
+/*1007:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
 
 #endif
 
-/*:997*/
+/*:1007*/

src/units.cpp

@@ -1,10 +1,10 @@
-/*269:*/
+/*279:*/
 #line 42 "./units.w"
 
 #include "units.h"
 #include <QtDebug> 
 
-/*:269*//*270:*/
+/*:279*//*280:*/
 #line 53 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
@@ -15,7 +15,7 @@ unit==Kelvin||
 unit==Rankine);
 }
 
-/*:270*//*271:*/
+/*:280*//*281:*/
 #line 71 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -113,7 +113,7 @@ break;
 return 0;
 }
 
-/*:271*//*272:*/
+/*:281*//*282:*/
 #line 169 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -211,7 +211,7 @@ break;
 return 0;
 }
 
-/*:272*//*273:*/
+/*:282*//*283:*/
 #line 267 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -316,4 +316,4 @@ unit==Ounce||
 unit==Gram);
 }
 
-/*:273*/
+/*:283*/

src/units.h

@@ -1,4 +1,4 @@
-/*268:*/
+/*278:*/
 #line 8 "./units.w"
 
 #include <QObject> 
@@ -32,4 +32,4 @@ static bool isWeightUnit(Unit unit);
 
 #endif
 
-/*:268*/
+/*:278*/

src/webelement.cpp

@@ -1,9 +1,9 @@
-/*563:*/
+/*573:*/
 #line 368 "./webview.w"
 
 #include "webelement.h"
 
-/*561:*/
+/*571:*/
 #line 311 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
@@ -11,7 +11,7 @@ TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 
 }
 
-/*:561*//*562:*/
+/*:571*//*572:*/
 #line 320 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:562*/
+/*:572*/
 #line 371 "./webview.w"
 
 
-/*:563*/
+/*:573*/

src/webelement.h

@@ -1,4 +1,4 @@
-/*556:*/
+/*566:*/
 #line 248 "./webview.w"
 
 #include <QWebElement> 
@@ -27,4 +27,4 @@ QWebElement e;
 
 #endif
 
-/*:556*/
+/*:566*/

src/webview.cpp

@@ -1,9 +1,9 @@
-/*541:*/
+/*551:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*542:*/
+/*552:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:542*//*543:*/
+/*:552*//*553:*/
 #line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*544:*/
+/*554:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:544*/
+/*:554*/
 #line 79 "./webview.w"
 
-/*545:*/
+/*555:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:545*/
+/*:555*/
 #line 80 "./webview.w"
 
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:543*//*546:*/
+/*:553*//*556:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
@@ -88,7 +88,7 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:546*//*552:*/
+/*:556*//*562:*/
 #line 205 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
@@ -101,8 +101,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:552*/
+/*:562*/
 #line 53 "./webview.w"
 
 
-/*:541*/
+/*:551*/

src/webview.h

@@ -1,4 +1,4 @@
-/*540:*/
+/*550:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
 
 #endif
 
-/*:540*/
+/*:550*/