Quellcode durchsuchen

Update generated files

Neal Wilson vor 7 Jahren
Ursprung
Commit
c5bcadc068

+ 5
- 5
src/abouttypica.cpp Datei anzeigen

@@ -1,9 +1,9 @@
1
-/*275:*/
1
+/*287:*/
2 2
 #line 33 "./abouttypica.w"
3 3
 
4 4
 #include "abouttypica.h"
5 5
 
6
-/*276:*/
6
+/*288:*/
7 7
 #line 42 "./abouttypica.w"
8 8
 
9 9
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
17 17
 setCentralWidget(banner);
18 18
 }
19 19
 
20
-#line 6595 "./typica.w"
20
+#line 6769 "./typica.w"
21 21
 
22
-/*:276*/
22
+/*:288*/
23 23
 #line 36 "./abouttypica.w"
24 24
 
25 25
 
26
-/*:275*/
26
+/*:287*/

+ 2
- 2
src/abouttypica.h Datei anzeigen

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

+ 19
- 19
src/daterangeselector.cpp Datei anzeigen

@@ -1,4 +1,4 @@
1
-/*666:*/
1
+/*694:*/
2 2
 #line 70 "./daterangeselector.w"
3 3
 
4 4
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
11 11
 
12 12
 #include "daterangeselector.h"
13 13
 
14
-/*668:*/
14
+/*696:*/
15 15
 #line 117 "./daterangeselector.w"
16 16
 
17 17
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
55 55
 setLayout(outerLayout);
56 56
 }
57 57
 
58
-/*:668*//*669:*/
58
+/*:696*//*697:*/
59 59
 #line 165 "./daterangeselector.w"
60 60
 
61 61
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
63 63
 emit hidingPopup();
64 64
 }
65 65
 
66
-/*:669*//*670:*/
66
+/*:697*//*698:*/
67 67
 #line 174 "./daterangeselector.w"
68 68
 
69 69
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
78 78
 hide();
79 79
 }
80 80
 
81
-/*:670*//*671:*/
81
+/*:698*//*699:*/
82 82
 #line 191 "./daterangeselector.w"
83 83
 
84 84
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
93 93
 }
94 94
 }
95 95
 
96
-/*:671*/
96
+/*:699*/
97 97
 #line 81 "./daterangeselector.w"
98 98
 
99
-/*672:*/
99
+/*700:*/
100 100
 #line 209 "./daterangeselector.w"
101 101
 
102 102
 DateRangeSelector::DateRangeSelector(QWidget*parent):
@@ -108,7 +108,7 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
108 108
 QDate currentDate= QDate::currentDate();
109 109
 
110 110
 QHBoxLayout*layout= new QHBoxLayout;
111
-/*673:*/
111
+/*701:*/
112 112
 #line 238 "./daterangeselector.w"
113 113
 
114 114
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
188 188
 quickSelector->addItem("Lifetime");
189 189
 quickSelector->addItem("Custom");
190 190
 
191
-/*:673*/
191
+/*:701*/
192 192
 #line 219 "./daterangeselector.w"
193 193
 
194 194
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
201 201
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
202 202
 }
203 203
 
204
-/*:672*//*674:*/
204
+/*:700*//*702:*/
205 205
 #line 321 "./daterangeselector.w"
206 206
 
207 207
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
217 217
 }
218 218
 }
219 219
 
220
-/*:674*//*675:*/
220
+/*:702*//*703:*/
221 221
 #line 338 "./daterangeselector.w"
222 222
 
223 223
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
227 227
 quickSelector->setCurrentIndex(lastIndex);
228 228
 }
229 229
 
230
-/*:675*//*676:*/
230
+/*:703*//*704:*/
231 231
 #line 349 "./daterangeselector.w"
232 232
 
233 233
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
238 238
 quickSelector->setCurrentIndex(lastIndex);
239 239
 }
240 240
 
241
-/*:676*//*677:*/
241
+/*:704*//*705:*/
242 242
 #line 364 "./daterangeselector.w"
243 243
 
244 244
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
279 279
 }
280 280
 }
281 281
 
282
-/*:677*//*678:*/
282
+/*:705*//*706:*/
283 283
 #line 406 "./daterangeselector.w"
284 284
 
285 285
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
287 287
 return quickSelector->itemData(lastIndex);
