Update generated files

src/abouttypica.cpp

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

src/abouttypica.h

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

src/daterangeselector.cpp

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

src/daterangeselector.h

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

src/draglabel.cpp

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

src/draglabel.h

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

src/helpmenu.cpp

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

src/helpmenu.h

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

src/licensewindow.cpp

@@ -1,7 +1,7 @@
-/*209:*/
+/*212:*/
 #line 36 "./licensewindow.w"
 
-/*213:*/
+/*216:*/
 #line 97 "./licensewindow.w"
 
 #include "licensewindow.h"
@@ -11,12 +11,12 @@
 #include <QVariant> 
 #include <QUrl> 
 
-#line 4777 "./typica.w"
+#line 4828 "./typica.w"
 
-/*:213*/
+/*:216*/
 #line 37 "./licensewindow.w"
 
-/*210:*/
+/*213:*/
 #line 43 "./licensewindow.w"
 
 LicenseWindow::LicenseWindow()
@@ -25,7 +25,7 @@ LicenseWindow::LicenseWindow()
 QSplitter*split= new QSplitter;
 QListWidget*projects= new QListWidget;
 
-/*212:*/
+/*215:*/
 #line 79 "./licensewindow.w"
 
 QListWidgetItem*item= new QListWidgetItem("Typica",projects);
@@ -43,7 +43,7 @@ item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextseria
 item= new QListWidgetItem("Qt",projects);
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
 
-/*:212*/
+/*:215*/
 #line 50 "./licensewindow.w"
 
 connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
@@ -54,7 +54,7 @@ split->addWidget(view);
 setCentralWidget(split);
 }
 
-/*:210*//*211:*/
+/*:213*//*214:*/
 #line 64 "./licensewindow.w"
 
 void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
@@ -62,8 +62,8 @@ void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
 view->load(current->data(Qt::UserRole).toUrl());
 }
 
-/*:211*/
+/*:214*/
 #line 38 "./licensewindow.w"
 
 
-/*:209*/
+/*:212*/

src/licensewindow.h

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

src/moc_typica.cpp

@@ -3096,6 +3096,80 @@ int ReportTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     }
     return _id;
 }
+static const uint qt_meta_data_PluginAction[] = {
+
+ // 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
+      14,   13,   13,   13, 0x08,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_PluginAction[] = {
+    "PluginAction\0\0runScript()\0"
+};
+
+void PluginAction::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
+{
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        Q_ASSERT(staticMetaObject.cast(_o));
+        PluginAction *_t = static_cast<PluginAction *>(_o);
+        switch (_id) {
+        case 0: _t->runScript(); break;
+        default: ;
+        }
+    }
+    Q_UNUSED(_a);
+}
+
+const QMetaObjectExtraData PluginAction::staticMetaObjectExtraData = {
+    0,  qt_static_metacall 
+};
+
+const QMetaObject PluginAction::staticMetaObject = {
+    { &QAction::staticMetaObject, qt_meta_stringdata_PluginAction,
+      qt_meta_data_PluginAction, &staticMetaObjectExtraData }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &PluginAction::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *PluginAction::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *PluginAction::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_PluginAction))
+        return static_cast<void*>(const_cast< PluginAction*>(this));
+    return QAction::qt_metacast(_clname);
+}
+
+int PluginAction::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QAction::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_FormArray[] = {
 
  // content:
@@ -6283,7 +6357,7 @@ static const uint qt_meta_data_ModbusNG[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       7,   14, // methods
+       9,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -6294,22 +6368,24 @@ static const uint qt_meta_data_ModbusNG[] = {
       10,    9,    9,    9, 0x08,
       28,    9,    9,    9, 0x08,
       38,    9,    9,    9, 0x08,
+      54,    9,    9,    9, 0x08,
 
  // methods: signature, parameters, type, tag, flags
-      58,    9,   54,    9, 0x02,
-      81,    9,   73,    9, 0x02,
-     104,    9,   73,    9, 0x02,
-     135,    9,  130,    9, 0x02,
+      77,    9,   73,    9, 0x02,
+     100,    9,   92,    9, 0x02,
+     123,    9,   92,    9, 0x02,
+     154,    9,  149,    9, 0x02,
+     175,    9,   92,    9, 0x02,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_ModbusNG[] = {
     "ModbusNG\0\0sendNextMessage()\0timeout()\0"
-    "dataAvailable()\0int\0channelCount()\0"
-    "QString\0channelColumnName(int)\0"
-    "channelIndicatorText(int)\0bool\0"
-    "isChannelHidden(int)\0"
+    "dataAvailable()\0rateLimitTimeout()\0"
+    "int\0channelCount()\0QString\0"
+    "channelColumnName(int)\0channelIndicatorText(int)\0"
+    "bool\0isChannelHidden(int)\0channelType(int)\0"
 };
 
 void ModbusNG::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -6321,14 +6397,17 @@ void ModbusNG::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo
         case 0: _t->sendNextMessage(); break;
         case 1: _t->timeout(); break;
         case 2: _t->dataAvailable(); break;
-        case 3: { int _r = _t->channelCount();
+        case 3: _t->rateLimitTimeout(); break;
+        case 4: { int _r = _t->channelCount();
             if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
-        case 4: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
+        case 5: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
-        case 5: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
+        case 6: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
-        case 6: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
+        case 7: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
+        case 8: { QString _r = _t->channelType((*reinterpret_cast< int(*)>(_a[1])));
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
         default: ;
         }
     }
@@ -6366,9 +6445,9 @@ int ModbusNG::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 7)
+        if (_id < 9)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 7;
+        _id -= 9;
     }
     return _id;
 }
@@ -7350,19 +7429,20 @@ static const uint qt_meta_data_TranslationConfWidget[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       2,   14, // methods
+       3,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
-       1,   24, // constructors
+       1,   29, // constructors
        0,       // flags
        0,       // signalCount
 
  // slots: signature, parameters, type, tag, flags
       30,   23,   22,   22, 0x08,
       60,   22,   22,   22, 0x08,
+      80,   22,   22,   22, 0x08,
 
  // constructors: signature, parameters, type, tag, flags
-      92,   80,   22,   22, 0x0e,
+     106,   94,   22,   22, 0x0e,
 
        0        // eod
 };
@@ -7370,7 +7450,8 @@ static const uint qt_meta_data_TranslationConfWidget[] = {
 static const char qt_meta_stringdata_TranslationConfWidget[] = {
     "TranslationConfWidget\0\0column\0"
     "updateMatchingColumn(QString)\0"
-    "updateTemperature()\0model,index\0"
+    "updateTemperature()\0updateDelay()\0"
+    "model,index\0"
     "TranslationConfWidget(DeviceTreeModel*,QModelIndex)\0"
 };
 
@@ -7387,6 +7468,7 @@ void TranslationConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c
         switch (_id) {
         case 0: _t->updateMatchingColumn((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         case 1: _t->updateTemperature(); break;
+        case 2: _t->updateDelay(); break;
         default: ;
         }
     }
@@ -7424,9 +7506,9 @@ int TranslationConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 2)
+        if (_id < 3)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 2;
+        _id -= 3;
     }
     return _id;
 }

