From 4fc4b2cd4a6296f44555bc1d676402a43408d6e4 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com> Date: Sun, 3 Dec 2017 22:12:38 +0100 Subject: [PATCH] Replaced custom separator with a qt provided one. --- dialogs/buchungdialog.cpp | 1 - dialogs/kontierungdialog.cpp | 9 +-------- dialogs/kontierungdialog.ui | 7 ------- mainwindow.cpp | 13 +++---------- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dialogs/buchungdialog.cpp b/dialogs/buchungdialog.cpp index a825205..874b940 100644 --- a/dialogs/buchungdialog.cpp +++ b/dialogs/buchungdialog.cpp @@ -6,7 +6,6 @@ BuchungDialog::BuchungDialog(QWidget *parent) : ui(new Ui::BuchungDialog) { ui->setupUi(this); - ui->timeEditTime->setTime(QTime::currentTime()); } BuchungDialog::~BuchungDialog() diff --git a/dialogs/kontierungdialog.cpp b/dialogs/kontierungdialog.cpp index 3042c63..338c8e9 100644 --- a/dialogs/kontierungdialog.cpp +++ b/dialogs/kontierungdialog.cpp @@ -5,7 +5,6 @@ #include #include #include -#include KontierungDialog::KontierungDialog(const QMap &projekte, const QSettings &settings, QWidget *parent) : @@ -29,13 +28,7 @@ KontierungDialog::KontierungDialog(const QMap &projekte, const } if(preferedProjekte.count()) - { - ui->comboBoxProjekt->addItem(QStringLiteral("--------------")); - - auto model = qobject_cast(ui->comboBoxProjekt->model()); - auto item = model->item(ui->comboBoxProjekt->count() - 1); - item->setFlags(item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled)); - } + ui->comboBoxProjekt->insertSeparator(ui->comboBoxProjekt->count()); for(auto iter = projekte.constBegin(); iter != projekte.constEnd(); iter++) { diff --git a/dialogs/kontierungdialog.ui b/dialogs/kontierungdialog.ui index ab8d7d4..2229aa6 100644 --- a/dialogs/kontierungdialog.ui +++ b/dialogs/kontierungdialog.ui @@ -86,13 +86,6 @@ HH:mm:ss - - - diff --git a/mainwindow.cpp b/mainwindow.cpp index a856922..771e5c5 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include #include @@ -130,7 +129,7 @@ QTime MainWindow::timeAdd(const QTime &l, const QTime &r) QTime MainWindow::timeNormalise(const QTime &time) { - return time.addSecs(-time.second()); + return QTime(time.hour(), time.minute()); } void MainWindow::refresh() @@ -419,7 +418,7 @@ void MainWindow::contextMenuBuchung(const QPoint &pos) if(selectedAction == createAction) { BuchungDialog dialog(this); - dialog.setTime(QTime::currentTime()); + dialog.setTime(timeNormalise(QTime::currentTime())); again2: if(dialog.exec() == QDialog::Accepted) { @@ -1097,13 +1096,7 @@ void MainWindow::updateComboboxes() } if(preferedProjekte.count()) - { - ui->comboBoxProjekt->addItem(QStringLiteral("--------------")); - - auto model = qobject_cast(ui->comboBoxProjekt->model()); - auto item = model->item(ui->comboBoxProjekt->count() - 1); - item->setFlags(item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled)); - } + ui->comboBoxProjekt->insertSeparator(ui->comboBoxProjekt->count()); for(auto iter = m_projekte.constBegin(); iter != m_projekte.constEnd(); iter++) {