288 288
 }
289 289
 
290
-/*:678*//*679:*/
290
+/*:706*//*707:*/
291 291
 #line 414 "./daterangeselector.w"
292 292
 
293 293
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
300 300
 return quickSelector->currentIndex();
301 301
 }
302 302
 
303
-/*:679*//*680:*/
303
+/*:707*//*708:*/
304 304
 #line 434 "./daterangeselector.w"
305 305
 
306 306
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
309 309
 QVariant(QStringList()<<startDate<<endDate));
310 310
 }
311 311
 
312
-/*:680*//*681:*/
312
+/*:708*//*709:*/
313 313
 #line 444 "./daterangeselector.w"
314 314
 
315 315
 void DateRangeSelector::removeIndex(int index)
@@ -317,7 +317,7 @@ void DateRangeSelector::removeIndex(int index)
317 317
 quickSelector->removeItem(index);
318 318
 }
319 319
 
320
-/*:681*/
320
+/*:709*/
321 321
 #line 82 "./daterangeselector.w"
322 322
 
323 323
 
@@ -327,4 +327,4 @@ quickSelector->removeItem(index);
327 327
 #endif
328 328
 #endif
329 329
 
330
-/*:666*/
330
+/*:694*/

+ 4
- 4
src/daterangeselector.h Datei anzeigen

@@ -1,4 +1,4 @@
1
-/*665:*/
1
+/*693:*/
2 2
 #line 30 "./daterangeselector.w"
3 3
 
4 4
 
@@ -9,7 +9,7 @@
9 9
 #ifndef TypicaDateRangeSelectorHeader
10 10
 #define TypicaDateRangeSelectorHeader
11 11
 
12
-/*667:*/
12
+/*695:*/
13 13
 #line 93 "./daterangeselector.w"
14 14
 
15 15
 class CustomDateRangePopup:public QWidget
@@ -31,7 +31,7 @@ QCalendarWidget*endDateSelector;
31 31
 QPushButton*applyButton;
32 32
 };
33 33
 
34
-/*:667*/
34
+/*:695*/
35 35
 #line 39 "./daterangeselector.w"
36 36
 
37 37
 
@@ -62,4 +62,4 @@ int lastIndex;
62 62
 
63 63
 #endif
64 64
 
65
-/*:665*/
65
+/*:693*/

+ 2
- 2
src/draglabel.cpp Datei anzeigen

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

+ 2
- 2
src/draglabel.h Datei anzeigen

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

+ 7
- 7
src/helpmenu.cpp Datei anzeigen

@@ -1,11 +1,11 @@
1
-/*204:*/
1
+/*207:*/
2 2
 #line 36 "./helpmenu.w"
3 3
 
4 4
 #include "helpmenu.h"
5 5
 #include "abouttypica.h"
6 6
 #include "licensewindow.h"
7 7
 
8
-/*205:*/
8
+/*208:*/
9 9
 #line 46 "./helpmenu.w"
10 10
 
11 11
 HelpMenu::HelpMenu():QMenu()
@@ -24,7 +24,7 @@ connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
24 24
 #endif
25 25
 }
26 26
 
27
-/*:205*//*206:*/
27
+/*:208*//*209:*/
28 28
 #line 66 "./helpmenu.w"
29 29
 
30 30
 void HelpMenu::displayAboutTypica()
@@ -33,7 +33,7 @@ AboutTypica*aboutBox= new AboutTypica;
33 33
 aboutBox->show();
34 34
 }
35 35
 
36
-/*:206*//*207:*/
36
+/*:209*//*210:*/
37 37
 #line 76 "./helpmenu.w"
38 38
 
39 39
 void HelpMenu::displayLicenseWindow()
@@ -42,11 +42,11 @@ LicenseWindow*window= new LicenseWindow;
42 42
 window->show();
43 43
 }
44 44
 
45
-#line 4775 "./typica.w"
45
+#line 4826 "./typica.w"
46 46
 
47 47
 #line 1 "./licensewindow.w"
48
-/*:207*/
48
+/*:210*/
49 49
 #line 41 "./helpmenu.w"
50 50
 
51 51
 
52
-/*:204*/
52
+/*:207*/

+ 2
- 2
src/helpmenu.h Datei anzeigen

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

