feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Replaced custom separator with a qt provided one.

Browse Source
This commit is contained in:
0xFEEDC0DE64
2017-12-03 22:12:38 +01:00
parent ba0a1b9dcc
commit 4fc4b2cd4a
4 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dialogs/buchungdialog.cpp
View File

@@ -6,7 +6,6 @@ BuchungDialog::BuchungDialog(QWidget *parent) :
ui(new Ui::BuchungDialog) ui(new Ui::BuchungDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->timeEditTime->setTime(QTime::currentTime());
} }
BuchungDialog::~BuchungDialog() BuchungDialog::~BuchungDialog()

9
dialogs/kontierungdialog.cpp
View File

@@ -5,7 +5,6 @@
#include <QSettings> #include <QSettings>
#include <QStringBuilder> #include <QStringBuilder>
#include <QDebug> #include <QDebug>
#include <QStandardItemModel>
KontierungDialog::KontierungDialog(const QMap<QString, QString> &projekte, const QSettings &settings, KontierungDialog::KontierungDialog(const QMap<QString, QString> &projekte, const QSettings &settings,
QWidget *parent) : QWidget *parent) :
@@ -29,13 +28,7 @@ KontierungDialog::KontierungDialog(const QMap<QString, QString> &projekte, const
} }
if(preferedProjekte.count()) if(preferedProjekte.count())
{ ui->comboBoxProjekt->insertSeparator(ui->comboBoxProjekt->count());
ui->comboBoxProjekt->addItem(QStringLiteral("--------------"));
auto model = qobject_cast<const QStandardItemModel*>(ui->comboBoxProjekt->model());
auto item = model->item(ui->comboBoxProjekt->count() - 1);
item->setFlags(item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled));
}
for(auto iter = projekte.constBegin(); iter != projekte.constEnd(); iter++) for(auto iter = projekte.constBegin(); iter != projekte.constEnd(); iter++)
{ {

7
dialogs/kontierungdialog.ui
View File

@@ -86,13 +86,6 @@
<property name="displayFormat"> <property name="displayFormat">
<string>HH:mm:ss</string> <string>HH:mm:ss</string>
</property> </property>
<property name="time">
<time>
<hour>1</hour>
<minute>0</minute>
<second>0</second>
</time>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">

13
mainwindow.cpp
View File

@@ -5,7 +5,6 @@
#include <QLineEdit> #include <QLineEdit>
#include <QMessageBox> #include <QMessageBox>
#include <QSettings> #include <QSettings>
#include <QStandardItemModel>
#include <QStandardItem> #include <QStandardItem>
#include <QStringBuilder> #include <QStringBuilder>
#include <QMenu> #include <QMenu>
@@ -130,7 +129,7 @@ QTime MainWindow::timeAdd(const QTime &l, const QTime &r)
QTime MainWindow::timeNormalise(const QTime &time) QTime MainWindow::timeNormalise(const QTime &time)
{ {
return time.addSecs(-time.second()); return QTime(time.hour(), time.minute());
} }
void MainWindow::refresh() void MainWindow::refresh()
@@ -419,7 +418,7 @@ void MainWindow::contextMenuBuchung(const QPoint &pos)
if(selectedAction == createAction) if(selectedAction == createAction)
{ {
BuchungDialog dialog(this); BuchungDialog dialog(this);
dialog.setTime(QTime::currentTime()); dialog.setTime(timeNormalise(QTime::currentTime()));
again2: again2:
if(dialog.exec() == QDialog::Accepted) if(dialog.exec() == QDialog::Accepted)
{ {
@@ -1097,13 +1096,7 @@ void MainWindow::updateComboboxes()
} }
if(preferedProjekte.count()) if(preferedProjekte.count())
{ ui->comboBoxProjekt->insertSeparator(ui->comboBoxProjekt->count());
ui->comboBoxProjekt->addItem(QStringLiteral("--------------"));
auto model = qobject_cast<const QStandardItemModel*>(ui->comboBoxProjekt->model());
auto item = model->item(ui->comboBoxProjekt->count() - 1);
item->setFlags(item->flags() & ~(Qt::ItemIsSelectable|Qt::ItemIsEnabled));
}
for(auto iter = m_projekte.constBegin(); iter != m_projekte.constEnd(); iter++) for(auto iter = m_projekte.constBegin(); iter != m_projekte.constEnd(); iter++)
{ {