[Gtk] Allow closing via Ctrl+Q

Author: manisandro

gtk/src/Application.hh

@@ -47,6 +47,8 @@ private:
 		add_action("about", [this] { m_mainWindow->showAbout(); });
 		add_action("quit", [this] { on_quit(); });
 
+		set_accel_for_action("app.quit", "<Primary>q");
+
 		Glib::RefPtr<Gtk::Builder> appMenuBuilder = Gtk::Builder::create_from_resource("/org/gnome/gimagereader/appmenu.ui");
 		Glib::RefPtr<Gio::MenuModel> menuModel = Glib::RefPtr<Gio::MenuModel>::cast_static(appMenuBuilder->get_object("appmenu"));
 
@@ -75,6 +77,9 @@ private:
 
 	void on_quit() {
 		if (m_mainWindow) {
+			if (!m_mainWindow->canClose()) {
+				return;
+			}
 			remove_window(*m_mainWindow->getWindow());
 			delete m_mainWindow;
 			m_mainWindow = nullptr;

gtk/src/MainWindow.cc

@@ -307,7 +307,7 @@ void MainWindow::progressUpdate() {
 }
 
 bool MainWindow::closeEvent(GdkEventAny*) {
-	if (!m_outputEditor->clear()) {
+	if (!canClose()) {
 		return true;
 	}
 
@@ -321,6 +321,10 @@ bool MainWindow::closeEvent(GdkEventAny*) {
 	return false;
 }
 
+bool MainWindow::canClose() {
+	return m_outputEditor->clear();
+}
+
 void MainWindow::onSourceChanged() {
 	std::vector<Source*> sources = m_sourceManager->getSelectedSources();
 	if (m_displayer->setSources(sources) && !sources.empty()) {

gtk/src/MainWindow.hh

@@ -122,6 +122,7 @@ public:
 	void popState();
 	void showProgress(ProgressMonitor* monitor, int updateInterval = 500);
 	void hideProgress();
+	bool canClose();
 
 private:
 	static void signalHandlerExec(int signal, bool tesseractCrash);