+ 10
- 10
src/licensewindow.cpp Datei anzeigen

@@ -1,7 +1,7 @@
1
-/*209:*/
1
+/*212:*/
2 2
 #line 36 "./licensewindow.w"
3 3
 
4
-/*213:*/
4
+/*216:*/
5 5
 #line 97 "./licensewindow.w"
6 6
 
7 7
 #include "licensewindow.h"
@@ -11,12 +11,12 @@
11 11
 #include <QVariant> 
12 12
 #include <QUrl> 
13 13
 
14
-#line 4777 "./typica.w"
14
+#line 4828 "./typica.w"
15 15
 
16
-/*:213*/
16
+/*:216*/
17 17
 #line 37 "./licensewindow.w"
18 18
 
19
-/*210:*/
19
+/*213:*/
20 20
 #line 43 "./licensewindow.w"
21 21
 
22 22
 LicenseWindow::LicenseWindow()
@@ -25,7 +25,7 @@ LicenseWindow::LicenseWindow()
25 25
 QSplitter*split= new QSplitter;
26 26
 QListWidget*projects= new QListWidget;
27 27
 
28
-/*212:*/
28
+/*215:*/
29 29
 #line 79 "./licensewindow.w"
30 30
 
31 31
 QListWidgetItem*item= new QListWidgetItem("Typica",projects);
@@ -43,7 +43,7 @@ item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qextseria
43 43
 item= new QListWidgetItem("Qt",projects);
44 44
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
45 45
 
46
-/*:212*/
46
+/*:215*/
47 47
 #line 50 "./licensewindow.w"
48 48
 
49 49
 connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
@@ -54,7 +54,7 @@ split->addWidget(view);
54 54
 setCentralWidget(split);
55 55
 }
56 56
 
57
-/*:210*//*211:*/
57
+/*:213*//*214:*/
58 58
 #line 64 "./licensewindow.w"
59 59
 
60 60
 void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
@@ -62,8 +62,8 @@ void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
62 62
 view->load(current->data(Qt::UserRole).toUrl());
63 63
 }
64 64
 
65
-/*:211*/
65
+/*:214*/
66 66
 #line 38 "./licensewindow.w"
67 67
 
68 68
 
69
-/*:209*/
69
+/*:212*/

+ 2
- 2
src/licensewindow.h Datei anzeigen

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

+ 103
- 21
src/moc_typica.cpp Datei anzeigen

@@ -3096,6 +3096,80 @@ int ReportTable::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
3096 3096
     }
3097 3097
     return _id;
3098 3098
 }
