From a5f4e4c54fcbf07a3ba5d7a28ec1f5291a9b0bf2 Mon Sep 17 00:00:00 2001
From: eelke <eelke@eelkeklein.nl>
Date: Fri, 4 Jan 2019 18:29:22 +0100
Subject: [PATCH] Create standard close action

---
 pglab/DatabaseWindow.cpp | 18 ++++++++++++++++--
 pglab/DatabaseWindow.h   |  6 +++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp
index 58c4517..edcd3fb 100644
--- a/pglab/DatabaseWindow.cpp
+++ b/pglab/DatabaseWindow.cpp
@@ -133,10 +133,13 @@ DatabaseWindow::DatabaseWindow(MasterController *master, QWidget *parent)
 
 	setCentralWidget(m_tabWidget);
 
+	createActions();
+
 	auto menuBar = new QMenuBar(this);
 	setMenuBar(menuBar);
 
 	m_mainToolBar = new QToolBar(this);
+	m_mainToolBar->addAction(m_closeAction);
 	addToolBar(Qt::TopToolBarArea, m_mainToolBar);
 
 	auto statusBar = new QStatusBar(this);
@@ -158,6 +161,18 @@ DatabaseWindow::~DatabaseWindow()
 //	delete ui;
 }
 
+void DatabaseWindow::createActions()
+{
+	{
+		auto action = m_closeAction = new QAction(this);
+		QIcon icon;
+		icon.addFile(QString::fromUtf8(":/icons/page_white_delete.png"), QSize(), QIcon::Normal, QIcon::On);
+		action->setIcon(icon);
+		connect(m_closeAction, &QAction::triggered, this, &DatabaseWindow::actionClose_triggered);
+	}
+
+}
+
 QueryTab* DatabaseWindow::newSqlPage()
 {
 	QueryTab *qt = new QueryTab(m_context);
@@ -293,9 +308,8 @@ void DatabaseWindow::on_actionExport_data_triggered()
 	}
 }
 
-void DatabaseWindow::on_actionClose_triggered()
+void DatabaseWindow::actionClose_triggered()
 {
-	//close();
 	on_tabWidget_tabCloseRequested(m_tabWidget->currentIndex());
 }
 
diff --git a/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h
index c3301a5..aeb6a39 100644
--- a/pglab/DatabaseWindow.h
+++ b/pglab/DatabaseWindow.h
@@ -89,6 +89,9 @@ private:
 	QTabWidget *m_tabWidget = nullptr;
 	QToolBar *m_mainToolBar = nullptr;
 
+	// Standard actions
+	QAction *m_closeAction = nullptr;
+
 	ConnectionConfig m_config;
 	std::shared_ptr<OpenDatabase> m_database;
 
@@ -140,6 +143,7 @@ private:
 
 	QFutureWatcher<LoadCatalog::Result> loadWatcher;
 
+	void createActions();
 	QueryTab *GetActiveQueryTab();
 
 	void closeEvent(QCloseEvent *event);
@@ -161,7 +165,7 @@ private slots:
 	void on_actionLoad_SQL_triggered();
 	void on_actionSave_SQL_triggered();
 	void on_actionExport_data_triggered();
-	void on_actionClose_triggered();
+	void actionClose_triggered();
 	void on_actionAbout_triggered();
 	void on_actionSave_SQL_as_triggered();
 	void on_actionSave_copy_of_SQL_as_triggered();