Update generated files

src/abouttypica.cpp

@@ -1,9 +1,9 @@
-/*288:*/
+/*295:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*289:*/
+/*296:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 6874 "./typica.w"
+#line 6947 "./typica.w"
 
-/*:289*/
+/*:296*/
 #line 36 "./abouttypica.w"
 
 
-/*:288*/
+/*:295*/

src/abouttypica.h

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

src/daterangeselector.cpp

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

src/daterangeselector.h

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

src/draglabel.cpp

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

src/draglabel.h

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

src/helpmenu.cpp

@@ -1,11 +1,11 @@
-/*208:*/
+/*214:*/
 #line 36 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 #include "licensewindow.h"
 
-/*209:*/
+/*215:*/
 #line 46 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
@@ -24,7 +24,7 @@ connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
 
 }
 
-/*:209*//*210:*/
+/*:215*//*216:*/
 #line 66 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
@@ -33,7 +33,7 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-/*:210*//*211:*/
+/*:216*//*217:*/
 #line 76 "./helpmenu.w"
 
 void HelpMenu::displayLicenseWindow()
@@ -42,11 +42,11 @@ LicenseWindow*window= new LicenseWindow;
 window->show();
 }
 
-#line 4914 "./typica.w"
+#line 4962 "./typica.w"
 
 #line 1 "./licensewindow.w"
-/*:211*/
+/*:217*/
 #line 41 "./helpmenu.w"
 
 
-/*:208*/
+/*:214*/

src/helpmenu.h

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

src/licensewindow.cpp

@@ -1,8 +1,8 @@
-/*213:*/
+/*219:*/
 #line 36 "./licensewindow.w"
 
-/*217:*/
-#line 99 "./licensewindow.w"
+/*223:*/
+#line 97 "./licensewindow.w"
 
 #include "licensewindow.h"
 
@@ -11,12 +11,12 @@
 #include <QVariant> 
 #include <QUrl> 
 
-#line 4916 "./typica.w"
+#line 4964 "./typica.w"
 
-/*:217*/
+/*:223*/
 #line 37 "./licensewindow.w"
 
-/*214:*/
+/*220:*/
 #line 43 "./licensewindow.w"
 
 LicenseWindow::LicenseWindow()
@@ -25,7 +25,7 @@ LicenseWindow::LicenseWindow()
 QSplitter*split= new QSplitter;
 QListWidget*projects= new QListWidget;
 
-/*216:*/
+/*222:*/
 #line 79 "./licensewindow.w"
 
 QListWidgetItem*item= new QListWidgetItem("Typica",projects);
@@ -34,8 +34,6 @@ 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);
@@ -45,7 +43,7 @@ item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qrcode-sv
 item= new QListWidgetItem("Qt",projects);
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
 
-/*:216*/
+/*:222*/
 #line 50 "./licensewindow.w"
 
 connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
@@ -56,7 +54,7 @@ split->addWidget(view);
 setCentralWidget(split);
 }
 
-/*:214*//*215:*/
+/*:220*//*221:*/
 #line 64 "./licensewindow.w"
 
 void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
@@ -64,8 +62,8 @@ void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
 view->load(current->data(Qt::UserRole).toUrl());
 }
 
-/*:215*/
+/*:221*/
 #line 38 "./licensewindow.w"
 
 
-/*:213*/
+/*:219*/

src/licensewindow.h

@@ -1,4 +1,4 @@
-/*212:*/
+/*218:*/
 #line 13 "./licensewindow.w"
 
 #include <QMainWindow> 
@@ -21,4 +21,4 @@ QWebView*view;
 
 #endif
 
-/*:212*/
+/*:218*/

src/printerselector.cpp

@@ -1,9 +1,9 @@
-/*591:*/
+/*600:*/
 #line 45 "./printerselector.w"
 
 #include "printerselector.h"
 
-/*592:*/
+/*601:*/
 #line 53 "./printerselector.w"
 
 PrinterSelector::PrinterSelector():QComboBox(NULL)
@@ -15,8 +15,8 @@ addItem(info.printerName());
 }
 }
 
-/*:592*/
+/*:601*/
 #line 48 "./printerselector.w"
 
 
-/*:591*/
+/*:600*/

src/printerselector.h

@@ -1,4 +1,4 @@
-/*589:*/
+/*598:*/
 #line 22 "./printerselector.w"
 
 #include <QPrinterInfo> 
@@ -16,4 +16,4 @@ PrinterSelector();
 
 #endif
 
-/*:589*/
+/*:598*/

src/scale.cpp

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

src/scale.h

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

src/units.cpp

@@ -1,10 +1,10 @@
-/*292:*/
+/*299:*/
 #line 42 "./units.w"
 
 #include "units.h"
 #include <QtDebug> 
 
-/*:292*//*293:*/
+/*:299*//*300:*/
 #line 53 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
@@ -15,7 +15,7 @@ unit==Kelvin||
 unit==Rankine);
 }
 
-/*:293*//*294:*/
+/*:300*//*301:*/
 #line 71 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -113,7 +113,7 @@ break;
 return 0;
 }
 
-/*:294*//*295:*/
+/*:301*//*302:*/
 #line 169 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -211,7 +211,7 @@ break;
 return 0;
 }
 
-/*:295*//*296:*/
+/*:302*//*303:*/
 #line 267 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -316,4 +316,4 @@ unit==Ounce||
 unit==Gram);
 }
 
-/*:296*/
+/*:303*/

src/units.h

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

src/webelement.cpp

@@ -1,9 +1,9 @@
-/*587:*/
+/*596:*/
 #line 388 "./webview.w"
 
 #include "webelement.h"
 
-/*585:*/
+/*594:*/
 #line 331 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
@@ -11,7 +11,7 @@ TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 
 }
 
-/*:585*//*586:*/
+/*:594*//*595:*/
 #line 340 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:586*/
+/*:595*/
 #line 391 "./webview.w"
 
 
-/*:587*/
+/*:596*/

src/webelement.h

@@ -1,4 +1,4 @@
-/*580:*/
+/*589:*/
 #line 268 "./webview.w"
 
 #include <QWebElement> 
@@ -27,4 +27,4 @@ QWebElement e;
 
 #endif
 
-/*:580*/
+/*:589*/

src/webview.cpp

@@ -1,9 +1,9 @@
-/*564:*/
+/*573:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*565:*/
+/*574:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:565*//*566:*/
+/*:574*//*575:*/
 #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());
-/*567:*/
+/*576:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:567*/
+/*:576*/
 #line 79 "./webview.w"
 
-/*568:*/
+/*577:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:568*/
+/*:577*/
 #line 80 "./webview.w"
 
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:566*//*569:*/
+/*:575*//*578:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
@@ -78,7 +78,7 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:569*//*570:*/
+/*:578*//*579:*/
 #line 144 "./webview.w"
 
 void TypicaWebView::print(const QString&printerName)
@@ -98,7 +98,7 @@ QWebView::print(printer);
 }
 }
 
-/*:570*//*576:*/
+/*:579*//*585:*/
 #line 225 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
@@ -111,8 +111,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:576*/
+/*:585*/
 #line 53 "./webview.w"
 
 
-/*:564*/
+/*:573*/

src/webview.h

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