3099
+static const uint qt_meta_data_PluginAction[] = {
3100
+
3101
+ // content:
3102
+       6,       // revision
3103
+       0,       // classname
3104
+       0,    0, // classinfo
3105
+       1,   14, // methods
3106
+       0,    0, // properties
3107
+       0,    0, // enums/sets
3108
+       0,    0, // constructors
3109
+       0,       // flags
3110
+       0,       // signalCount
3111
+
3112
+ // slots: signature, parameters, type, tag, flags
3113
+      14,   13,   13,   13, 0x08,
3114
+
3115
+       0        // eod
3116
+};
3117
+
3118
+static const char qt_meta_stringdata_PluginAction[] = {
3119
+    "PluginAction\0\0runScript()\0"
3120
+};
3121
+
3122
+void PluginAction::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
3123
+{
3124
+    if (_c == QMetaObject::InvokeMetaMethod) {
3125
+        Q_ASSERT(staticMetaObject.cast(_o));
3126
+        PluginAction *_t = static_cast<PluginAction *>(_o);
3127
+        switch (_id) {
3128
+        case 0: _t->runScript(); break;
3129
+        default: ;
3130
+        }
3131
+    }
3132
+    Q_UNUSED(_a);
3133
+}
3134
+
3135
+const QMetaObjectExtraData PluginAction::staticMetaObjectExtraData = {
3136
+    0,  qt_static_metacall 
3137
+};
3138
+
3139
+const QMetaObject PluginAction::staticMetaObject = {
3140
+    { &QAction::staticMetaObject, qt_meta_stringdata_PluginAction,
3141
+      qt_meta_data_PluginAction, &staticMetaObjectExtraData }
3142
+};
3143
+
3144
+#ifdef Q_NO_DATA_RELOCATION
3145
+const QMetaObject &PluginAction::getStaticMetaObject() { return staticMetaObject; }
3146
+#endif //Q_NO_DATA_RELOCATION
3147
+
3148
+const QMetaObject *PluginAction::metaObject() const
3149
+{
3150
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
3151
+}
3152
+
3153
+void *PluginAction::qt_metacast(const char *_clname)
3154
+{
3155
+    if (!_clname) return 0;
3156
+    if (!strcmp(_clname, qt_meta_stringdata_PluginAction))
3157
+        return static_cast<void*>(const_cast< PluginAction*>(this));
3158
+    return QAction::qt_metacast(_clname);
3159
+}
3160
+
3161
+int PluginAction::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
3162
+{
3163
+    _id = QAction::qt_metacall(_c, _id, _a);
3164
+    if (_id < 0)
3165
+        return _id;
3166
+    if (_c == QMetaObject::InvokeMetaMethod) {
3167
+        if (_id < 1)
3168
+            qt_static_metacall(this, _c, _id, _a);
3169
+        _id -= 1;
3170
+    }
3171
+    return _id;
3172
+}
3099 3173
 static const uint qt_meta_data_FormArray[] = {
3100 3174
 
3101 3175
  // content:
@@ -6283,7 +6357,7 @@ static const uint qt_meta_data_ModbusNG[] = {
6283 6357
        6,       // revision
6284 6358
        0,       // classname
6285 6359
        0,    0, // classinfo
6286
-       7,   14, // methods
6360
+       9,   14, // methods
6287 6361
        0,    0, // properties
6288 6362
        0,    0, // enums/sets
6289 6363
        0,    0, // constructors
@@ -6294,22 +6368,24 @@ static const uint qt_meta_data_ModbusNG[] = {
6294 6368
       10,    9,    9,    9, 0x08,
6295 6369
       28,    9,    9,    9, 0x08,
6296 6370
       38,    9,    9,    9, 0x08,
6371
+      54,    9,    9,    9, 0x08,
6297 6372
 
6298 6373
  // methods: signature, parameters, type, tag, flags
6299
-      58,    9,   54,    9, 0x02,
6300
-      81,    9,   73,    9, 0x02,
6301
-     104,    9,   73,    9, 0x02,
6302
-     135,    9,  130,    9, 0x02,
6374
+      77,    9,   73,    9, 0x02,
6375
+     100,    9,   92,    9, 0x02,
6376
+     123,    9,   92,    9, 0x02,
6377
+     154,    9,  149,    9, 0x02,
6378
+     175,    9,   92,    9, 0x02,
6303 6379
 
6304 6380
        0        // eod
6305 6381
 };
6306 6382
 
6307 6383
 static const char qt_meta_stringdata_ModbusNG[] = {
6308 6384
     "ModbusNG\0\0sendNextMessage()\0timeout()\0"
6309
-    "dataAvailable()\0int\0channelCount()\0"
6310
-    "QString\0channelColumnName(int)\0"
6311
-    "channelIndicatorText(int)\0bool\0"
6312
-    "isChannelHidden(int)\0"
6385
+    "dataAvailable()\0rateLimitTimeout()\0"
6386
+    "int\0channelCount()\0QString\0"
6387
+    "channelColumnName(int)\0channelIndicatorText(int)\0"
6388
+    "bool\0isChannelHidden(int)\0channelType(int)\0"
6313 6389
 };
6314 6390
 
6315 6391
 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
6321 6397
         case 0: _t->sendNextMessage(); break;
6322 6398
         case 1: _t->timeout(); break;
6323 6399
         case 2: _t->dataAvailable(); break;
6324
-        case 3: { int _r = _t->channelCount();
6400
+        case 3: _t->rateLimitTimeout(); break;
6401
+        case 4: { int _r = _t->channelCount();
6325 6402
             if (_a[0]) *reinterpret_cast< int*>(_a[0]) = _r; }  break;
6326
-        case 4: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
6403
+        case 5: { QString _r = _t->channelColumnName((*reinterpret_cast< int(*)>(_a[1])));
6327 6404
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
6328
-        case 5: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
6405
+        case 6: { QString _r = _t->channelIndicatorText((*reinterpret_cast< int(*)>(_a[1])));
6329 6406
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
6330
-        case 6: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
6407
+        case 7: { bool _r = _t->isChannelHidden((*reinterpret_cast< int(*)>(_a[1])));
6331 6408
             if (_a[0]) *reinterpret_cast< bool*>(_a[0]) = _r; }  break;
6409
+        case 8: { QString _r = _t->channelType((*reinterpret_cast< int(*)>(_a[1])));
6410
+            if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
6332 6411
         default: ;
6333 6412
         }
6334 6413
     }
@@ -6366,9 +6445,9 @@ int ModbusNG::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
6366 6445
     if (_id < 0)
6367 6446
         return _id;
6368 6447
     if (_c == QMetaObject::InvokeMetaMethod) {
6369
-        if (_id < 7)
6448
+        if (_id < 9)
6370 6449
             qt_static_metacall(this, _c, _id, _a);
6371
-        _id -= 7;
6450
+        _id -= 9;
6372 6451
     }
6373 6452
     return _id;
6374 6453
 }
@@ -7350,19 +7429,20 @@ static const uint qt_meta_data_TranslationConfWidget[] = {
7350 7429
        6,       // revision
7351 7430
        0,       // classname
7352 7431
        0,    0, // classinfo
7353
-       2,   14, // methods
7432
+       3,   14, // methods
7354 7433
        0,    0, // properties
7355 7434
        0,    0, // enums/sets
7356
-       1,   24, // constructors
7435
+       1,   29, // constructors
7357 7436
        0,       // flags
7358 7437
        0,       // signalCount
7359 7438
 
7360 7439
  // slots: signature, parameters, type, tag, flags
7361 7440
       30,   23,   22,   22, 0x08,
7362 7441
       60,   22,   22,   22, 0x08,
7442
+      80,   22,   22,   22, 0x08,
7363 7443
 
7364 7444
  // constructors: signature, parameters, type, tag, flags
7365
-      92,   80,   22,   22, 0x0e,
7445
+     106,   94,   22,   22, 0x0e,
7366 7446
 
7367 7447
        0        // eod
7368 7448
 };
@@ -7370,7 +7450,8 @@ static const uint qt_meta_data_TranslationConfWidget[] = {
7370 7450
 static const char qt_meta_stringdata_TranslationConfWidget[] = {
7371 7451
     "TranslationConfWidget\0\0column\0"
7372 7452
     "updateMatchingColumn(QString)\0"
7373
-    "updateTemperature()\0model,index\0"
7453
+    "updateTemperature()\0updateDelay()\0"
7454
+    "model,index\0"
7374 7455
     "TranslationConfWidget(DeviceTreeModel*,QModelIndex)\0"
7375 7456
 };
7376 7457
 
@@ -7387,6 +7468,7 @@ void TranslationConfWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c
7387 7468
         switch (_id) {
7388 7469
         case 0: _t->updateMatchingColumn((*reinterpret_cast< const QString(*)>(_a[1]))); break;
7389 7470
         case 1: _t->updateTemperature(); break;
7471
+        case 2: _t->updateDelay(); break;
7390 7472
         default: ;
7391 7473
         }
7392 7474
     }
@@ -7424,9 +7506,9 @@ int TranslationConfWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
7424 7506
     if (_id < 0)
7425 7507
         return _id;
7426 7508
     if (_c == QMetaObject::InvokeMetaMethod) {
7427
-        if (_id < 2)
7509
+        if (_id < 3)
7428 7510
             qt_static_metacall(this, _c, _id, _a);
7429
-        _id -= 2;
7511
+        _id -= 3;
7430 7512
     }
7431 7513
     return _id;
7432 7514
 }

+ 22
- 0
src/printerselector.cpp Datei anzeigen

@@ -0,0 +1,22 @@
1
+/*590:*/
2
+#line 45 "./printerselector.w"
3
+
4
+#include "printerselector.h"
5
+
6
+/*591:*/
7
+#line 53 "./printerselector.w"
8
+
9
+PrinterSelector::PrinterSelector():QComboBox(NULL)
10
+{
11
+QList<QPrinterInfo> printers= QPrinterInfo::availablePrinters();
12
+foreach(QPrinterInfo info,printers)
13
+{
14
+addItem(info.printerName());
15
+}
16
+}
17
+
18
+/*:591*/
19
+#line 48 "./printerselector.w"
20
+
21
+
22
+/*:590*/

+ 19
- 0
src/printerselector.h Datei anzeigen

@@ -0,0 +1,19 @@
1
+/*588:*/
2
+#line 22 "./printerselector.w"
3
+
4
+#include <QPrinterInfo> 
5
+#include <QComboBox> 
6
+
7
+#ifndef TypicaPrinterSelectorHeader
8
+#define TypicaPrinterSelectorHeader
9
+
10
+class PrinterSelector:public QComboBox
11
+{
12
+Q_OBJECT
13
+public:
14
+PrinterSelector();
15
+};
16
+
17
+#endif
18
+
19
+/*:588*/

+ 6
- 6
src/scale.cpp Datei anzeigen

@@ -1,4 +1,4 @@
1
-/*1020:*/
1
+/*1045:*/
2 2
 #line 135 "./scales.w"
3 3
 
4 4
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
10 10
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
11 11
 }
12 12
 
13
-/*:1020*//*1021:*/
13
+/*:1045*//*1046:*/
14 14
 #line 153 "./scales.w"
15 15
 
16 16
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
24 24
 }
