diff --git a/client/chooka.pro b/client/chooka.pro index d143590..5f982b7 100644 --- a/client/chooka.pro +++ b/client/chooka.pro @@ -75,7 +75,9 @@ SOURCES += main.cpp\ findsupport.cpp \ stopworkdialog.cpp \ startworkdialog.cpp \ - twofish.cpp + twofish.cpp \ + openorcreatedb_widget.cpp \ + connectdb_widget.cpp HEADERS += mainwindow.h \ storage.h \ @@ -116,7 +118,9 @@ HEADERS += mainwindow.h \ findsupport.h \ stopworkdialog.h \ startworkdialog.h \ - twofish.h + twofish.h \ + openorcreatedb_widget.h \ + connectdb_widget.h FORMS += mainwindow.ui \ newpassworddlg.ui \ @@ -129,7 +133,9 @@ FORMS += mainwindow.ui \ attachmentsdialog.ui \ finddialog.ui \ stopworkdialog.ui \ - startworkdialog.ui + startworkdialog.ui \ + openorcreatedb_widget.ui \ + connectdb_widget.ui RESOURCES = mainwindow.qrc resources/qdarkstyle/style.qrc diff --git a/client/connectdb_widget.cpp b/client/connectdb_widget.cpp new file mode 100644 index 0000000..8a6eee6 --- /dev/null +++ b/client/connectdb_widget.cpp @@ -0,0 +1,14 @@ +#include "connectdb_widget.h" +#include "ui_connectdb_widget.h" + +ConnectDbWidget::ConnectDbWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::ConnectDbWidget) +{ + ui->setupUi(this); +} + +ConnectDbWidget::~ConnectDbWidget() +{ + delete ui; +} diff --git a/client/connectdb_widget.h b/client/connectdb_widget.h new file mode 100644 index 0000000..a1f5e1b --- /dev/null +++ b/client/connectdb_widget.h @@ -0,0 +1,22 @@ +#ifndef CONNECTDB_WIDGET_H +#define CONNECTDB_WIDGET_H + +#include + +namespace Ui { +class ConnectDbWidget; +} + +class ConnectDbWidget : public QWidget +{ + Q_OBJECT + +public: + explicit ConnectDbWidget(QWidget *parent = nullptr); + ~ConnectDbWidget(); + +private: + Ui::ConnectDbWidget *ui; +}; + +#endif // CONNECTDB_WIDGET_H diff --git a/client/connectdb_widget.ui b/client/connectdb_widget.ui new file mode 100644 index 0000000..f52aea9 --- /dev/null +++ b/client/connectdb_widget.ui @@ -0,0 +1,44 @@ + + + ConnectDbWidget + + + + 0 + 0 + 277 + 114 + + + + Form + + + + + + Please type in password here: + + + Qt::AlignCenter + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + true + + + + + + + + diff --git a/client/openorcreatedb_widget.cpp b/client/openorcreatedb_widget.cpp new file mode 100644 index 0000000..73efccd --- /dev/null +++ b/client/openorcreatedb_widget.cpp @@ -0,0 +1,14 @@ +#include "openorcreatedb_widget.h" +#include "ui_openorcreatedb_widget.h" + +OpenOrCreateDbWidget::OpenOrCreateDbWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::OpenOrCreateDbWidget) +{ + ui->setupUi(this); +} + +OpenOrCreateDbWidget::~OpenOrCreateDbWidget() +{ + delete ui; +} diff --git a/client/openorcreatedb_widget.h b/client/openorcreatedb_widget.h new file mode 100644 index 0000000..f343bb2 --- /dev/null +++ b/client/openorcreatedb_widget.h @@ -0,0 +1,22 @@ +#ifndef OPENORCREATEDB_WIDGET_H +#define OPENORCREATEDB_WIDGET_H + +#include + +namespace Ui { +class OpenOrCreateDbWidget; +} + +class OpenOrCreateDbWidget : public QWidget +{ + Q_OBJECT + +public: + explicit OpenOrCreateDbWidget(QWidget *parent = nullptr); + ~OpenOrCreateDbWidget(); + +private: + Ui::OpenOrCreateDbWidget *ui; +}; + +#endif // OPENORCREATEDB_WIDGET_H diff --git a/client/openorcreatedb_widget.ui b/client/openorcreatedb_widget.ui new file mode 100644 index 0000000..16852ca --- /dev/null +++ b/client/openorcreatedb_widget.ui @@ -0,0 +1,120 @@ + + + OpenOrCreateDbWidget + + + + 0 + 0 + 549 + 384 + + + + Form + + + + + + <html><head/><body><p>Please enter new password twice to complete database creation.</p> <p>Please be aware - there is no way to recover lost password.</p></body></html> + + + true + + + + + + + + + Password: + + + + + + + Qt::ImhHiddenText|Qt::ImhNoAutoUppercase|Qt::ImhNoPredictiveText|Qt::ImhSensitiveData + + + QLineEdit::Password + + + + + + + Repeat password: + + + + + + + QLineEdit::Password + + + + + + + + + OR + + + Qt::AlignCenter + + + + + + + + + Select existing database file: + + + + + + + + 100 + 16777215 + + + + Open + + + + + + + + + <Not selected yet> + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + true + + + + + + + + diff --git a/client/timeintervaldlg.cpp b/client/timeintervaldlg.cpp index 7c01341..121b512 100644 --- a/client/timeintervaldlg.cpp +++ b/client/timeintervaldlg.cpp @@ -9,7 +9,7 @@ TimeIntervalDlg::TimeIntervalDlg(QWidget *parent, TimeTreeModel* model, PTimeLine timeline, Type type, const TimeRecord& interval) : QDialog(parent, Qt::Sheet), ui(new Ui::TimeIntervalDlg), - mModel(model), mTimeline(timeline), mType(type), mInterval(interval) + mTimeline(timeline), mType(type), mInterval(interval), mModel(model) { ui->setupUi(this); connect(ui->mStartTimeEdit, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(dataChanged(QDateTime))); diff --git a/client/timetreedlg.cpp b/client/timetreedlg.cpp index 220bbff..411c099 100644 --- a/client/timetreedlg.cpp +++ b/client/timetreedlg.cpp @@ -31,7 +31,7 @@ void TimeTreeDlg::addInterval() else { QDateTime current = QDateTime::currentDateTime(); - time_t t = current.toTime_t(); + //time_t t = current.toTime_t(); //helper::time time_of_day = helper::time::fromTimestamp(t, helper::date::To_LocalTime); mTimeIntervalDlg = new TimeIntervalDlg(this, mModel, mTimeline, TimeIntervalDlg::Type::New, TimeRecord()); @@ -41,6 +41,7 @@ void TimeTreeDlg::addInterval() mTimeIntervalDlg->setFinishDate(current); //mTimeIntervalDlg->setModal(false); mTimeIntervalDlg->show(); + mTimeIntervalDlg = nullptr; } } diff --git a/client/timetreemodel.cpp b/client/timetreemodel.cpp index 9a8c7f6..8495175 100644 --- a/client/timetreemodel.cpp +++ b/client/timetreemodel.cpp @@ -314,7 +314,7 @@ QVariant TimeTreeModel::data(const QModelIndex &index, int role) const end = helper::time::fromTimestamp(tr.endTime(), helper::date::To_LocalTime); return QString("%1 - %2").arg(QString::fromStdString(start.toString(false)), - QString::fromStdString(start.toString(false))); + QString::fromStdString(end.toString(false))); } default: