diff --git a/client/chooka.pro b/client/chooka.pro index 0a3e3ab..95d0db5 100644 --- a/client/chooka.pro +++ b/client/chooka.pro @@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport CONFIG += c++11 TARGET = Litt TEMPLATE = app -VERSION = 0.9.1 +VERSION = 0.9.2 VERSTR = '\\"$${VERSION}\\"' DEFINES += VER=\"$${VERSTR}\" @@ -150,3 +150,7 @@ OBJECTIVE_SOURCES += \ !include("qtkeychain/qt5keychain.pri") { error("Unable to include QTKeyChain library.") } + +!include("qmarkdowntextedit/qmarkdowntextedit.pri") { + error("Unable to include QMarkdownTextEdit library") +} diff --git a/client/mainwindow.ui b/client/mainwindow.ui index 3cd5b8f..b9b1721 100644 --- a/client/mainwindow.ui +++ b/client/mainwindow.ui @@ -134,7 +134,7 @@ 0 - + 0 @@ -740,6 +740,11 @@ QTreeView
tasktreemodel.h
+ + QMarkdownTextEdit + QPlainTextEdit +
qmarkdowntextedit/qmarkdowntextedit.h
+ diff --git a/client/moc_aboutdlg.cpp b/client/moc_aboutdlg.cpp index 4e737fb..1494acc 100644 --- a/client/moc_aboutdlg.cpp +++ b/client/moc_aboutdlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'aboutdlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'aboutdlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -65,7 +65,7 @@ static const uint qt_meta_data_AboutDlg[] = { void AboutDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - AboutDlg *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->showLicense(); break; diff --git a/client/moc_attachmentsdialog.cpp b/client/moc_attachmentsdialog.cpp index 18743fa..0f9bdda 100644 --- a/client/moc_attachmentsdialog.cpp +++ b/client/moc_attachmentsdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'attachmentsdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'attachmentsdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_attachmentslist.cpp b/client/moc_attachmentslist.cpp index 82fd321..362b52a 100644 --- a/client/moc_attachmentslist.cpp +++ b/client/moc_attachmentslist.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'attachmentslist.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'attachmentslist.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -150,7 +150,7 @@ static const uint qt_meta_data_AttachmentsList[] = { void AttachmentsList::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - AttachmentsList *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->contextualMenu((*reinterpret_cast< const QPoint(*)>(_a[1]))); break; diff --git a/client/moc_finddialog.cpp b/client/moc_finddialog.cpp index afe3ed3..a9d855c 100644 --- a/client/moc_finddialog.cpp +++ b/client/moc_finddialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'finddialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'finddialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -81,7 +81,7 @@ static const uint qt_meta_data_FindInTasksDialog[] = { void FindInTasksDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - FindInTasksDialog *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->startSearch(); break; diff --git a/client/moc_findsupport.cpp b/client/moc_findsupport.cpp index 1f17663..877f16d 100644 --- a/client/moc_findsupport.cpp +++ b/client/moc_findsupport.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'findsupport.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'findsupport.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -68,7 +68,7 @@ static const uint qt_meta_data_FindResultsModel[] = { void FindResultsModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - FindResultsModel *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->addItem((*reinterpret_cast< const FindResultItem(*)>(_a[1]))); break; @@ -178,7 +178,7 @@ static const uint qt_meta_data_TaskSearch[] = { void TaskSearch::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - TaskSearch *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->newResultAvailable((*reinterpret_cast< const FindResultItem(*)>(_a[1]))); break; diff --git a/client/moc_fvavailableupdate.cpp b/client/moc_fvavailableupdate.cpp index 7a55eb5..084091d 100644 --- a/client/moc_fvavailableupdate.cpp +++ b/client/moc_fvavailableupdate.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvavailableupdate.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvavailableupdate.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_fvignoredversions.cpp b/client/moc_fvignoredversions.cpp index 8478a78..107f7ea 100644 --- a/client/moc_fvignoredversions.cpp +++ b/client/moc_fvignoredversions.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvignoredversions.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvignoredversions.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_fvplatform.cpp b/client/moc_fvplatform.cpp index 6ba653b..ba2b5c3 100644 --- a/client/moc_fvplatform.cpp +++ b/client/moc_fvplatform.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvplatform.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvplatform.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_fvupdateconfirmdialog.cpp b/client/moc_fvupdateconfirmdialog.cpp index e198d9f..a2dc81c 100644 --- a/client/moc_fvupdateconfirmdialog.cpp +++ b/client/moc_fvupdateconfirmdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvupdateconfirmdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvupdateconfirmdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_fvupdater.cpp b/client/moc_fvupdater.cpp index 3cb4736..be21d67 100644 --- a/client/moc_fvupdater.cpp +++ b/client/moc_fvupdater.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvupdater.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvupdater.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -107,7 +107,7 @@ static const uint qt_meta_data_FvUpdater[] = { void FvUpdater::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - FvUpdater *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: { bool _r = _t->CheckForUpdates((*reinterpret_cast< bool(*)>(_a[1]))); diff --git a/client/moc_fvupdatewindow.cpp b/client/moc_fvupdatewindow.cpp index 7bdf905..cd92bac 100644 --- a/client/moc_fvupdatewindow.cpp +++ b/client/moc_fvupdatewindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'fvupdatewindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'fvupdatewindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -68,7 +68,7 @@ static const uint qt_meta_data_FvUpdateWindow[] = { void FvUpdateWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - FvUpdateWindow *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->downloadFinished((*reinterpret_cast< QNetworkReply*(*)>(_a[1]))); break; diff --git a/client/moc_helper.cpp b/client/moc_helper.cpp index 71ea110..f3d0ac9 100644 --- a/client/moc_helper.cpp +++ b/client/moc_helper.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'helper.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'helper.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -20,29 +20,29 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED -struct qt_meta_stringdata_EscapeKeyEventFilter_t { +struct qt_meta_stringdata_helper__EscapeKeyEventFilter_t { QByteArrayData data[4]; - char stringdata0[40]; + char stringdata0[48]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ - qptrdiff(offsetof(qt_meta_stringdata_EscapeKeyEventFilter_t, stringdata0) + ofs \ + qptrdiff(offsetof(qt_meta_stringdata_helper__EscapeKeyEventFilter_t, stringdata0) + ofs \ - idx * sizeof(QByteArrayData)) \ ) -static const qt_meta_stringdata_EscapeKeyEventFilter_t qt_meta_stringdata_EscapeKeyEventFilter = { +static const qt_meta_stringdata_helper__EscapeKeyEventFilter_t qt_meta_stringdata_helper__EscapeKeyEventFilter = { { -QT_MOC_LITERAL(0, 0, 20), // "EscapeKeyEventFilter" -QT_MOC_LITERAL(1, 21, 13), // "escapePressed" -QT_MOC_LITERAL(2, 35, 0), // "" -QT_MOC_LITERAL(3, 36, 3) // "obj" +QT_MOC_LITERAL(0, 0, 28), // "helper::EscapeKeyEventFilter" +QT_MOC_LITERAL(1, 29, 13), // "escapePressed" +QT_MOC_LITERAL(2, 43, 0), // "" +QT_MOC_LITERAL(3, 44, 3) // "obj" }, - "EscapeKeyEventFilter\0escapePressed\0\0" - "obj" + "helper::EscapeKeyEventFilter\0escapePressed\0" + "\0obj" }; #undef QT_MOC_LITERAL -static const uint qt_meta_data_EscapeKeyEventFilter[] = { +static const uint qt_meta_data_helper__EscapeKeyEventFilter[] = { // content: 8, // revision @@ -64,10 +64,10 @@ static const uint qt_meta_data_EscapeKeyEventFilter[] = { 0 // eod }; -void EscapeKeyEventFilter::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +void helper::EscapeKeyEventFilter::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - EscapeKeyEventFilter *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->escapePressed((*reinterpret_cast< QObject*(*)>(_a[1]))); break; @@ -85,30 +85,30 @@ void EscapeKeyEventFilter::qt_static_metacall(QObject *_o, QMetaObject::Call _c, } } -QT_INIT_METAOBJECT const QMetaObject EscapeKeyEventFilter::staticMetaObject = { { +QT_INIT_METAOBJECT const QMetaObject helper::EscapeKeyEventFilter::staticMetaObject = { { &QObject::staticMetaObject, - qt_meta_stringdata_EscapeKeyEventFilter.data, - qt_meta_data_EscapeKeyEventFilter, + qt_meta_stringdata_helper__EscapeKeyEventFilter.data, + qt_meta_data_helper__EscapeKeyEventFilter, qt_static_metacall, nullptr, nullptr } }; -const QMetaObject *EscapeKeyEventFilter::metaObject() const +const QMetaObject *helper::EscapeKeyEventFilter::metaObject() const { return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; } -void *EscapeKeyEventFilter::qt_metacast(const char *_clname) +void *helper::EscapeKeyEventFilter::qt_metacast(const char *_clname) { if (!_clname) return nullptr; - if (!strcmp(_clname, qt_meta_stringdata_EscapeKeyEventFilter.stringdata0)) + if (!strcmp(_clname, qt_meta_stringdata_helper__EscapeKeyEventFilter.stringdata0)) return static_cast(this); return QObject::qt_metacast(_clname); } -int EscapeKeyEventFilter::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +int helper::EscapeKeyEventFilter::qt_metacall(QMetaObject::Call _c, int _id, void **_a) { _id = QObject::qt_metacall(_c, _id, _a); if (_id < 0) @@ -126,7 +126,7 @@ int EscapeKeyEventFilter::qt_metacall(QMetaObject::Call _c, int _id, void **_a) } // SIGNAL 0 -void EscapeKeyEventFilter::escapePressed(QObject * _t1) +void helper::EscapeKeyEventFilter::escapePressed(QObject * _t1) { void *_a[] = { nullptr, const_cast(reinterpret_cast(&_t1)) }; QMetaObject::activate(this, &staticMetaObject, 0, _a); diff --git a/client/moc_hidtracker.cpp b/client/moc_hidtracker.cpp index 4e63d7e..5bf1088 100644 --- a/client/moc_hidtracker.cpp +++ b/client/moc_hidtracker.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'hidtracker.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'hidtracker.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -76,7 +76,7 @@ static const uint qt_meta_data_HIDActivityTracker[] = { void HIDActivityTracker::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - HIDActivityTracker *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->idleDetected(); break; diff --git a/client/moc_logger.cpp b/client/moc_logger.cpp index 6ad2dd9..a65cf11 100644 --- a/client/moc_logger.cpp +++ b/client/moc_logger.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'logger.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'logger.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_mainwindow.cpp b/client/moc_mainwindow.cpp index f4b71d6..2e07608 100644 --- a/client/moc_mainwindow.cpp +++ b/client/moc_mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mainwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mainwindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +21,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_MainWindow_t { - QByteArrayData data[83]; - char stringdata0[1089]; + QByteArrayData data[87]; + char stringdata0[1127]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -60,60 +60,64 @@ QT_MOC_LITERAL(25, 276, 19), // "startTrackingRecent" QT_MOC_LITERAL(26, 296, 12), // "stopTracking" QT_MOC_LITERAL(27, 309, 18), // "TrackingStopReason" QT_MOC_LITERAL(28, 328, 6), // "reason" -QT_MOC_LITERAL(29, 335, 10), // "currentUtc" -QT_MOC_LITERAL(30, 346, 10), // "updateData" -QT_MOC_LITERAL(31, 357, 9), // "add10Mins" -QT_MOC_LITERAL(32, 367, 20), // "editSelectionChanged" -QT_MOC_LITERAL(33, 388, 19), // "editPositionChanged" -QT_MOC_LITERAL(34, 408, 17), // "editFormatChanged" -QT_MOC_LITERAL(35, 426, 15), // "QTextCharFormat" -QT_MOC_LITERAL(36, 442, 3), // "fmt" -QT_MOC_LITERAL(37, 446, 8), // "editUndo" -QT_MOC_LITERAL(38, 455, 8), // "editRedo" -QT_MOC_LITERAL(39, 464, 7), // "editCut" -QT_MOC_LITERAL(40, 472, 8), // "editCopy" -QT_MOC_LITERAL(41, 481, 9), // "editPaste" -QT_MOC_LITERAL(42, 491, 10), // "editDelete" -QT_MOC_LITERAL(43, 502, 13), // "editSelectAll" -QT_MOC_LITERAL(44, 516, 13), // "iconActivated" -QT_MOC_LITERAL(45, 530, 33), // "QSystemTrayIcon::ActivationRe..." -QT_MOC_LITERAL(46, 564, 17), // "timeFormatChanged" -QT_MOC_LITERAL(47, 582, 12), // "showTimeline" -QT_MOC_LITERAL(48, 595, 14), // "showTimeReport" -QT_MOC_LITERAL(49, 610, 25), // "newPasswordDialogFinished" -QT_MOC_LITERAL(50, 636, 6), // "status" -QT_MOC_LITERAL(51, 643, 22), // "passwordDialogFinished" -QT_MOC_LITERAL(52, 666, 21), // "criticalAlertFinished" -QT_MOC_LITERAL(53, 688, 17), // "openAlertFinished" -QT_MOC_LITERAL(54, 706, 20), // "warningAlertFinished" -QT_MOC_LITERAL(55, 727, 24), // "toolbarVisibilityChanged" -QT_MOC_LITERAL(56, 752, 7), // "visible" -QT_MOC_LITERAL(57, 760, 15), // "showHideToolbar" -QT_MOC_LITERAL(58, 776, 15), // "showAttachments" -QT_MOC_LITERAL(59, 792, 15), // "checkForUpdates" -QT_MOC_LITERAL(60, 808, 11), // "systemSleep" -QT_MOC_LITERAL(61, 820, 12), // "systemResume" -QT_MOC_LITERAL(62, 833, 23), // "changeTimeTrackableFlag" -QT_MOC_LITERAL(63, 857, 9), // "trackable" -QT_MOC_LITERAL(64, 867, 4), // "find" -QT_MOC_LITERAL(65, 872, 11), // "findInTasks" -QT_MOC_LITERAL(66, 884, 13), // "findRequested" -QT_MOC_LITERAL(67, 898, 12), // "findRejected" -QT_MOC_LITERAL(68, 911, 3), // "obj" -QT_MOC_LITERAL(69, 915, 15), // "taskTextChanged" -QT_MOC_LITERAL(70, 931, 9), // "taskMoved" -QT_MOC_LITERAL(71, 941, 5), // "PTask" -QT_MOC_LITERAL(72, 947, 4), // "task" -QT_MOC_LITERAL(73, 952, 13), // "focusTaskTree" -QT_MOC_LITERAL(74, 966, 13), // "focusTaskText" -QT_MOC_LITERAL(75, 980, 14), // "showMainWindow" -QT_MOC_LITERAL(76, 995, 14), // "continueOnIdle" -QT_MOC_LITERAL(77, 1010, 11), // "breakOnIdle" -QT_MOC_LITERAL(78, 1022, 8), // "stopTime" -QT_MOC_LITERAL(79, 1031, 15), // "startOnActivity" -QT_MOC_LITERAL(80, 1047, 14), // "stopOnActivity" -QT_MOC_LITERAL(81, 1062, 19), // "trayWindowDestroyed" -QT_MOC_LITERAL(82, 1082, 6) // "object" +QT_MOC_LITERAL(29, 335, 6), // "time_t" +QT_MOC_LITERAL(30, 342, 11), // "current_utc" +QT_MOC_LITERAL(31, 354, 10), // "updateData" +QT_MOC_LITERAL(32, 365, 9), // "add10Mins" +QT_MOC_LITERAL(33, 375, 20), // "editSelectionChanged" +QT_MOC_LITERAL(34, 396, 19), // "editPositionChanged" +QT_MOC_LITERAL(35, 416, 17), // "editFormatChanged" +QT_MOC_LITERAL(36, 434, 15), // "QTextCharFormat" +QT_MOC_LITERAL(37, 450, 3), // "fmt" +QT_MOC_LITERAL(38, 454, 8), // "editUndo" +QT_MOC_LITERAL(39, 463, 8), // "editRedo" +QT_MOC_LITERAL(40, 472, 7), // "editCut" +QT_MOC_LITERAL(41, 480, 8), // "editCopy" +QT_MOC_LITERAL(42, 489, 9), // "editPaste" +QT_MOC_LITERAL(43, 499, 10), // "editDelete" +QT_MOC_LITERAL(44, 510, 13), // "editSelectAll" +QT_MOC_LITERAL(45, 524, 13), // "iconActivated" +QT_MOC_LITERAL(46, 538, 33), // "QSystemTrayIcon::ActivationRe..." +QT_MOC_LITERAL(47, 572, 17), // "timeFormatChanged" +QT_MOC_LITERAL(48, 590, 12), // "showTimeline" +QT_MOC_LITERAL(49, 603, 14), // "showTimeReport" +QT_MOC_LITERAL(50, 618, 21), // "criticalAlertFinished" +QT_MOC_LITERAL(51, 640, 6), // "status" +QT_MOC_LITERAL(52, 647, 20), // "warningAlertFinished" +QT_MOC_LITERAL(53, 668, 24), // "toolbarVisibilityChanged" +QT_MOC_LITERAL(54, 693, 7), // "visible" +QT_MOC_LITERAL(55, 701, 15), // "showHideToolbar" +QT_MOC_LITERAL(56, 717, 15), // "showAttachments" +QT_MOC_LITERAL(57, 733, 15), // "checkForUpdates" +QT_MOC_LITERAL(58, 749, 11), // "systemSleep" +QT_MOC_LITERAL(59, 761, 12), // "systemResume" +QT_MOC_LITERAL(60, 774, 23), // "changeTimeTrackableFlag" +QT_MOC_LITERAL(61, 798, 9), // "trackable" +QT_MOC_LITERAL(62, 808, 4), // "find" +QT_MOC_LITERAL(63, 813, 11), // "findInTasks" +QT_MOC_LITERAL(64, 825, 13), // "findRequested" +QT_MOC_LITERAL(65, 839, 12), // "findRejected" +QT_MOC_LITERAL(66, 852, 3), // "obj" +QT_MOC_LITERAL(67, 856, 15), // "taskTextChanged" +QT_MOC_LITERAL(68, 872, 9), // "taskMoved" +QT_MOC_LITERAL(69, 882, 5), // "PTask" +QT_MOC_LITERAL(70, 888, 4), // "task" +QT_MOC_LITERAL(71, 893, 13), // "focusTaskTree" +QT_MOC_LITERAL(72, 907, 13), // "focusTaskText" +QT_MOC_LITERAL(73, 921, 14), // "showMainWindow" +QT_MOC_LITERAL(74, 936, 14), // "continueOnIdle" +QT_MOC_LITERAL(75, 951, 11), // "breakOnIdle" +QT_MOC_LITERAL(76, 963, 8), // "stopTime" +QT_MOC_LITERAL(77, 972, 15), // "startOnActivity" +QT_MOC_LITERAL(78, 988, 14), // "stopOnActivity" +QT_MOC_LITERAL(79, 1003, 19), // "trayWindowDestroyed" +QT_MOC_LITERAL(80, 1023, 6), // "object" +QT_MOC_LITERAL(81, 1030, 19), // "onDbPasswordEntered" +QT_MOC_LITERAL(82, 1050, 8), // "password" +QT_MOC_LITERAL(83, 1059, 21), // "onDbPasswordCancelled" +QT_MOC_LITERAL(84, 1081, 22), // "onNewDbPasswordEntered" +QT_MOC_LITERAL(85, 1104, 17), // "onDatabaseChanged" +QT_MOC_LITERAL(86, 1122, 4) // "path" }, "MainWindow\0onTimeFormatChanged\0\0" @@ -125,19 +129,18 @@ QT_MOC_LITERAL(82, 1082, 6) // "object" "idleDetected\0activityDetected\0" "startOrStopTracking\0startTracking\0" "startTrackingRecent\0stopTracking\0" - "TrackingStopReason\0reason\0currentUtc\0" - "updateData\0add10Mins\0editSelectionChanged\0" - "editPositionChanged\0editFormatChanged\0" - "QTextCharFormat\0fmt\0editUndo\0editRedo\0" - "editCut\0editCopy\0editPaste\0editDelete\0" - "editSelectAll\0iconActivated\0" - "QSystemTrayIcon::ActivationReason\0" + "TrackingStopReason\0reason\0time_t\0" + "current_utc\0updateData\0add10Mins\0" + "editSelectionChanged\0editPositionChanged\0" + "editFormatChanged\0QTextCharFormat\0fmt\0" + "editUndo\0editRedo\0editCut\0editCopy\0" + "editPaste\0editDelete\0editSelectAll\0" + "iconActivated\0QSystemTrayIcon::ActivationReason\0" "timeFormatChanged\0showTimeline\0" - "showTimeReport\0newPasswordDialogFinished\0" - "status\0passwordDialogFinished\0" - "criticalAlertFinished\0openAlertFinished\0" - "warningAlertFinished\0toolbarVisibilityChanged\0" - "visible\0showHideToolbar\0showAttachments\0" + "showTimeReport\0criticalAlertFinished\0" + "status\0warningAlertFinished\0" + "toolbarVisibilityChanged\0visible\0" + "showHideToolbar\0showAttachments\0" "checkForUpdates\0systemSleep\0systemResume\0" "changeTimeTrackableFlag\0trackable\0" "find\0findInTasks\0findRequested\0" @@ -146,7 +149,10 @@ QT_MOC_LITERAL(82, 1082, 6) // "object" "focusTaskText\0showMainWindow\0" "continueOnIdle\0breakOnIdle\0stopTime\0" "startOnActivity\0stopOnActivity\0" - "trayWindowDestroyed\0object" + "trayWindowDestroyed\0object\0" + "onDbPasswordEntered\0password\0" + "onDbPasswordCancelled\0onNewDbPasswordEntered\0" + "onDatabaseChanged\0path" }; #undef QT_MOC_LITERAL @@ -156,7 +162,7 @@ static const uint qt_meta_data_MainWindow[] = { 8, // revision 0, // classname 0, 0, // classinfo - 66, 14, // methods + 67, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -164,74 +170,75 @@ static const uint qt_meta_data_MainWindow[] = { 2, // signalCount // signals: name, argc, parameters, tag, flags - 1, 0, 344, 2, 0x06 /* Public */, - 3, 0, 345, 2, 0x06 /* Public */, + 1, 0, 349, 2, 0x06 /* Public */, + 3, 0, 350, 2, 0x06 /* Public */, // slots: name, argc, parameters, tag, flags - 4, 0, 346, 2, 0x0a /* Public */, - 5, 0, 347, 2, 0x0a /* Public */, - 6, 0, 348, 2, 0x0a /* Public */, - 7, 0, 349, 2, 0x0a /* Public */, - 8, 0, 350, 2, 0x0a /* Public */, - 9, 0, 351, 2, 0x0a /* Public */, - 10, 0, 352, 2, 0x0a /* Public */, - 11, 0, 353, 2, 0x0a /* Public */, - 12, 0, 354, 2, 0x0a /* Public */, - 13, 0, 355, 2, 0x0a /* Public */, - 14, 0, 356, 2, 0x0a /* Public */, - 15, 0, 357, 2, 0x0a /* Public */, - 16, 0, 358, 2, 0x0a /* Public */, - 17, 1, 359, 2, 0x0a /* Public */, - 19, 2, 362, 2, 0x0a /* Public */, - 21, 0, 367, 2, 0x0a /* Public */, - 22, 0, 368, 2, 0x0a /* Public */, - 23, 0, 369, 2, 0x0a /* Public */, - 24, 0, 370, 2, 0x0a /* Public */, - 25, 0, 371, 2, 0x0a /* Public */, - 26, 2, 372, 2, 0x0a /* Public */, - 26, 1, 377, 2, 0x2a /* Public | MethodCloned */, - 30, 0, 380, 2, 0x0a /* Public */, - 31, 0, 381, 2, 0x0a /* Public */, - 32, 0, 382, 2, 0x0a /* Public */, - 33, 0, 383, 2, 0x0a /* Public */, - 34, 1, 384, 2, 0x0a /* Public */, - 37, 0, 387, 2, 0x0a /* Public */, - 38, 0, 388, 2, 0x0a /* Public */, - 39, 0, 389, 2, 0x0a /* Public */, - 40, 0, 390, 2, 0x0a /* Public */, - 41, 0, 391, 2, 0x0a /* Public */, - 42, 0, 392, 2, 0x0a /* Public */, - 43, 0, 393, 2, 0x0a /* Public */, - 44, 1, 394, 2, 0x0a /* Public */, - 46, 0, 397, 2, 0x0a /* Public */, - 47, 0, 398, 2, 0x0a /* Public */, - 48, 0, 399, 2, 0x0a /* Public */, - 49, 1, 400, 2, 0x0a /* Public */, - 51, 1, 403, 2, 0x0a /* Public */, - 52, 1, 406, 2, 0x0a /* Public */, - 53, 1, 409, 2, 0x0a /* Public */, - 54, 1, 412, 2, 0x0a /* Public */, - 55, 1, 415, 2, 0x0a /* Public */, - 57, 0, 418, 2, 0x0a /* Public */, - 58, 0, 419, 2, 0x0a /* Public */, - 59, 0, 420, 2, 0x0a /* Public */, - 60, 0, 421, 2, 0x0a /* Public */, - 61, 0, 422, 2, 0x0a /* Public */, - 62, 1, 423, 2, 0x0a /* Public */, - 64, 0, 426, 2, 0x0a /* Public */, - 65, 0, 427, 2, 0x0a /* Public */, - 66, 0, 428, 2, 0x0a /* Public */, - 67, 1, 429, 2, 0x0a /* Public */, - 69, 0, 432, 2, 0x0a /* Public */, - 70, 1, 433, 2, 0x0a /* Public */, - 73, 0, 436, 2, 0x0a /* Public */, - 74, 0, 437, 2, 0x0a /* Public */, - 75, 0, 438, 2, 0x0a /* Public */, - 76, 0, 439, 2, 0x0a /* Public */, - 77, 1, 440, 2, 0x0a /* Public */, - 79, 0, 443, 2, 0x0a /* Public */, - 80, 0, 444, 2, 0x0a /* Public */, - 81, 1, 445, 2, 0x0a /* Public */, + 4, 0, 351, 2, 0x0a /* Public */, + 5, 0, 352, 2, 0x0a /* Public */, + 6, 0, 353, 2, 0x0a /* Public */, + 7, 0, 354, 2, 0x0a /* Public */, + 8, 0, 355, 2, 0x0a /* Public */, + 9, 0, 356, 2, 0x0a /* Public */, + 10, 0, 357, 2, 0x0a /* Public */, + 11, 0, 358, 2, 0x0a /* Public */, + 12, 0, 359, 2, 0x0a /* Public */, + 13, 0, 360, 2, 0x0a /* Public */, + 14, 0, 361, 2, 0x0a /* Public */, + 15, 0, 362, 2, 0x0a /* Public */, + 16, 0, 363, 2, 0x0a /* Public */, + 17, 1, 364, 2, 0x0a /* Public */, + 19, 2, 367, 2, 0x0a /* Public */, + 21, 0, 372, 2, 0x0a /* Public */, + 22, 0, 373, 2, 0x0a /* Public */, + 23, 0, 374, 2, 0x0a /* Public */, + 24, 0, 375, 2, 0x0a /* Public */, + 25, 0, 376, 2, 0x0a /* Public */, + 26, 2, 377, 2, 0x0a /* Public */, + 26, 1, 382, 2, 0x2a /* Public | MethodCloned */, + 31, 0, 385, 2, 0x0a /* Public */, + 32, 0, 386, 2, 0x0a /* Public */, + 33, 0, 387, 2, 0x0a /* Public */, + 34, 0, 388, 2, 0x0a /* Public */, + 35, 1, 389, 2, 0x0a /* Public */, + 38, 0, 392, 2, 0x0a /* Public */, + 39, 0, 393, 2, 0x0a /* Public */, + 40, 0, 394, 2, 0x0a /* Public */, + 41, 0, 395, 2, 0x0a /* Public */, + 42, 0, 396, 2, 0x0a /* Public */, + 43, 0, 397, 2, 0x0a /* Public */, + 44, 0, 398, 2, 0x0a /* Public */, + 45, 1, 399, 2, 0x0a /* Public */, + 47, 0, 402, 2, 0x0a /* Public */, + 48, 0, 403, 2, 0x0a /* Public */, + 49, 0, 404, 2, 0x0a /* Public */, + 50, 1, 405, 2, 0x0a /* Public */, + 52, 1, 408, 2, 0x0a /* Public */, + 53, 1, 411, 2, 0x0a /* Public */, + 55, 0, 414, 2, 0x0a /* Public */, + 56, 0, 415, 2, 0x0a /* Public */, + 57, 0, 416, 2, 0x0a /* Public */, + 58, 0, 417, 2, 0x0a /* Public */, + 59, 0, 418, 2, 0x0a /* Public */, + 60, 1, 419, 2, 0x0a /* Public */, + 62, 0, 422, 2, 0x0a /* Public */, + 63, 0, 423, 2, 0x0a /* Public */, + 64, 0, 424, 2, 0x0a /* Public */, + 65, 1, 425, 2, 0x0a /* Public */, + 67, 0, 428, 2, 0x0a /* Public */, + 68, 1, 429, 2, 0x0a /* Public */, + 71, 0, 432, 2, 0x0a /* Public */, + 72, 0, 433, 2, 0x0a /* Public */, + 73, 0, 434, 2, 0x0a /* Public */, + 74, 0, 435, 2, 0x0a /* Public */, + 75, 1, 436, 2, 0x0a /* Public */, + 77, 0, 439, 2, 0x0a /* Public */, + 78, 0, 440, 2, 0x0a /* Public */, + 79, 1, 441, 2, 0x0a /* Public */, + 81, 1, 444, 2, 0x0a /* Public */, + 83, 0, 447, 2, 0x0a /* Public */, + 84, 1, 448, 2, 0x0a /* Public */, + 85, 1, 451, 2, 0x0a /* Public */, // signals: parameters QMetaType::Void, @@ -258,13 +265,13 @@ static const uint qt_meta_data_MainWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, 0x80000000 | 27, QMetaType::QDateTime, 28, 29, + QMetaType::Void, 0x80000000 | 27, 0x80000000 | 29, 28, 30, QMetaType::Void, 0x80000000 | 27, 28, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, 0x80000000 | 35, 36, + QMetaType::Void, 0x80000000 | 36, 37, QMetaType::Void, QMetaType::Void, QMetaType::Void, @@ -272,36 +279,37 @@ static const uint qt_meta_data_MainWindow[] = { QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, 0x80000000 | 45, 28, + QMetaType::Void, 0x80000000 | 46, 28, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Int, 50, - QMetaType::Void, QMetaType::Int, 50, - QMetaType::Void, QMetaType::Int, 50, - QMetaType::Void, QMetaType::Int, 50, - QMetaType::Void, QMetaType::Int, 50, - QMetaType::Void, QMetaType::Bool, 56, + QMetaType::Void, QMetaType::Int, 51, + QMetaType::Void, QMetaType::Int, 51, + QMetaType::Void, QMetaType::Bool, 54, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Bool, 63, + QMetaType::Void, QMetaType::Bool, 61, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QObjectStar, 68, + QMetaType::Void, QMetaType::QObjectStar, 66, QMetaType::Void, - QMetaType::Void, 0x80000000 | 71, 72, + QMetaType::Void, 0x80000000 | 69, 70, QMetaType::Void, QMetaType::Void, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QDateTime, 78, + QMetaType::Void, QMetaType::QDateTime, 76, QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::QObjectStar, 82, + QMetaType::Void, QMetaType::QObjectStar, 80, + QMetaType::Void, QMetaType::QString, 82, + QMetaType::Void, + QMetaType::Void, QMetaType::QString, 82, + QMetaType::Void, QMetaType::QString, 86, 0 // eod }; @@ -309,7 +317,7 @@ static const uint qt_meta_data_MainWindow[] = { void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - MainWindow *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->onTimeFormatChanged(); break; @@ -334,7 +342,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 19: _t->startOrStopTracking(); break; case 20: _t->startTracking(); break; case 21: _t->startTrackingRecent(); break; - case 22: _t->stopTracking((*reinterpret_cast< TrackingStopReason(*)>(_a[1])),(*reinterpret_cast< const QDateTime(*)>(_a[2]))); break; + case 22: _t->stopTracking((*reinterpret_cast< TrackingStopReason(*)>(_a[1])),(*reinterpret_cast< time_t(*)>(_a[2]))); break; case 23: _t->stopTracking((*reinterpret_cast< TrackingStopReason(*)>(_a[1]))); break; case 24: _t->updateData(); break; case 25: _t->add10Mins(); break; @@ -352,32 +360,33 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 37: _t->timeFormatChanged(); break; case 38: _t->showTimeline(); break; case 39: _t->showTimeReport(); break; - case 40: _t->newPasswordDialogFinished((*reinterpret_cast< int(*)>(_a[1]))); break; - case 41: _t->passwordDialogFinished((*reinterpret_cast< int(*)>(_a[1]))); break; - case 42: _t->criticalAlertFinished((*reinterpret_cast< int(*)>(_a[1]))); break; - case 43: _t->openAlertFinished((*reinterpret_cast< int(*)>(_a[1]))); break; - case 44: _t->warningAlertFinished((*reinterpret_cast< int(*)>(_a[1]))); break; - case 45: _t->toolbarVisibilityChanged((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 46: _t->showHideToolbar(); break; - case 47: _t->showAttachments(); break; - case 48: _t->checkForUpdates(); break; - case 49: _t->systemSleep(); break; - case 50: _t->systemResume(); break; - case 51: _t->changeTimeTrackableFlag((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 52: _t->find(); break; - case 53: _t->findInTasks(); break; - case 54: _t->findRequested(); break; - case 55: _t->findRejected((*reinterpret_cast< QObject*(*)>(_a[1]))); break; - case 56: _t->taskTextChanged(); break; - case 57: _t->taskMoved((*reinterpret_cast< PTask(*)>(_a[1]))); break; - case 58: _t->focusTaskTree(); break; - case 59: _t->focusTaskText(); break; - case 60: _t->showMainWindow(); break; - case 61: _t->continueOnIdle(); break; - case 62: _t->breakOnIdle((*reinterpret_cast< const QDateTime(*)>(_a[1]))); break; - case 63: _t->startOnActivity(); break; - case 64: _t->stopOnActivity(); break; - case 65: _t->trayWindowDestroyed((*reinterpret_cast< QObject*(*)>(_a[1]))); break; + case 40: _t->criticalAlertFinished((*reinterpret_cast< int(*)>(_a[1]))); break; + case 41: _t->warningAlertFinished((*reinterpret_cast< int(*)>(_a[1]))); break; + case 42: _t->toolbarVisibilityChanged((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 43: _t->showHideToolbar(); break; + case 44: _t->showAttachments(); break; + case 45: _t->checkForUpdates(); break; + case 46: _t->systemSleep(); break; + case 47: _t->systemResume(); break; + case 48: _t->changeTimeTrackableFlag((*reinterpret_cast< bool(*)>(_a[1]))); break; + case 49: _t->find(); break; + case 50: _t->findInTasks(); break; + case 51: _t->findRequested(); break; + case 52: _t->findRejected((*reinterpret_cast< QObject*(*)>(_a[1]))); break; + case 53: _t->taskTextChanged(); break; + case 54: _t->taskMoved((*reinterpret_cast< PTask(*)>(_a[1]))); break; + case 55: _t->focusTaskTree(); break; + case 56: _t->focusTaskText(); break; + case 57: _t->showMainWindow(); break; + case 58: _t->continueOnIdle(); break; + case 59: _t->breakOnIdle((*reinterpret_cast< const QDateTime(*)>(_a[1]))); break; + case 60: _t->startOnActivity(); break; + case 61: _t->stopOnActivity(); break; + case 62: _t->trayWindowDestroyed((*reinterpret_cast< QObject*(*)>(_a[1]))); break; + case 63: _t->onDbPasswordEntered((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 64: _t->onDbPasswordCancelled(); break; + case 65: _t->onNewDbPasswordEntered((*reinterpret_cast< const QString(*)>(_a[1]))); break; + case 66: _t->onDatabaseChanged((*reinterpret_cast< const QString(*)>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -428,13 +437,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 66) + if (_id < 67) qt_static_metacall(this, _c, _id, _a); - _id -= 66; + _id -= 67; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 66) + if (_id < 67) *reinterpret_cast(_a[0]) = -1; - _id -= 66; + _id -= 67; } return _id; } diff --git a/client/moc_newpassworddlg.cpp b/client/moc_newpassworddlg.cpp index d954ce5..146f5df 100644 --- a/client/moc_newpassworddlg.cpp +++ b/client/moc_newpassworddlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'newpassworddlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'newpassworddlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -65,7 +65,7 @@ static const uint qt_meta_data_NewPasswordDlg[] = { void NewPasswordDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - NewPasswordDlg *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->tryAccept(); break; diff --git a/client/moc_passworddlg.cpp b/client/moc_passworddlg.cpp index f627fc9..16c57d0 100644 --- a/client/moc_passworddlg.cpp +++ b/client/moc_passworddlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'passworddlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'passworddlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_preferencesdlg.cpp b/client/moc_preferencesdlg.cpp index e66b203..521c249 100644 --- a/client/moc_preferencesdlg.cpp +++ b/client/moc_preferencesdlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'preferencesdlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'preferencesdlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -84,7 +84,7 @@ static const uint qt_meta_data_PreferencesDlg[] = { void PreferencesDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - PreferencesDlg *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->selectDatabase(); break; diff --git a/client/moc_sleeptracker_osx.cpp b/client/moc_sleeptracker_osx.cpp index 0e07483..9ee9ea3 100644 --- a/client/moc_sleeptracker_osx.cpp +++ b/client/moc_sleeptracker_osx.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'sleeptracker_osx.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'sleeptracker_osx.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -68,7 +68,7 @@ static const uint qt_meta_data_SleepTracker[] = { void SleepTracker::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - SleepTracker *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->onSystemSleep(); break; diff --git a/client/moc_startworkdialog.cpp b/client/moc_startworkdialog.cpp index 561b7e9..b391d10 100644 --- a/client/moc_startworkdialog.cpp +++ b/client/moc_startworkdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'startworkdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'startworkdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -83,7 +83,7 @@ static const uint qt_meta_data_StartWorkDialog[] = { void StartWorkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - StartWorkDialog *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->continueTracking(); break; diff --git a/client/moc_stopworkdialog.cpp b/client/moc_stopworkdialog.cpp index 6995422..35ae9cf 100644 --- a/client/moc_stopworkdialog.cpp +++ b/client/moc_stopworkdialog.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'stopworkdialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'stopworkdialog.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -84,7 +84,7 @@ static const uint qt_meta_data_StopWorkDialog[] = { void StopWorkDialog::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - StopWorkDialog *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->continueTracking(); break; diff --git a/client/moc_task.cpp b/client/moc_task.cpp index 3956a5d..3a4a405 100644 --- a/client/moc_task.cpp +++ b/client/moc_task.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'task.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'task.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif diff --git a/client/moc_tasktreemodel.cpp b/client/moc_tasktreemodel.cpp index f2d4737..2401861 100644 --- a/client/moc_tasktreemodel.cpp +++ b/client/moc_tasktreemodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'tasktreemodel.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'tasktreemodel.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -67,7 +67,7 @@ static const uint qt_meta_data_TaskTreeModel[] = { void TaskTreeModel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - TaskTreeModel *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->onTaskMoved((*reinterpret_cast< PTask(*)>(_a[1]))); break; diff --git a/client/moc_timeintervaldlg.cpp b/client/moc_timeintervaldlg.cpp index c1a2fbf..e518d8d 100644 --- a/client/moc_timeintervaldlg.cpp +++ b/client/moc_timeintervaldlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'timeintervaldlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'timeintervaldlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -66,7 +66,7 @@ static const uint qt_meta_data_TimeIntervalDlg[] = { void TimeIntervalDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - TimeIntervalDlg *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->dataChanged((*reinterpret_cast< const QDateTime(*)>(_a[1]))); break; diff --git a/client/moc_timereportwizard.cpp b/client/moc_timereportwizard.cpp index 2eb9740..1f4ffab 100644 --- a/client/moc_timereportwizard.cpp +++ b/client/moc_timereportwizard.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'timereportwizard.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'timereportwizard.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -65,7 +65,7 @@ static const uint qt_meta_data_TaskTreePage[] = { void TaskTreePage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - TaskTreePage *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->accepted(); break; @@ -160,7 +160,7 @@ static const uint qt_meta_data_CumulativeOptionPage[] = { void CumulativeOptionPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - CumulativeOptionPage *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->onChanged((*reinterpret_cast< bool(*)>(_a[1]))); break; @@ -398,7 +398,7 @@ static const uint qt_meta_data_TimeReportWizard[] = { void TimeReportWizard::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - TimeReportWizard *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->wizardFinished(); break; diff --git a/client/moc_timetreedlg.cpp b/client/moc_timetreedlg.cpp index 0bef677..b43a64d 100644 --- a/client/moc_timetreedlg.cpp +++ b/client/moc_timetreedlg.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'timetreedlg.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.0) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.2) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -12,7 +12,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'timetreedlg.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.0. It" +#error "This file was generated using the moc from 5.12.2. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -75,7 +75,7 @@ static const uint qt_meta_data_TimeTreeDlg[] = { void TimeTreeDlg::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - TimeTreeDlg *_t = static_cast(_o); + auto *_t = static_cast(_o); Q_UNUSED(_t) switch (_id) { case 0: _t->addInterval(); break; diff --git a/client/qrc_mainwindow.cpp b/client/qrc_mainwindow.cpp index fa07a63..0d01acd 100644 --- a/client/qrc_mainwindow.cpp +++ b/client/qrc_mainwindow.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** Resource object code ** -** Created by: The Resource Compiler for Qt version 5.12.0 +** Created by: The Resource Compiler for Qt version 5.12.2 ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ diff --git a/client/ui_aboutdlg.h b/client/ui_aboutdlg.h index f40f917..f4699bc 100644 --- a/client/ui_aboutdlg.h +++ b/client/ui_aboutdlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'aboutdlg.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_attachmentsdialog.h b/client/ui_attachmentsdialog.h index 581e66c..73bd338 100644 --- a/client/ui_attachmentsdialog.h +++ b/client/ui_attachmentsdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'attachmentsdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_attachmentslist.h b/client/ui_attachmentslist.h index fa98c07..a8be5db 100644 --- a/client/ui_attachmentslist.h +++ b/client/ui_attachmentslist.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'attachmentslist.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_finddialog.h b/client/ui_finddialog.h index aa865f5..f3bc3e5 100644 --- a/client/ui_finddialog.h +++ b/client/ui_finddialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'finddialog.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_fvupdateconfirmdialog.h b/client/ui_fvupdateconfirmdialog.h index 4c67777..14b2b14 100644 --- a/client/ui_fvupdateconfirmdialog.h +++ b/client/ui_fvupdateconfirmdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'fvupdateconfirmdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_fvupdatewindow.h b/client/ui_fvupdatewindow.h index 86ee5b2..3d04e97 100644 --- a/client/ui_fvupdatewindow.h +++ b/client/ui_fvupdatewindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'fvupdatewindow.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_mainwindow.h b/client/ui_mainwindow.h index 913588e..ea59355 100644 --- a/client/ui_mainwindow.h +++ b/client/ui_mainwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'mainwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -23,12 +23,12 @@ #include #include #include -#include #include #include #include #include #include +#include "qmarkdowntextedit/qmarkdowntextedit.h" #include "tasktreemodel.h" QT_BEGIN_NAMESPACE @@ -79,7 +79,7 @@ public: QSplitter *mTimeSplitter; QFrame *mEditFrame; QVBoxLayout *verticalLayout; - QPlainTextEdit *mNoteEdit; + QMarkdownTextEdit *mNoteEdit; QFrame *mFindFrame; QHBoxLayout *mFindFrameLayout; QLabel *label; @@ -307,7 +307,7 @@ public: verticalLayout->setContentsMargins(11, 11, 11, 11); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); verticalLayout->setContentsMargins(0, 0, 0, 0); - mNoteEdit = new QPlainTextEdit(mEditFrame); + mNoteEdit = new QMarkdownTextEdit(mEditFrame); mNoteEdit->setObjectName(QString::fromUtf8("mNoteEdit")); sizePolicy.setHeightForWidth(mNoteEdit->sizePolicy().hasHeightForWidth()); mNoteEdit->setSizePolicy(sizePolicy); diff --git a/client/ui_newpassworddlg.h b/client/ui_newpassworddlg.h index c40c1ce..e9bdf78 100644 --- a/client/ui_newpassworddlg.h +++ b/client/ui_newpassworddlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'newpassworddlg.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_passworddlg.h b/client/ui_passworddlg.h index 17340fa..a3e6e5a 100644 --- a/client/ui_passworddlg.h +++ b/client/ui_passworddlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'passworddlg.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_preferencesdlg.h b/client/ui_preferencesdlg.h index 2ba1197..4337bde 100644 --- a/client/ui_preferencesdlg.h +++ b/client/ui_preferencesdlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'preferencesdlg.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -57,7 +57,7 @@ public: { if (PreferencesDlg->objectName().isEmpty()) PreferencesDlg->setObjectName(QString::fromUtf8("PreferencesDlg")); - PreferencesDlg->resize(444, 353); + PreferencesDlg->resize(444, 374); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); @@ -211,7 +211,7 @@ public: { PreferencesDlg->setWindowTitle(QApplication::translate("PreferencesDlg", "Dialog", nullptr)); mShowSecondsCheckbox->setText(QApplication::translate("PreferencesDlg", "Show seconds", nullptr)); - mAutosavePasswordCheckbox->setText(QApplication::translate("PreferencesDlg", "Autosave password (requires app restart)", nullptr)); + mAutosavePasswordCheckbox->setText(QApplication::translate("PreferencesDlg", "Save password in keychain", nullptr)); mShowTrayIconCheckbox->setText(QApplication::translate("PreferencesDlg", "Show tray icon", nullptr)); mDarkThemeCheckbox->setText(QApplication::translate("PreferencesDlg", "Use dark theme", nullptr)); mCustomDatabaseFileCheckbox->setText(QApplication::translate("PreferencesDlg", "Use database at custom location (requires app restart)", nullptr)); diff --git a/client/ui_startworkdialog.h b/client/ui_startworkdialog.h index 8129b87..d2653c6 100644 --- a/client/ui_startworkdialog.h +++ b/client/ui_startworkdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'startworkdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_stopworkdialog.h b/client/ui_stopworkdialog.h index bce987e..abe65c7 100644 --- a/client/ui_stopworkdialog.h +++ b/client/ui_stopworkdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'stopworkdialog.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_timeintervaldlg.h b/client/ui_timeintervaldlg.h index 11459ee..208ed8f 100644 --- a/client/ui_timeintervaldlg.h +++ b/client/ui_timeintervaldlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'timeintervaldlg.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/client/ui_timetreedlg.h b/client/ui_timetreedlg.h index a4576cd..e033145 100644 --- a/client/ui_timetreedlg.h +++ b/client/ui_timetreedlg.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'timetreedlg.ui' ** -** Created by: Qt User Interface Compiler version 5.12.0 +** Created by: Qt User Interface Compiler version 5.12.2 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff --git a/redist/build_osx_qt5.sh b/redist/build_osx_qt5.sh index 42735fa..cb23ada 100755 --- a/redist/build_osx_qt5.sh +++ b/redist/build_osx_qt5.sh @@ -13,8 +13,8 @@ PUBLISHBUILD=YES SIGNID="Developer ID Application: Dmytro Bogovych (563QRB9S29)" # Default values only - no need to change every run -ZIPBUILD=Litt-osx-0.9.0.dmg -DMGBUILD=Litt-osx-0.9.0.dmg +ZIPBUILD=Litt-osx-0.9.2.dmg +DMGBUILD=Litt-osx-0.9.2.dmg cd ../client version=`less chooka.pro | grep "VERSION =" | cut -d' ' -f 3` @@ -26,7 +26,7 @@ if [ "$MAKEBUILD" = "YES" ]; then rm -rf Makefile echo Running qmake - QT_BINARY_DIR=/Users/anand/Qt5.12.0/5.12.0/clang_64/bin + QT_BINARY_DIR=/Users/anand/qt/5.12.2/clang_64/bin $QT_BINARY_DIR/qmake chooka.pro echo Building @@ -55,6 +55,8 @@ if [ "$MAKEBUILD" = "YES" ]; then DMGBUILD=Litt-osx-$version.dmg fi +exit + cd ../client if [ "$PREPAREPUBLISH" = "YES" ]; then diff --git a/site/LittAppCast.xml b/site/LittAppCast.xml index 7ed765d..b4266ea 100644 --- a/site/LittAppCast.xml +++ b/site/LittAppCast.xml @@ -6,9 +6,17 @@ Most recent changes with links to updates. en + + Version 0.9.2 + Sun, 12 May 2019 17:19:50 +0000 + http://satorilight.com/releasenotes.html + http://satorilight.com/releasenotes.html + http://satorilight.com/releasenotes.html + + Version 0.9.1 - Sun, 09 Dec 2018 14:34:39 +0000 + Sun, 12 May 2019 17:18:00 +0000 http://satorilight.com/releasenotes.html http://satorilight.com/releasenotes.html http://satorilight.com/releasenotes.html diff --git a/site/index.html b/site/index.html index fb9d853..c66e4e6 100644 --- a/site/index.html +++ b/site/index.html @@ -60,7 +60,7 @@

Availability

-

DMG package for OS X 10.6+

+

DMG package for OS X 10.6+

Changelog |

diff --git a/site/index.html.bak b/site/index.html.bak index 0022428..fb9d853 100644 --- a/site/index.html.bak +++ b/site/index.html.bak @@ -83,7 +83,7 @@
-
(C) com.satorilight 2012 - 2017
+
(C) com.satorilight 2012 - 2018
diff --git a/site/releasenotes.html b/site/releasenotes.html index e1febc2..212a95e 100644 --- a/site/releasenotes.html +++ b/site/releasenotes.html @@ -17,6 +17,16 @@ + +

Changes in version 0.9.1

+

- rebuild with Qt 5.12 - native support Mojave dark mode

+ +

Changes in version 0.8.16

+

- one more fixed bug in time interval removing.

+ + + +

Changes in version 0.9.1

- rebuild with Qt 5.12 - native support Mojave dark mode