25 25
 else
26 26
 {
27
-/*1022:*/
27
+/*1047:*/
28 28
 #line 193 "./scales.w"
29 29
 
30 30
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
53 53
 }
54 54
 emit newMeasurement(weight,unit);
55 55
 
56
-/*:1022*/
56
+/*:1047*/
57 57
 #line 165 "./scales.w"
58 58
 
59 59
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
61 61
 }
62 62
 }
63 63
 
64
-/*:1021*//*1023:*/
64
+/*:1046*//*1048:*/
65 65
 #line 224 "./scales.w"
66 66
 
67 67
 void SerialScale::tare()
@@ -96,4 +96,4 @@ commandTerminator= "\x0A";
96 96
 }
97 97
 }
98 98
 
99
-/*:1023*/
99
+/*:1048*/

+ 2
- 2
src/scale.h Datei anzeigen

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

+ 3039
- 2532
src/typica.cpp
Datei-Diff unterdrückt, da er zu groß ist
Datei anzeigen


+ 6
- 6
src/units.cpp Datei anzeigen

@@ -1,10 +1,10 @@
1
-/*279:*/
1
+/*291:*/
2 2
 #line 42 "./units.w"
3 3
 
4 4
 #include "units.h"
5 5
 #include <QtDebug> 
6 6
 