src/printerselector.cpp

@@ -0,0 +1,22 @@
+/*590:*/
+#line 45 "./printerselector.w"
+
+#include "printerselector.h"
+
+/*591:*/
+#line 53 "./printerselector.w"
+
+PrinterSelector::PrinterSelector():QComboBox(NULL)
+{
+QList<QPrinterInfo> printers= QPrinterInfo::availablePrinters();
+foreach(QPrinterInfo info,printers)
+{
+addItem(info.printerName());
+}
+}
+
+/*:591*/
+#line 48 "./printerselector.w"
+
+
+/*:590*/

src/printerselector.h

@@ -0,0 +1,19 @@
+/*588:*/
+#line 22 "./printerselector.w"
+
+#include <QPrinterInfo> 
+#include <QComboBox> 
+
+#ifndef TypicaPrinterSelectorHeader
+#define TypicaPrinterSelectorHeader
+
+class PrinterSelector:public QComboBox
+{
+Q_OBJECT
+public:
+PrinterSelector();
+};
+
+#endif
+
+/*:588*/

src/scale.cpp

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

src/scale.h

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

src/units.cpp

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

src/units.h

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

src/webelement.cpp

@@ -1,18 +1,18 @@
-/*573:*/
-#line 368 "./webview.w"
+/*586:*/
+#line 383 "./webview.w"
 
 #include "webelement.h"
 
-/*571:*/
-#line 311 "./webview.w"
+/*584:*/
+#line 326 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 {
 
 }
 
-/*:571*//*572:*/
-#line 320 "./webview.w"
+/*:584*//*585:*/
+#line 335 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
 {
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:572*/
-#line 371 "./webview.w"
+/*:585*/
+#line 386 "./webview.w"
 
 
-/*:573*/
+/*:586*/

src/webelement.h

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

src/webview.cpp

@@ -1,9 +1,9 @@
-/*551:*/
+/*563:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*552:*/
+/*564:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:552*//*553:*/
+/*:564*//*565:*/
 #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());
-/*554:*/
+/*566:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:554*/
+/*:566*/
 #line 79 "./webview.w"
 
-/*555:*/
+/*567:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:555*/
+/*:567*/
 #line 80 "./webview.w"
 
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:553*//*556:*/
+/*:565*//*568:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
@@ -59,16 +59,6 @@ void TypicaWebView::load(const QString&url)
 QWebView::load(QUrl(url));
 }
 
-void TypicaWebView::print()
-{
-QPrinter*printer= new QPrinter(QPrinter::HighResolution);
-QPrintDialog printDialog(printer,NULL);
-if(printDialog.exec()==QDialog::Accepted)
-{
-QWebView::print(printer);
-}
-}
-
 void TypicaWebView::setHtml(const QString&html,const QUrl&baseUrl)
 {
 QWebView::setHtml(html,baseUrl);
@@ -88,8 +78,28 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:556*//*562:*/
-#line 205 "./webview.w"
+/*:568*//*569:*/
+#line 144 "./webview.w"
+
+void TypicaWebView::print(const QString&printerName)
+{
+QPrinter*printer= new QPrinter(QPrinter::HighResolution);
+if(!printerName.isEmpty())
+{
+printer->setPrinterName(printerName);
+printer->setFullPage(true);
+QWebView::print(printer);
+return;
+}
+QPrintDialog printDialog(printer,NULL);
+if(printDialog.exec()==QDialog::Accepted)
+{
+QWebView::print(printer);
+}
+}
+
+/*:569*//*575:*/
+#line 220 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
 {
@@ -101,8 +111,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:562*/
+/*:575*/
 #line 53 "./webview.w"
 
 
-/*:551*/
+/*:563*/

src/webview.h

@@ -1,4 +1,4 @@
-/*550:*/
+/*562:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
@@ -20,7 +20,7 @@ Q_OBJECT
 public:
 TypicaWebView();
 Q_INVOKABLE void load(const QString&url);
-Q_INVOKABLE void print();
+Q_INVOKABLE void print(const QString&printerName= QString());
 Q_INVOKABLE void setHtml(const QString&html,const QUrl&baseUrl= QUrl());
 Q_INVOKABLE void setContent(QIODevice*device);
 Q_INVOKABLE QString saveXml();
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
 
 #endif
 
-/*:550*/
+/*:562*/