Release 1.5 #39

Merged
0xFEEDC0DE64 merged 24 commits from devel into master 2017-12-20 00:29:23 +01:00
38 changed files with 302 additions and 206 deletions
Showing only changes of commit a0472c8c51 - Show all commits

View File

@@ -1,5 +1,5 @@
#include "advanvedviewdialog.h"
#include "ui_advanvedviewdialog.h"
#include "advancedviewdialog.h"
#include "ui_advancedviewdialog.h"
#include <QMenu>
#include <QAction>
@@ -21,9 +21,9 @@
#include "models/bookingsmodel.h"
#include "models/timeassignmentsmodel.h"
AdvanvedViewDialog::AdvanvedViewDialog(StripsWidget &stripsWidget) :
AdvancedViewDialog::AdvancedViewDialog(StripsWidget &stripsWidget) :
QDialog(&stripsWidget.mainWindow()),
ui(new Ui::AdvanvedViewDialog),
ui(new Ui::AdvancedViewDialog),
m_stripsWidget(stripsWidget),
m_bookingsModel(new BookingsModel(stripsWidget, this)),
m_timeAssignmentsModel(new TimeAssignmentsModel(stripsWidget, this))
@@ -33,20 +33,20 @@ AdvanvedViewDialog::AdvanvedViewDialog(StripsWidget &stripsWidget) :
ui->bookingsView->setModel(m_bookingsModel);
ui->bookingsView->setEnabled(m_bookingsModel->enabled());
connect(m_bookingsModel, &BookingsModel::enabledChanged, ui->bookingsView, &QWidget::setEnabled);
connect(ui->bookingsView, &QWidget::customContextMenuRequested, this, &AdvanvedViewDialog::contextMenuBooking);
connect(ui->bookingsView, &QWidget::customContextMenuRequested, this, &AdvancedViewDialog::contextMenuBooking);
ui->timeAssignmentsView->setModel(m_timeAssignmentsModel);
ui->timeAssignmentsView->setEnabled(m_timeAssignmentsModel->enabled());
connect(m_timeAssignmentsModel, &TimeAssignmentsModel::enabledChanged, ui->timeAssignmentsView, &QWidget::setEnabled);
connect(ui->timeAssignmentsView, &QWidget::customContextMenuRequested, this, &AdvanvedViewDialog::contextMenuTimeAssignment);
connect(ui->timeAssignmentsView, &QWidget::customContextMenuRequested, this, &AdvancedViewDialog::contextMenuTimeAssignment);
}
AdvanvedViewDialog::~AdvanvedViewDialog()
AdvancedViewDialog::~AdvancedViewDialog()
{
delete ui;
}
void AdvanvedViewDialog::contextMenuBooking(const QPoint &pos)
void AdvancedViewDialog::contextMenuBooking(const QPoint &pos)
{
auto index = ui->bookingsView->indexAt(pos);
@@ -152,7 +152,7 @@ void AdvanvedViewDialog::contextMenuBooking(const QPoint &pos)
}
}
void AdvanvedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
void AdvancedViewDialog::contextMenuTimeAssignment(const QPoint &pos)
{
auto index = ui->timeAssignmentsView->indexAt(pos);

View File

@@ -1,27 +1,27 @@
#ifndef ADVANVEDVIEWDIALOG_H
#define ADVANVEDVIEWDIALOG_H
#ifndef ADVANCEDVIEWDIALOG_H
#define ADVANCEDVIEWDIALOG_H
#include <QDialog>
namespace Ui { class AdvanvedViewDialog; }
namespace Ui { class AdvancedViewDialog; }
class StripsWidget;
class BookingsModel;
class TimeAssignmentsModel;
class AdvanvedViewDialog : public QDialog
class AdvancedViewDialog : public QDialog
{
Q_OBJECT
public:
explicit AdvanvedViewDialog(StripsWidget &stripsWidget);
~AdvanvedViewDialog();
explicit AdvancedViewDialog(StripsWidget &stripsWidget);
~AdvancedViewDialog();
private Q_SLOTS:
void contextMenuBooking(const QPoint &pos);
void contextMenuTimeAssignment(const QPoint &pos);
private:
Ui::AdvanvedViewDialog *ui;
Ui::AdvancedViewDialog *ui;
StripsWidget &m_stripsWidget;
@@ -29,4 +29,4 @@ private:
TimeAssignmentsModel *m_timeAssignmentsModel;
};
#endif // ADVANVEDVIEWDIALOG_H
#endif // ADVANCEDVIEWDIALOG_H

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AdvanvedViewDialog</class>
<widget class="QDialog" name="AdvanvedViewDialog">
<class>AdvancedViewDialog</class>
<widget class="QDialog" name="AdvancedViewDialog">
<property name="geometry">
<rect>
<x>0</x>
@@ -48,7 +48,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>AdvanvedViewDialog</receiver>
<receiver>AdvancedViewDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -64,7 +64,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>AdvanvedViewDialog</receiver>
<receiver>AdvancedViewDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

View File

@@ -14,7 +14,7 @@ DEPENDPATH += $$PWD/../../zeiterfassunglib
DEFINES += QT_DEPRECATED_WARNINGS QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_MESSAGELOGCONTEXT
HEADERS += advanvedviewdialog.h \
HEADERS += advancedviewdialog.h \
advancedviewplugin.h \
advancedviewwidget.h \
dialogs/bookingdialog.h \
@@ -22,7 +22,7 @@ HEADERS += advanvedviewdialog.h \
models/bookingsmodel.h \
models/timeassignmentsmodel.h
SOURCES += advanvedviewdialog.cpp \
SOURCES += advancedviewdialog.cpp \
advancedviewplugin.cpp \
advancedviewwidget.cpp \
dialogs/bookingdialog.cpp \
@@ -30,7 +30,7 @@ SOURCES += advanvedviewdialog.cpp \
models/bookingsmodel.cpp \
models/timeassignmentsmodel.cpp
FORMS += advanvedviewdialog.ui \
FORMS += advancedviewdialog.ui \
dialogs/bookingdialog.ui \
dialogs/timeassignmentdialog.ui

View File

@@ -3,7 +3,7 @@
#include <QIcon>
#include "stripswidget.h"
#include "advanvedviewdialog.h"
#include "advancedviewdialog.h"
AdvancedViewWidget::AdvancedViewWidget(StripsWidget &stripsWidget) :
QPushButton(&stripsWidget),
@@ -24,6 +24,6 @@ void AdvancedViewWidget::dateChanged(const QDate &date)
void AdvancedViewWidget::pressedSlot()
{
AdvanvedViewDialog dialog(m_stripsWidget);
AdvancedViewDialog dialog(m_stripsWidget);
dialog.exec();
}