7
-/*:279*//*280:*/
7
+/*:291*//*292:*/
8 8
 #line 53 "./units.w"
9 9
 
10 10
 bool Units::isTemperatureUnit(Unit unit)
@@ -15,7 +15,7 @@ unit==Kelvin||
15 15
 unit==Rankine);
16 16
 }
17 17
 
18
-/*:280*//*281:*/
18
+/*:292*//*293:*/
19 19
 #line 71 "./units.w"
20 20
 
21 21
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -113,7 +113,7 @@ break;
113 113
 return 0;
114 114
 }
115 115
 
116
-/*:281*//*282:*/
116
+/*:293*//*294:*/
117 117
 #line 169 "./units.w"
118 118
 
119 119
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -211,7 +211,7 @@ break;
211 211
 return 0;
212 212
 }
213 213
 
214
-/*:282*//*283:*/
214
+/*:294*//*295:*/
215 215
 #line 267 "./units.w"
216 216
 
217 217
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -316,4 +316,4 @@ unit==Ounce||
316 316
 unit==Gram);
317 317
 }
318 318
 
319
-/*:283*/
319
+/*:295*/

+ 2
- 2
src/units.h Datei anzeigen

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

+ 9
- 9
src/webelement.cpp Datei anzeigen

@@ -1,18 +1,18 @@
1
-/*573:*/
2
-#line 368 "./webview.w"
1
+/*586:*/
2
+#line 383 "./webview.w"
3 3
 
4 4
 #include "webelement.h"
5 5
 
6
-/*571:*/
7
-#line 311 "./webview.w"
6
+/*584:*/
7
+#line 326 "./webview.w"
8 8
 
9 9
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
10 10
 {
11 11
 
12 12
 }
13 13
 
