Merge branch 'develop' into feature/UndoRedoWithModelData
This commit is contained in:
20
mainwindow.h
20
mainwindow.h
@ -1,11 +1,13 @@
|
||||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include <QItemSelection>
|
||||
#include <QMainWindow>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class NewItemDialog;
|
||||
class TableModel;
|
||||
|
||||
class QAbstractItemModel;
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QUndoStack;
|
||||
namespace Ui {
|
||||
@ -32,18 +34,24 @@ class MainWindow : public QMainWindow {
|
||||
void closeEvent(QCloseEvent* event) override;
|
||||
|
||||
private slots:
|
||||
void onAboutClicked();
|
||||
void showStatusMessage(const QString text);
|
||||
void onSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
|
||||
|
||||
void onAboutClicked();
|
||||
void on_actionCheck_for_update_triggered();
|
||||
|
||||
void on_pushButton_clicked();
|
||||
|
||||
/// slots for menu actions
|
||||
void openNewItemDialog();
|
||||
void deleteSelectedtItems();
|
||||
|
||||
private:
|
||||
Ui::MainWindow* ui;
|
||||
|
||||
// GenericCore* m_core;
|
||||
unique_ptr<GenericCore> m_core;
|
||||
shared_ptr<QAbstractItemModel> m_tableModel;
|
||||
shared_ptr<TableModel> m_tableModel;
|
||||
shared_ptr<QUndoStack> m_modelUndoStack;
|
||||
|
||||
/// File actions
|
||||
@ -65,10 +73,14 @@ class MainWindow : public QMainWindow {
|
||||
unique_ptr<QAction> m_deleteItemAct;
|
||||
unique_ptr<QAction> m_findItemAct;
|
||||
|
||||
/// Dialogs
|
||||
unique_ptr<NewItemDialog> m_newItemDialog;
|
||||
|
||||
/// Setup functions
|
||||
void createActions();
|
||||
void createFileActions();
|
||||
void createEditActions();
|
||||
void createHelpMenu();
|
||||
void createGuiDialogs();
|
||||
};
|
||||
#endif // MAINWINDOW_H
|
||||
|
||||
Reference in New Issue
Block a user