14
-/*:571*//*572:*/
15
-#line 320 "./webview.w"
14
+/*:584*//*585:*/
15
+#line 335 "./webview.w"
16 16
 
17 17
 void TypicaWebElement::appendInside(const QString&markup)
18 18
 {
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
59 59
 e.setPlainText(text);
60 60
 }
61 61
 
62
-/*:572*/
63
-#line 371 "./webview.w"
62
+/*:585*/
63
+#line 386 "./webview.w"
64 64
 
65 65
 
66
-/*:573*/
66
+/*:586*/

+ 3
- 3
src/webelement.h Datei anzeigen

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

+ 32
- 22
src/webview.cpp Datei anzeigen

@@ -1,9 +1,9 @@
1
-/*551:*/
1
+/*563:*/
2 2
 #line 50 "./webview.w"
3 3
 
4 4
 #include "webview.h"
5 5
 
6
-/*552:*/
6
+/*564:*/
7 7
 #line 57 "./webview.w"
8 8
 
9 9
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
12 12
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
13 13
 }
14 14
 
15
-/*:552*//*553:*/
15
+/*:564*//*565:*/
16 16
 #line 73 "./webview.w"
17 17
 
18 18
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
20 20
 if(url.scheme()=="typica")
21 21
 {
22 22
 QString address(url.toEncoded());
23
-/*554:*/
23
+/*566:*/
24 24
 #line 91 "./webview.w"
25 25
 
26 26
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
29 29
 return;
30 30
 }
31 31
 
32
-/*:554*/
32
+/*:566*/
33 33
 #line 79 "./webview.w"
34 34
 
35
-/*555:*/
35
+/*567:*/
36 36
 #line 100 "./webview.w"
37 37
 
38 38
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
41 41
 return;
42 42
 }
43 43
 
44
-/*:555*/
44
+/*:567*/
45 45
 #line 80 "./webview.w"
46 46
 
47 47
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
51 51
 }
52 52
 }
53 53
 
54
-/*:553*//*556:*/
54
+/*:565*//*568:*/
55 55
 #line 112 "./webview.w"
56 56
 
57 57
 void TypicaWebView::load(const QString&url)
@@ -59,16 +59,6 @@ void TypicaWebView::load(const QString&url)
59 59
 QWebView::load(QUrl(url));
60 60
 }
61 61
 
62
-void TypicaWebView::print()
63
-{
64
-QPrinter*printer= new QPrinter(QPrinter::HighResolution);
65
-QPrintDialog printDialog(printer,NULL);
66
-if(printDialog.exec()==QDialog::Accepted)
67
-{
68
-QWebView::print(printer);
69
-}
70
-}
71
-
72 62
 void TypicaWebView::setHtml(const QString&html,const QUrl&baseUrl)
73 63
 {
74 64
 QWebView::setHtml(html,baseUrl);
@@ -88,8 +78,28 @@ QString TypicaWebView::saveXml()
88 78
 return page()->currentFrame()->documentElement().toOuterXml();
89 79
 }
90 80
 
91
-/*:556*//*562:*/
92
-#line 205 "./webview.w"
81
+/*:568*//*569:*/
82
+#line 144 "./webview.w"
83
+
84
+void TypicaWebView::print(const QString&printerName)
85
+{
86
+QPrinter*printer= new QPrinter(QPrinter::HighResolution);
87
+if(!printerName.isEmpty())
88
+{
89
+printer->setPrinterName(printerName);
90
+printer->setFullPage(true);
91
+QWebView::print(printer);
92
+return;
93
+}
94
+QPrintDialog printDialog(printer,NULL);
95
+if(printDialog.exec()==QDialog::Accepted)
96
+{
97
+QWebView::print(printer);
98
+}
99
+}
100
+
101
+/*:569*//*575:*/
102
+#line 220 "./webview.w"
93 103
 
94 104
 QWebElement TypicaWebView::documentElement()
95 105
 {
@@ -101,8 +111,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
101 111
 return page()->mainFrame()->findFirstElement(selector);
102 112
 }
103 113
 
104
-/*:562*/
114
+/*:575*/
105 115
 #line 53 "./webview.w"
106 116
 
107 117
 
108
-/*:551*/
118
+/*:563*/

+ 3
- 3
src/webview.h Datei anzeigen

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

Laden…
Abbrechen
Speichern